Update integration/tests/ipv6/ipv6_test.go

Co-authored-by: Chetan Patwal <[email protected]>

Author: 2 people

integration/tests/ipv6/ipv6_test.go

@@ -61,13 +61,13 @@ var _ = Describe("(Integration) [EKS IPv6 test]", func() {
 			clusterConfig.IAM.WithOIDC = api.Enabled()
 			clusterConfig.Addons = []*api.Addon{
 				{
-					Name: "vpc-cni",
+					Name: api.VPCCNIAddon,
 				},
 				{
-					Name: "kube-proxy",
+					Name: api.KubeProxyAddon,
 				},
 				{
-					Name: "coredns",
+					Name: api.CoreDNSAddon,
 				},
 			}
 
@@ -118,7 +118,7 @@ var _ = Describe("(Integration) [EKS IPv6 test]", func() {
 			Expect(err).NotTo(HaveOccurred(), vpcOutput.GoString())
 			Expect(vpcOutput.Vpcs[0].Ipv6CidrBlockAssociationSet).To(HaveLen(1))
 
-			// TODO: get rid of this once CF bug is fixed
+			// TODO: get rid of this once CF bug is fixed https://github.com/weaveworks/eksctl/issues/4363
 			By("setting AssignIpv6AddressOnCreation to true for each public subnet")
 			var publicSubnets string
 			for _, output := range describeStackOut.Stacks[0].Outputs {
@@ -133,11 +133,10 @@ var _ = Describe("(Integration) [EKS IPv6 test]", func() {
 			Expect(err).NotTo(HaveOccurred())
 			Expect(len(subnetsOutput.Subnets)).To(BeNumerically(">", 0))
 			for _, s := range subnetsOutput.Subnets {
-				Expect(s.AssignIpv6AddressOnCreation).NotTo(BeNil())
 				Expect(*s.AssignIpv6AddressOnCreation).To(BeTrue())
 			}
 
-			By("the k8s cluster's having IPv6 enabled")
+			By("ensuring the K8s cluster has IPv6 enabled")
 			var clientSet *kubernetes.Clientset
 			ctl, err := eks.New(&api.ProviderConfig{Region: params.Region}, clusterConfig)
 			Expect(err).NotTo(HaveOccurred())

pkg/apis/eksctl.io/v1alpha5/types.go

@@ -380,6 +380,9 @@ func IsDisabled(v *bool) bool { return v != nil && !*v }
 // IsSetAndNonEmptyString will only return true if s is not nil and not empty
 func IsSetAndNonEmptyString(s *string) bool { return s != nil && *s != "" }
 
+// IsSetAndNonEmptyString will only return true if s is not nil and not empty
+func IsEmpty(s *string) bool { return !IsSetAndNonEmptyString(s) }
+
 // SupportedRegions are the regions where EKS is available
 func SupportedRegions() []string {
 	return []string{

pkg/cfn/manager/tasks.go

@@ -146,15 +146,17 @@ func (t *AssignIpv6AddressOnCreationTask) Describe() string {
 
 func (t *AssignIpv6AddressOnCreationTask) Do(errs chan error) error {
 	defer close(errs)
-	for _, subnet := range t.ClusterConfig.VPC.Subnets.Public.WithIDs() {
-		_, err := t.EC2API.ModifySubnetAttribute(&ec2.ModifySubnetAttributeInput{
-			AssignIpv6AddressOnCreation: &ec2.AttributeBooleanValue{
-				Value: aws.Bool(true),
-			},
-			SubnetId: aws.String(subnet),
-		})
-		if err != nil {
-			return fmt.Errorf("failed to update subnet %q: %v", subnet, err)
+	if t.ClusterConfig.VPC.Subnets.Public != nil {
+		for _, subnet := range t.ClusterConfig.VPC.Subnets.Public.WithIDs() {
+			_, err := t.EC2API.ModifySubnetAttribute(&ec2.ModifySubnetAttributeInput{
+				AssignIpv6AddressOnCreation: &ec2.AttributeBooleanValue{
+					Value: aws.Bool(true),
+				},
+				SubnetId: aws.String(subnet),
+			})
+			if err != nil {
+				return fmt.Errorf("failed to update subnet %q: %v", subnet, err)
+			}
 		}
 	}
 	return nil

pkg/ctl/cmdutils/configfile.go

@@ -244,7 +244,7 @@ func NewCreateClusterLoader(cmd *Cmd, ngFilter *filter.NodeGroupFilter, ng *api.
 			}
 		}
 
-		if clusterConfig.VPC.NAT != nil && !api.IsSetAndNonEmptyString(clusterConfig.VPC.NAT.Gateway) {
+		if clusterConfig.VPC.NAT != nil && api.IsEmpty(clusterConfig.VPC.NAT.Gateway) {
 			*clusterConfig.VPC.NAT.Gateway = api.ClusterSingleNAT
 		}