Merge pull request #2098 from simwak/feat/eks-acessconfig-lateinit-ob…

…servation feat(eks): Add accessConfig LateInit & Observation
crossplane-contrib · Oct 4, 2024 · b94bc2b · b94bc2b
2 parents bb2b23e + 7040ad2
commit b94bc2b
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 3 deletions.
diff --git a/apis/eks/v1beta1/types.go b/apis/eks/v1beta1/types.go
@@ -360,6 +360,9 @@ type ClusterObservation struct {
 	// in the Amazon EKS User Guide.
 	ResourcesVpcConfig VpcConfigResponse `json:"resourcesVpcConfig,omitempty"`
 
+	// The access configuration for the cluster.
+	AccessConfig AccessConfigResponse `json:"accessConfig,omitempty"`
+
 	// The current status of the cluster.
 	Status ClusterStatusType `json:"status,omitempty"`
 }
@@ -464,6 +467,12 @@ type VpcConfigResponse struct {
 	VpcID string `json:"vpcId,omitempty"`
 }
 
+// AccessConfigResponse is the observed access configuration for a cluster.
+type AccessConfigResponse struct {
+	// The authentication mode used for the cluster.
+	AuthenticationMode AuthenticationMode `json:"authenticationMode,omitempty"`
+}
+
 // A ClusterSpec defines the desired state of an EKS Cluster.
 type ClusterSpec struct {
 	xpv1.ResourceSpec `json:",inline"`

diff --git a/apis/eks/v1beta1/zz_generated.deepcopy.go b/apis/eks/v1beta1/zz_generated.deepcopy.go
diff --git a/package/crds/eks.aws.crossplane.io_clusters.yaml b/package/crds/eks.aws.crossplane.io_clusters.yaml
@@ -765,6 +765,13 @@ spec:
               atProvider:
                 description: ClusterObservation is the observed state of a cluster.
                 properties:
+                  accessConfig:
+                    description: The access configuration for the cluster.
+                    properties:
+                      authenticationMode:
+                        description: The authentication mode used for the cluster.
+                        type: string
+                    type: object
                   arn:
                     description: The Amazon Resource Name (ARN) of the cluster.
                     type: string

diff --git a/pkg/clients/eks/eks.go b/pkg/clients/eks/eks.go
@@ -36,7 +36,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/tools/clientcmd"
 	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
-	"k8s.io/utils/ptr"
 
 	"github.com/crossplane-contrib/provider-aws/apis/eks/v1beta1"
 	"github.com/crossplane-contrib/provider-aws/pkg/utils/jsonpatch"
@@ -294,6 +293,12 @@ func GenerateObservation(cluster *ekstypes.Cluster) v1beta1.ClusterObservation {
 		}
 	}
 
+	if cluster.AccessConfig != nil {
+		o.AccessConfig = v1beta1.AccessConfigResponse{
+			AuthenticationMode: v1beta1.AuthenticationMode(cluster.AccessConfig.AuthenticationMode),
+		}
+	}
+
 	if cluster.CertificateAuthority != nil {
 		o.CertificateAuthorityData = pointer.StringValue(cluster.CertificateAuthority.Data)
 	}
@@ -361,8 +366,15 @@ func LateInitialize(in *v1beta1.ClusterParameters, cluster *ekstypes.Cluster) {
 		}
 	}
 	if cluster.AccessConfig != nil {
-		in.AccessConfig = &v1beta1.AccessConfig{
-			AuthenticationMode: ptr.To(v1beta1.AuthenticationMode(string(cluster.AccessConfig.AuthenticationMode))),
+		currentAuthenticationMode := v1beta1.AuthenticationMode(cluster.AccessConfig.AuthenticationMode)
+		if in.AccessConfig == nil {
+			in.AccessConfig = &v1beta1.AccessConfig{
+				AuthenticationMode: &currentAuthenticationMode,
+			}
+		} else {
+			in.AccessConfig = &v1beta1.AccessConfig{
+				AuthenticationMode: pointer.LateInitialize(in.AccessConfig.AuthenticationMode, &currentAuthenticationMode),
+			}
 		}
 	}