Use EKS APIs default vpc-cni addon version for ipv6 clusters (#5078)

eksctl-io · Apr 7, 2022 · c90958b · c90958b
1 parent 24d9aef
commit c90958b
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 11 deletions.
diff --git a/integration/tests/addons/addons_test.go b/integration/tests/addons/addons_test.go
@@ -43,7 +43,7 @@ var _ = Describe("(Integration) [EKS Addons test]", func() {
 		BeforeSuite(func() {
 			clusterConfig := api.NewClusterConfig()
 			clusterConfig.Metadata.Name = clusterName
-			clusterConfig.Metadata.Version = "latest"
+			clusterConfig.Metadata.Version = api.LatestVersion
 			clusterConfig.Metadata.Region = params.Region
 			clusterConfig.IAM.WithOIDC = api.Enabled()
 			clusterConfig.Addons = []*api.Addon{

diff --git a/integration/tests/ipv6/ipv6_test.go b/integration/tests/ipv6/ipv6_test.go
@@ -47,7 +47,7 @@ func TestIPv6(t *testing.T) {
 	testutils.RegisterAndRun(t)
 }
 
-var _ = PDescribe("(Integration) [EKS IPv6 test]", func() {
+var _ = Describe("(Integration) [EKS IPv6 test]", func() {
 	var (
 		clusterConfig *api.ClusterConfig
 	)
@@ -63,23 +63,20 @@ var _ = PDescribe("(Integration) [EKS IPv6 test]", func() {
 
 			clusterConfig = api.NewClusterConfig()
 			clusterConfig.Metadata.Name = clusterName
-			clusterConfig.Metadata.Version = "1.21"
+			clusterConfig.Metadata.Version = api.LatestVersion
 			clusterConfig.Metadata.Region = params.Region
 			clusterConfig.KubernetesNetworkConfig.IPFamily = "iPv6"
 			clusterConfig.VPC.NAT = nil
 			clusterConfig.IAM.WithOIDC = api.Enabled()
 			clusterConfig.Addons = []*api.Addon{
 				{
-					Name:    api.VPCCNIAddon,
-					Version: "latest",
+					Name: api.VPCCNIAddon,
 				},
 				{
-					Name:    api.KubeProxyAddon,
-					Version: "latest",
+					Name: api.KubeProxyAddon,
 				},
 				{
-					Name:    api.CoreDNSAddon,
-					Version: "latest",
+					Name: api.CoreDNSAddon,
 				},
 			}
 			clusterConfig.ManagedNodeGroups = []*api.ManagedNodeGroup{

diff --git a/pkg/apis/eksctl.io/v1alpha5/validation.go b/pkg/apis/eksctl.io/v1alpha5/validation.go
@@ -270,7 +270,6 @@ func (c *ClusterConfig) unsupportedVPCCNIAddonVersion() (bool, error) {
 	for _, addon := range c.Addons {
 		if addon.Name == VPCCNIAddon {
 			if addon.Version == "" {
-				addon.Version = minimumVPCCNIVersionForIPv6
 				return false, nil
 			}
 			if addon.Version == "latest" {

diff --git a/pkg/apis/eksctl.io/v1alpha5/validation_test.go b/pkg/apis/eksctl.io/v1alpha5/validation_test.go
@@ -904,7 +904,6 @@ var _ = Describe("ClusterConfig validation", func() {
 							cfg.VPC.NAT = nil
 							err = api.ValidateClusterConfig(cfg)
 							Expect(err).NotTo(HaveOccurred())
-							Expect(cfg.Addons[2].Version).To(Equal("1.10.0"))
 						})
 					})
 

diff --git a/pkg/awsapi/autoscaling.go b/pkg/awsapi/autoscaling.go
diff --git a/pkg/awsapi/cloudtrail.go b/pkg/awsapi/cloudtrail.go
diff --git a/pkg/awsapi/cloudwatchlogs.go b/pkg/awsapi/cloudwatchlogs.go