wip: working changes

Signed-off-by: Richard Case <[email protected]>

Author: richardcase

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

@@ -1707,14 +1707,11 @@ spec:
                 description: Bastion contains options to configure the bastion host.
                 properties:
                   allowedCIDRBlocks:
-                    allOf:
-                    - items:
-                        type: string
-                    - items:
-                        type: string
                     description: AllowedCIDRBlocks is a list of CIDR blocks allowed
                       to access the bastion host. They are set as ingress rules for
                       the Bastion host's Security Group (defaults to 0.0.0.0/0).
+                    items:
+                      type: string
                     type: array
                   ami:
                     description: AMI will use the specified AMI to boot the bastion.
@@ -1785,13 +1782,10 @@ spec:
                       publicly accessible
                     type: boolean
                   publicCIDRs:
-                    allOf:
-                    - items:
-                        type: string
-                    - items:
-                        type: string
                     description: PublicCIDRs specifies which blocks can access the
                       public endpoint
+                    items:
+                      type: string
                     type: array
                 type: object
               iamAuthenticatorConfig:
@@ -2308,23 +2302,18 @@ spec:
                 description: The AWS Region the cluster lives in.
                 type: string
               roleAdditionalPolicies:
-                allOf:
-                - items:
-                    type: string
-                - items:
-                    type: string
                 description: RoleAdditionalPolicies allows you to attach additional
                   polices to the control plane role. You must enable the EKSAllowAddRoles
                   feature flag to incorporate these into the created role.
+                items:
+                  type: string
                 type: array
               roleName:
-                allOf:
-                - minLength: 2
-                - minLength: 2
                 description: RoleName specifies the name of IAM role that gives EKS
                   permission to make API calls. If the role is pre-existing we will
                   treat it as unmanaged and not delete it on deletion. If the EKSEnableIAM
                   feature flag is true and no name is supplied then a role is created.
+                minLength: 2
                 type: string
               secondaryCidrBlock:
                 description: SecondaryCidrBlock is the additional CIDR range to use

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

@@ -36,38 +36,9 @@ const (
 type AWSManagedControlPlaneSpec struct { //nolint: maligned
 	AWSManagedControlPlaneClassSpec `json:",inline"`
 
-	// EKSClusterName allows you to specify the name of the EKS cluster in
-	// AWS. If you don't specify a name then a default name will be created
-	// based on the namespace and name of the managed control plane.
-	// +optional
-	EKSClusterName string `json:"eksClusterName,omitempty"`
-
-	// RoleName specifies the name of IAM role that gives EKS
-	// permission to make API calls. If the role is pre-existing
-	// we will treat it as unmanaged and not delete it on
-	// deletion. If the EKSEnableIAM feature flag is true
-	// and no name is supplied then a role is created.
-	// +kubebuilder:validation:MinLength:=2
-	// +optional
-	RoleName *string `json:"roleName,omitempty"`
-
-	// RoleAdditionalPolicies allows you to attach additional polices to
-	// the control plane role. You must enable the EKSAllowAddRoles
-	// feature flag to incorporate these into the created role.
-	// +optional
-	RoleAdditionalPolicies *[]string `json:"roleAdditionalPolicies,omitempty"`
-
-	// Endpoints specifies access to this cluster's control plane endpoints
-	// +optional
-	EndpointAccess EndpointAccess `json:"endpointAccess,omitempty"`
-
 	// ControlPlaneEndpoint represents the endpoint used to communicate with the control plane.
 	// +optional
 	ControlPlaneEndpoint clusterv1.APIEndpoint `json:"controlPlaneEndpoint"`
-
-	// Bastion contains options to configure the bastion host.
-	// +optional
-	Bastion infrav1.Bastion `json:"bastion"`
 }
 
 // KubeProxy specifies how the kube-proxy daemonset is managed.