Merge pull request #3846 from Ankitasw/vpccni

Refactor VPC CNI in managed control plane

Author: k8s-ci-robot

config/crd/bases/controlplane.cluster.x-k8s.io_awsmanagedcontrolplanes.yaml

@@ -1430,15 +1430,6 @@ spec:
                 - host
                 - port
                 type: object
-              disableVPCCNI:
-                default: false
-                description: DisableVPCCNI indicates that the Amazon VPC CNI should
-                  be disabled. With EKS clusters the Amazon VPC CNI is automatically
-                  installed into the cluster. For clusters where you want to use an
-                  alternate CNI this option provides a way to specify that the Amazon
-                  VPC CNI should be deleted. You cannot set this to true if you are
-                  using the Amazon VPC CNI addon.
-                type: boolean
               eksClusterName:
                 description: EKSClusterName allows you to specify the name of the
                   EKS cluster in AWS. If you don't specify a name then a default name
@@ -1905,6 +1896,15 @@ spec:
                 description: VpcCni is used to set configuration options for the VPC
                   CNI plugin
                 properties:
+                  disable:
+                    default: false
+                    description: Disable indicates that the Amazon VPC CNI should
+                      be disabled. With EKS clusters the Amazon VPC CNI is automatically
+                      installed into the cluster. For clusters where you want to use
+                      an alternate CNI this option provides a way to specify that
+                      the Amazon VPC CNI should be deleted. You cannot set this to
+                      true if you are using the Amazon VPC CNI addon.
+                    type: boolean
                   env:
                     description: Env defines a list of environment variables to apply
                       to the `aws-node` DaemonSet

controlplane/eks/api/v1beta1/conversion.go

@@ -21,6 +21,7 @@ import (
 	infrav1beta1 "sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta1"
 	infrav1beta2 "sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	ekscontrolplanev1 "sigs.k8s.io/cluster-api-provider-aws/v2/controlplane/eks/api/v1beta2"
+	utilconversion "sigs.k8s.io/cluster-api/util/conversion"
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
 )
 
@@ -31,6 +32,13 @@ func (r *AWSManagedControlPlane) ConvertTo(dstRaw conversion.Hub) error {
 	if err := Convert_v1beta1_AWSManagedControlPlane_To_v1beta2_AWSManagedControlPlane(r, dst, nil); err != nil {
 		return err
 	}
+	
+	// Manually restore data.
+	restored := &ekscontrolplanev1.AWSManagedControlPlane{}
+	if ok, err := utilconversion.UnmarshalData(r, restored); err != nil || !ok {
+		return err
+	}
+	dst.Spec.VpcCni.Disable = r.Spec.DisableVPCCNI
 
 	return nil
 }
@@ -42,6 +50,11 @@ func (r *AWSManagedControlPlane) ConvertFrom(srcRaw conversion.Hub) error {
 	if err := Convert_v1beta2_AWSManagedControlPlane_To_v1beta1_AWSManagedControlPlane(src, r, nil); err != nil {
 		return err
 	}
+	
+	r.Spec.DisableVPCCNI = src.Spec.VpcCni.Disable
+	if err := utilconversion.MarshalData(src, r); err != nil {
+		return err
+	}
 
 	return nil
 }
@@ -89,3 +102,11 @@ func Convert_v1beta1_Bastion_To_v1beta2_Bastion(in *infrav1beta1.Bastion, out *i
 func Convert_v1beta2_Bastion_To_v1beta1_Bastion(in *infrav1beta2.Bastion, out *infrav1beta1.Bastion, s apiconversion.Scope) error {
 	return infrav1beta1.Convert_v1beta2_Bastion_To_v1beta1_Bastion(in, out, s)
 }
+
+func Convert_v1beta1_AWSManagedControlPlaneSpec_To_v1beta2_AWSManagedControlPlaneSpec(in *AWSManagedControlPlaneSpec, out *ekscontrolplanev1.AWSManagedControlPlaneSpec, s apiconversion.Scope) error {
+	return autoConvert_v1beta1_AWSManagedControlPlaneSpec_To_v1beta2_AWSManagedControlPlaneSpec(in, out, s)
+}
+
+func Convert_v1beta2_VpcCni_To_v1beta1_VpcCni(in *ekscontrolplanev1.VpcCni, out *VpcCni, s apiconversion.Scope) error {
+	return autoConvert_v1beta2_VpcCni_To_v1beta1_VpcCni(in, out, s)
+}

controlplane/eks/api/v1beta1/conversion_test.go

@@ -18,14 +18,28 @@ package v1beta1
 
 import (
 	"testing"
-
+	
 	. "github.com/onsi/gomega"
-
-	runtime "k8s.io/apimachinery/pkg/runtime"
-	v1beta2 "sigs.k8s.io/cluster-api-provider-aws/v2/controlplane/eks/api/v1beta2"
+	
+	fuzz "github.com/google/gofuzz"
+	"k8s.io/apimachinery/pkg/api/apitesting/fuzzer"
+	"k8s.io/apimachinery/pkg/runtime"
+	runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer"
+	"sigs.k8s.io/cluster-api-provider-aws/v2/controlplane/eks/api/v1beta2"
 	utilconversion "sigs.k8s.io/cluster-api/util/conversion"
 )
 
+func fuzzFuncs(_ runtimeserializer.CodecFactory) []interface{} {
+	return []interface{}{
+		AWSManagedControlPlaneFuzzer,
+	}
+}
+
+func AWSManagedControlPlaneFuzzer(obj *AWSManagedControlPlane, c fuzz.Continue) {
+	c.FuzzNoCustom(obj)
+	obj.Spec.DisableVPCCNI = false
+}
+
 func TestFuzzyConversion(t *testing.T) {
 	g := NewWithT(t)
 	scheme := runtime.NewScheme()
@@ -36,5 +50,6 @@ func TestFuzzyConversion(t *testing.T) {
 		Scheme: scheme,
 		Hub:    &v1beta2.AWSManagedControlPlane{},
 		Spoke:  &AWSManagedControlPlane{},
+		FuzzerFuncs: []fuzzer.FuzzerFuncs{fuzzFuncs},
 	}))
 }

controlplane/eks/api/v1beta1/zz_generated.conversion.go

@@ -163,14 +163,6 @@ type AWSManagedControlPlaneSpec struct { //nolint: maligned
 	// +optional
 	OIDCIdentityProviderConfig *OIDCIdentityProviderConfig `json:"oidcIdentityProviderConfig,omitempty"`
 
-	// DisableVPCCNI indicates that the Amazon VPC CNI should be disabled. With EKS clusters the
-	// Amazon VPC CNI is automatically installed into the cluster. For clusters where you want
-	// to use an alternate CNI this option provides a way to specify that the Amazon VPC CNI
-	// should be deleted. You cannot set this to true if you are using the
-	// Amazon VPC CNI addon.
-	// +kubebuilder:default=false
-	DisableVPCCNI bool `json:"disableVPCCNI,omitempty"`
-
 	// VpcCni is used to set configuration options for the VPC CNI plugin
 	// +optional
 	VpcCni VpcCni `json:"vpcCni,omitempty"`
@@ -192,6 +184,13 @@ type KubeProxy struct {
 
 // VpcCni specifies configuration related to the VPC CNI.
 type VpcCni struct {
+	// Disable indicates that the Amazon VPC CNI should be disabled. With EKS clusters the
+	// Amazon VPC CNI is automatically installed into the cluster. For clusters where you want
+	// to use an alternate CNI this option provides a way to specify that the Amazon VPC CNI
+	// should be deleted. You cannot set this to true if you are using the
+	// Amazon VPC CNI addon.
+	// +kubebuilder:default=false
+	Disable bool `json:"disable,omitempty"`
 	// Env defines a list of environment variables to apply to the `aws-node` DaemonSet
 	// +optional
 	Env []corev1.EnvVar `json:"env,omitempty"`

controlplane/eks/api/v1beta2/awsmanagedcontrolplane_types.go

@@ -369,13 +369,13 @@ func (r *AWSManagedControlPlane) validateKubeProxy() field.ErrorList {
 func (r *AWSManagedControlPlane) validateDisableVPCCNI() field.ErrorList {
 	var allErrs field.ErrorList
 
-	if r.Spec.DisableVPCCNI {
-		disableField := field.NewPath("spec", "disableVPCCNI")
+	if r.Spec.VpcCni.Disable {
+		disableField := field.NewPath("spec", "vpcCni", "disable")
 
 		if r.Spec.Addons != nil {
 			for _, addon := range *r.Spec.Addons {
 				if addon.Name == vpcCniAddon {
-					allErrs = append(allErrs, field.Invalid(disableField, r.Spec.DisableVPCCNI, "cannot disable vpc cni if the vpc-cni addon is specified"))
+					allErrs = append(allErrs, field.Invalid(disableField, r.Spec.VpcCni.Disable, "cannot disable vpc cni if the vpc-cni addon is specified"))
 					break
 				}
 			}