fix lint and unit-test

eksctl-io · Mar 28, 2024 · a0349dd · a0349dd
1 parent ebdf92e
commit a0349dd
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/pkg/apis/eksctl.io/v1alpha5/validation_test.go b/pkg/apis/eksctl.io/v1alpha5/validation_test.go
@@ -2055,10 +2055,6 @@ var _ = Describe("ClusterConfig validation", func() {
 			err := api.ValidateManagedNodeGroup(0, mng)
 			Expect(err).NotTo(HaveOccurred())
 
-			mng.AMIFamily = api.NodeImageFamilyAmazonLinux2
-			err = api.ValidateManagedNodeGroup(0, mng)
-			Expect(err).NotTo(HaveOccurred())
-
 			mng.AMIFamily = api.NodeImageFamilyUbuntu1804
 			err = api.ValidateManagedNodeGroup(0, mng)
 			Expect(err).NotTo(HaveOccurred())
@@ -2074,8 +2070,13 @@ var _ = Describe("ClusterConfig validation", func() {
 			mng.AMIFamily = api.NodeImageFamilyBottlerocket
 			mng.OverrideBootstrapCommand = nil
 			err = api.ValidateManagedNodeGroup(0, mng)
-			errorMsg := fmt.Sprintf("cannot set amiFamily to %s when using a custom AMI for managed nodes, only %s, %s, %s and %s are supported", mng.AMIFamily, api.NodeImageFamilyAmazonLinux2, api.NodeImageFamilyUbuntu1804, api.NodeImageFamilyUbuntu2004, api.NodeImageFamilyUbuntu2204)
+			errorMsg := fmt.Sprintf("cannot set amiFamily to %s when using a custom AMI for managed nodes, only %s, %s, %s, %s and %s are supported",
+				mng.AMIFamily, api.NodeImageFamilyAmazonLinux2023, api.NodeImageFamilyAmazonLinux2, api.NodeImageFamilyUbuntu1804, api.NodeImageFamilyUbuntu2004, api.NodeImageFamilyUbuntu2204)
 			Expect(err).To(MatchError(errorMsg))
+
+			mng.AMIFamily = api.NodeImageFamilyAmazonLinux2023
+			err = api.ValidateManagedNodeGroup(0, mng)
+			Expect(err).NotTo(HaveOccurred())
 		})
 
 		It("fails when the AMIFamily is WindowsServer2004CoreContainer", func() {

diff --git a/pkg/cfn/builder/managed_nodegroup_test.go b/pkg/cfn/builder/managed_nodegroup_test.go
@@ -204,6 +204,7 @@ func TestManagedNodeRole(t *testing.T) {
 		t.Run(fmt.Sprintf("%d: %s", i, tt.description), func(t *testing.T) {
 			require := require.New(t)
 			clusterConfig := api.NewClusterConfig()
+			clusterConfig.Status = &api.ClusterStatus{}
 			api.SetManagedNodeGroupDefaults(tt.nodeGroup, clusterConfig.Metadata, false)
 			p := mockprovider.NewMockProvider()
 			fakeVPCImporter := new(vpcfakes.FakeImporter)

diff --git a/pkg/ctl/cmdutils/nodegroup_flags.go b/pkg/ctl/cmdutils/nodegroup_flags.go
@@ -40,7 +40,7 @@ func AddCommonCreateNodeGroupFlags(fs *pflag.FlagSet, cmd *Cmd, ng *api.NodeGrou
 	ng.SSH.EnableSSM = fs.Bool("enable-ssm", false, "Enable AWS Systems Manager (SSM)")
 
 	fs.StringVar(&ng.AMI, "node-ami", "", "'auto-ssm', 'auto' or an AMI ID (advanced use)")
-	fs.StringVar(&ng.AMIFamily, "node-ami-family", api.DefaultNodeImageFamily, fmt.Sprintf("supported AMI families: %s", strings.Join(api.SupportedNodeVolumeTypes(), ", ")))
+	fs.StringVar(&ng.AMIFamily, "node-ami-family", api.DefaultNodeImageFamily, fmt.Sprintf("supported AMI families: %s", strings.Join(api.SupportedAMIFamilies(), ", ")))
 
 	fs.BoolVarP(&ng.PrivateNetworking, "node-private-networking", "P", false, "whether to make nodegroup networking private")
 

diff --git a/pkg/nodebootstrap/al2023.go b/pkg/nodebootstrap/al2023.go
@@ -67,12 +67,12 @@ func (m *AL2023) UserData() (string, error) {
 
 func (m *AL2023) setNodeConfig() {
 	m.nodeConfig = &NodeConfig{
-		ApiVersion: "node.eks.aws/v1alpha1",
+		APIVersion: "node.eks.aws/v1alpha1",
 		Kind:       "NodeConfig",
 		Spec: NodeSpec{
 			Cluster: ClusterSpec{
 				Name:                 m.cfg.Metadata.Name,
-				ApiServerEndpoint:    m.cfg.Status.Endpoint,
+				APIServerEndpoint:    m.cfg.Status.Endpoint,
 				CertificateAuthority: base64.StdEncoding.EncodeToString(m.cfg.Status.CertificateAuthorityData),
 				CIDR:                 m.cfg.Status.KubernetesNetworkConfig.ServiceIPv4CIDR,
 			},
@@ -93,7 +93,7 @@ func (m *AL2023) setNodeConfig() {
 }
 
 type NodeConfig struct {
-	ApiVersion string   `yaml:"apiVersion"`
+	APIVersion string   `yaml:"apiVersion"`
 	Kind       string   `yaml:"kind"`
 	Spec       NodeSpec `yaml:"spec"`
 }
@@ -104,7 +104,7 @@ type NodeSpec struct {
 }
 
 type ClusterSpec struct {
-	ApiServerEndpoint    string `yaml:"apiServerEndpoint"`
+	APIServerEndpoint    string `yaml:"apiServerEndpoint"`
 	CertificateAuthority string `yaml:"certificateAuthority"`
 	CIDR                 string `yaml:"cidr"`
 	Name                 string `yaml:"name"`