rebase main

Author: joshfrench

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

@@ -53,6 +53,21 @@ spec:
                     description: AWSManagedControlPlaneSpec defines the desired state
                       of an Amazon EKS Cluster.
                     properties:
+                      accessConfig:
+                        description: AccessConfig specifies the access configuration
+                          information for the cluster
+                        properties:
+                          authenticationMode:
+                            default: CONFIG_MAP
+                            description: |-
+                              AuthenticationMode specifies the desired authentication mode for the cluster
+                              Defaults to CONFIG_MAP
+                            enum:
+                            - CONFIG_MAP
+                            - API
+                            - API_AND_CONFIG_MAP
+                            type: string
+                        type: object
                       additionalTags:
                         additionalProperties:
                           type: string

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

@@ -121,7 +121,7 @@ func (s *Service) reconcileCluster(ctx context.Context) error {
 		return errors.Wrap(err, "failed reconciling cluster config")
 	}
 
-	if err := s.reconcileAccessConfig(cluster.AccessConfig); err != nil {
+	if err := s.reconcileAccessConfig(ctx, cluster.AccessConfig); err != nil {
 		return errors.Wrap(err, "failed reconciling access config")
 	}
 
@@ -429,7 +429,7 @@ func (s *Service) createCluster(ctx context.Context, eksClusterName string) (*ek
 	var accessConfig *ekstypes.CreateAccessConfigRequest
 	if s.scope.ControlPlane.Spec.AccessConfig != nil && s.scope.ControlPlane.Spec.AccessConfig.AuthenticationMode != "" {
 		accessConfig = &ekstypes.CreateAccessConfigRequest{
-			AuthenticationMode: string(s.scope.ControlPlane.Spec.AccessConfig.AuthenticationMode),
+			AuthenticationMode: ekstypes.AuthenticationMode(string(s.scope.ControlPlane.Spec.AccessConfig.AuthenticationMode)),
 		}
 	}
 
@@ -485,10 +485,6 @@ func (s *Service) createCluster(ctx context.Context, eksClusterName string) (*ek
 		BootstrapSelfManagedAddons: bootstrapAddon,
 	}
 
-	if err := input.Validate(); err != nil {
-		return nil, errors.Wrap(err, "created invalid CreateClusterInput")
-	}
-
 	var out *eks.CreateClusterOutput
 	if err := wait.WaitForWithRetryable(wait.NewBackoff(), func() (bool, error) {
 		if out, err = s.EKSClient.CreateCluster(ctx, input); err != nil {
@@ -558,40 +554,34 @@ func (s *Service) reconcileClusterConfig(ctx context.Context, cluster *ekstypes.
 	return nil
 }
 
-func (s *Service) reconcileAccessConfig(accessConfig *ekstypes.AccessConfigResponse) error {
+func (s *Service) reconcileAccessConfig(ctx context.Context, accessConfig *ekstypes.AccessConfigResponse) error {
 	input := &eks.UpdateClusterConfigInput{Name: aws.String(s.scope.KubernetesClusterName())}
 
 	if s.scope.ControlPlane.Spec.AccessConfig == nil || s.scope.ControlPlane.Spec.AccessConfig.AuthenticationMode == "" {
 		return nil
 	}
 
-	expectedAuthenticationMode := string(s.scope.ControlPlane.Spec.AccessConfig.AuthenticationMode)
+	expectedAuthenticationMode := ekstypes.AuthenticationMode(string(s.scope.ControlPlane.Spec.AccessConfig.AuthenticationMode))
 	s.scope.Debug("Reconciling EKS Access Config for cluster", "cluster-name", s.scope.KubernetesClusterName(), "expected", expectedAuthenticationMode, "current", accessConfig.AuthenticationMode)
 	if expectedAuthenticationMode != accessConfig.AuthenticationMode {
-		input.AccessConfig = &eks.UpdateAccessConfigRequest{
-			AuthenticationMode: aws.String(expectedAuthenticationMode),
+		input.AccessConfig = &ekstypes.UpdateAccessConfigRequest{
+			AuthenticationMode: expectedAuthenticationMode,
 		}
 	}
 
 	if input.AccessConfig != nil {
-		if err := input.Validate(); err != nil {
-			return errors.Wrap(err, "created invalid UpdateClusterConfigInput")
-		}
-
 		if err := wait.WaitForWithRetryable(wait.NewBackoff(), func() (bool, error) {
-			if _, err := s.EKSClient.UpdateClusterConfig(input); err != nil {
-				if aerr, ok := err.(awserr.Error); ok {
-					return false, aerr
-				}
+			if _, err := s.EKSClient.UpdateClusterConfig(ctx, input); err != nil {
 				return false, err
 			}
 
 			// Wait until status transitions to UPDATING because there's a short
 			// window after UpdateClusterConfig returns where the cluster
 			// status is ACTIVE and the update would be tried again
 			if err := s.EKSClient.WaitUntilClusterUpdating(
+				ctx,
 				&eks.DescribeClusterInput{Name: aws.String(s.scope.KubernetesClusterName())},
-				request.WithWaiterLogger(&awslog{s.GetLogger()}),
+				s.scope.MaxWaitActiveUpdateDelete,
 			); err != nil {
 				return false, err
 			}