set vpc.PublicCIDRS to empty string if mcp EP PublicCIDRS are empty

Author: pavansokkenagaraj

pkg/cloud/services/eks/cluster.go

@@ -297,13 +297,10 @@ func makeVpcConfig(subnets infrav1.Subnets, endpointAccess ekscontrolplanev1.End
 	vpcConfig := &eks.VpcConfigRequest{
 		EndpointPublicAccess:  endpointAccess.Public,
 		EndpointPrivateAccess: endpointAccess.Private,
-		PublicAccessCidrs:     []*string{},
+		PublicAccessCidrs:     cidrs,
 		SubnetIds:             subnetIds,
 	}
 
-	if len(cidrs) > 0 {
-		vpcConfig.PublicAccessCidrs = cidrs
-	}
 	sg, ok := securityGroups[infrav1.SecurityGroupEKSNodeAdditional]
 	if ok {
 		vpcConfig.SecurityGroupIds = append(vpcConfig.SecurityGroupIds, &sg.ID)

pkg/cloud/services/eks/cluster_test.go

@@ -176,7 +176,8 @@ func TestMakeVPCConfig(t *testing.T) {
 				endpointAccess: ekscontrolplanev1.EndpointAccess{},
 			},
 			expect: &eks.VpcConfigRequest{
-				SubnetIds: []*string{&idOne, &idTwo},
+				SubnetIds:         []*string{&idOne, &idTwo},
+				PublicAccessCidrs: []*string{},
 			},
 		},
 		{
@@ -204,8 +205,9 @@ func TestMakeVPCConfig(t *testing.T) {
 				},
 			},
 			expect: &eks.VpcConfigRequest{
-				SubnetIds:        []*string{&idOne, &idTwo},
-				SecurityGroupIds: []*string{&idOne},
+				SubnetIds:         []*string{&idOne, &idTwo},
+				SecurityGroupIds:  []*string{&idOne},
+				PublicAccessCidrs: []*string{},
 			},
 		},
 		{