Merge pull request #1624 from haarchri/feature/kafka-fix

fix(kafka): add clusterName because of api-changes
crossplane-contrib · Jan 12, 2023 · cbc5c75 · cbc5c75
2 parents f86f4ce + e46e21a
commit cbc5c75
Show file tree

Hide file tree

Showing 8 changed files with 62 additions and 64 deletions.
diff --git a/apis/kafka/generator-config.yaml b/apis/kafka/generator-config.yaml
@@ -3,7 +3,6 @@ ignore:
     - ClusterV2
   field_paths:
     - CreateClusterInput.BrokerNodeGroupInfo
-    - CreateClusterInput.ClusterName
     - CreateClusterInput.ConfigurationInfo
     - CreateConfigurationInput.Name
     - CreateConfigurationInput.ServerProperties

diff --git a/apis/kafka/v1alpha1/zz_cluster.go b/apis/kafka/v1alpha1/zz_cluster.go
diff --git a/apis/kafka/v1alpha1/zz_generated.deepcopy.go b/apis/kafka/v1alpha1/zz_generated.deepcopy.go
diff --git a/examples/kafka/cluster.yaml b/examples/kafka/cluster.yaml
@@ -5,6 +5,7 @@ metadata:
   name: example
 spec:
   forProvider:
+    clusterName: example
     region: us-east-1
     brokerNodeGroupInfo:
       clientSubnetRefs:

diff --git a/package/crds/kafka.aws.crossplane.io_clusters.yaml b/package/crds/kafka.aws.crossplane.io_clusters.yaml
@@ -293,6 +293,9 @@ spec:
                             type: boolean
                         type: object
                     type: object
+                  clusterName:
+                    description: The name of the cluster.
+                    type: string
                   configurationInfo:
                     description: Represents the configuration that you want MSK to
                       use for the cluster.
@@ -479,6 +482,7 @@ spec:
                     description: Create tags when creating the cluster.
                     type: object
                 required:
+                - clusterName
                 - kafkaVersion
                 - numberOfBrokerNodes
                 - region
@@ -663,9 +667,6 @@ spec:
                   clusterARN:
                     description: The Amazon Resource Name (ARN) of the cluster.
                     type: string
-                  clusterName:
-                    description: The name of the MSK cluster.
-                    type: string
                   state:
                     description: The state of the cluster. The possible states are
                       ACTIVE, CREATING, DELETING, FAILED, HEALING, MAINTENANCE, REBOOTING_BROKER,

diff --git a/pkg/controller/kafka/cluster/setup.go b/pkg/controller/kafka/cluster/setup.go
@@ -39,7 +39,6 @@ func SetupCluster(mgr ctrl.Manager, o controller.Options) error {
 	name := managed.ControllerName(svcapitypes.ClusterGroupKind)
 	opts := []option{
 		func(e *external) {
-			e.preObserve = preObserve
 			e.postObserve = postObserve
 			e.preDelete = preDelete
 			e.postDelete = postDelete
@@ -84,11 +83,6 @@ func postDelete(_ context.Context, cr *svcapitypes.Cluster, obj *svcsdk.DeleteCl
 	return err
 }
 
-func preObserve(_ context.Context, cr *svcapitypes.Cluster, obj *svcsdk.DescribeClusterInput) error {
-	obj.ClusterArn = awsclients.String(meta.GetExternalName(cr))
-	return nil
-}
-
 func postObserve(_ context.Context, cr *svcapitypes.Cluster, obj *svcsdk.DescribeClusterOutput, obs managed.ExternalObservation, err error) (managed.ExternalObservation, error) {
 	if err != nil {
 		return managed.ExternalObservation{}, err
@@ -118,7 +112,6 @@ func postObserve(_ context.Context, cr *svcapitypes.Cluster, obj *svcsdk.Describ
 }
 
 func preCreate(_ context.Context, cr *svcapitypes.Cluster, obj *svcsdk.CreateClusterInput) error {
-	obj.ClusterName = awsclients.String(meta.GetExternalName(cr))
 	obj.BrokerNodeGroupInfo = &svcsdk.BrokerNodeGroupInfo{
 		ClientSubnets:  cr.Spec.ForProvider.CustomBrokerNodeGroupInfo.ClientSubnets,
 		InstanceType:   cr.Spec.ForProvider.CustomBrokerNodeGroupInfo.InstanceType,

diff --git a/pkg/controller/kafka/cluster/zz_controller.go b/pkg/controller/kafka/cluster/zz_controller.go
diff --git a/pkg/controller/kafka/cluster/zz_conversions.go b/pkg/controller/kafka/cluster/zz_conversions.go