turn on CloudIdentityMembership direct controller

Author: gemmahou

apis/cloudidentity/v1beta1/membership_types.go

@@ -153,7 +153,7 @@ type MembershipDisplayNameStatus struct {
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 // +kubebuilder:resource:categories=gcp,shortName=gcpcloudidentitymembership;gcpcloudidentitymemberships
 // +kubebuilder:subresource:status
-// +kubebuilder:metadata:labels="cnrm.cloud.google.com/dcl2crd=true";"cnrm.cloud.google.com/managed-by-kcc=true";"cnrm.cloud.google.com/stability-level=stable";"cnrm.cloud.google.com/system=true"
+// +kubebuilder:metadata:labels="cnrm.cloud.google.com/managed-by-kcc=true";"cnrm.cloud.google.com/stability-level=stable";"cnrm.cloud.google.com/system=true"
 // +kubebuilder:printcolumn:name="Age",JSONPath=".metadata.creationTimestamp",type="date"
 // +kubebuilder:printcolumn:name="Ready",JSONPath=".status.conditions[?(@.type=='Ready')].status",type="string",description="When 'True', the most recent reconcile of the resource succeeded"
 // +kubebuilder:printcolumn:name="Status",JSONPath=".status.conditions[?(@.type=='Ready')].reason",type="string",description="The reason for the value in 'Ready'"

config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_cloudidentitymemberships.cloudidentity.cnrm.cloud.google.com.yaml

@@ -141,7 +141,7 @@ func (a *GroupAdapter) Create(ctx context.Context, createOp *directbase.CreateOp
 		return fmt.Errorf("creating Group %s: %w", a.id, err)
 	}
 	if err := WaitForCloudIdentityOp(ctx, op); err != nil {
-		return fmt.Errorf("error waiting Group %s deletion: %w", a.id, err)
+		return fmt.Errorf("error waiting Group %s creation: %w", a.id, err)
 	}
 
 	// Get server generated group name

pkg/controller/direct/cloudidentity/group_controller.go

@@ -1,9 +1,6 @@
 apiVersion: cloudidentity.cnrm.cloud.google.com/v1beta1
 kind: CloudIdentityMembership
 metadata:
-  annotations:
-    alpha.cnrm.cloud.google.com/reconciler: direct
-    cnrm.cloud.google.com/management-conflict-prevention-policy: none
   finalizers:
   - cnrm.cloud.google.com/finalizer
   - cnrm.cloud.google.com/deletion-defender

pkg/gvks/supportedgvks/gvks_generated.go

@@ -16,8 +16,6 @@ apiVersion: cloudidentity.cnrm.cloud.google.com/v1beta1
 kind: CloudIdentityMembership
 metadata:
   name: cloudidentitymembership-${uniqueId}
-  annotations:
-    alpha.cnrm.cloud.google.com/reconciler: "direct"
 spec:
   groupRef:
     name: cloudidentitygroup-${uniqueId}

pkg/test/resourcefixture/testdata/basic/cloudidentity/v1beta1/cloudidentitymembership/addexpirydatecloudidentitymembership-direct/_generated_object_addexpirydatecloudidentitymembership-direct.golden.yaml

@@ -16,8 +16,6 @@ apiVersion: cloudidentity.cnrm.cloud.google.com/v1beta1
 kind: CloudIdentityMembership
 metadata:
   name: cloudidentitymembership-${uniqueId}
-  annotations:
-    alpha.cnrm.cloud.google.com/reconciler: "direct"
 spec:
   groupRef:
     name: cloudidentitygroup-${uniqueId}

pkg/test/resourcefixture/testdata/basic/cloudidentity/v1beta1/cloudidentitymembership/addexpirydatecloudidentitymembership-direct/create.yaml

@@ -1,9 +1,6 @@
 apiVersion: cloudidentity.cnrm.cloud.google.com/v1beta1
 kind: CloudIdentityMembership
 metadata:
-  annotations:
-    alpha.cnrm.cloud.google.com/reconciler: direct
-    cnrm.cloud.google.com/management-conflict-prevention-policy: none
   finalizers:
   - cnrm.cloud.google.com/finalizer
   - cnrm.cloud.google.com/deletion-defender

pkg/test/resourcefixture/testdata/basic/cloudidentity/v1beta1/cloudidentitymembership/addexpirydatecloudidentitymembership-direct/update.yaml

@@ -16,8 +16,6 @@ apiVersion: cloudidentity.cnrm.cloud.google.com/v1beta1
 kind: CloudIdentityMembership
 metadata:
   name: cloudidentitymembership-${uniqueId}
-  annotations:
-    alpha.cnrm.cloud.google.com/reconciler: "direct"
 spec:
   groupRef:
     name: cloudidentitygroup-${uniqueId}

pkg/test/resourcefixture/testdata/basic/cloudidentity/v1beta1/cloudidentitymembership/addrolecloudidentitymembership-direct/_generated_object_addrolecloudidentitymembership-direct.golden.yaml

@@ -16,8 +16,6 @@ apiVersion: cloudidentity.cnrm.cloud.google.com/v1beta1
 kind: CloudIdentityMembership
 metadata:
   name: cloudidentitymembership-${uniqueId}
-  annotations:
-    alpha.cnrm.cloud.google.com/reconciler: "direct"
 spec:
   groupRef:
     name: cloudidentitygroup-${uniqueId}