Merge pull request #3417 from jasonvigil/fix-mgmt-conflict

fix: Do not add management conflict annotaiton for direct resources
GoogleCloudPlatform · Dec 20, 2024 · 287a254 · 287a254
2 parents 34d4e72 + d74380e
commit 287a254
Show file tree

Hide file tree

Showing 74 changed files with 18 additions and 122 deletions.
diff --git a/pkg/gvks/supportedgvks/supportedgvks.go b/pkg/gvks/supportedgvks/supportedgvks.go
@@ -144,3 +144,17 @@ func BasedOnDCL(serviceMetaLoader metadata.ServiceMetadataLoader) []schema.Group
 	}
 	return gvkList
 }
+
+func IsDirectByGVK(gvk schema.GroupVersionKind) bool {
+	metadata, ok := SupportedGVKs[gvk]
+	if !ok {
+		return false
+	}
+	if metadata.Labels[k8s.TF2CRDLabel] == "true" {
+		return false
+	}
+	if metadata.Labels[k8s.DCL2CRDLabel] == "true" {
+		return false
+	}
+	return true
+}
diff --git a/...shubdataexchange-base/_generated_object_bigqueryanalyticshubdataexchange-base.golden.yaml b/...shubdataexchange-base/_generated_object_bigqueryanalyticshubdataexchange-base.golden.yaml
@@ -1,8 +1,6 @@
 apiVersion: bigqueryanalyticshub.cnrm.cloud.google.com/v1beta1
 kind: BigQueryAnalyticsHubDataExchange
 metadata:
-  annotations:
-    cnrm.cloud.google.com/management-conflict-prevention-policy: none
   finalizers:
   - cnrm.cloud.google.com/finalizer
   - cnrm.cloud.google.com/deletion-defender

diff --git a/...shubdataexchange-full/_generated_object_bigqueryanalyticshubdataexchange-full.golden.yaml b/...shubdataexchange-full/_generated_object_bigqueryanalyticshubdataexchange-full.golden.yaml
@@ -1,8 +1,6 @@
 apiVersion: bigqueryanalyticshub.cnrm.cloud.google.com/v1beta1
 kind: BigQueryAnalyticsHubDataExchange
 metadata:
-  annotations:
-    cnrm.cloud.google.com/management-conflict-prevention-policy: none
   finalizers:
   - cnrm.cloud.google.com/finalizer
   - cnrm.cloud.google.com/deletion-defender

diff --git a/...ryanalyticshublisting-base/_generated_object_bigqueryanalyticshublisting-base.golden.yaml b/...ryanalyticshublisting-base/_generated_object_bigqueryanalyticshublisting-base.golden.yaml
@@ -1,8 +1,6 @@
 apiVersion: bigqueryanalyticshub.cnrm.cloud.google.com/v1beta1
 kind: BigQueryAnalyticsHubListing
 metadata:
-  annotations:
-    cnrm.cloud.google.com/management-conflict-prevention-policy: none
   finalizers:
   - cnrm.cloud.google.com/finalizer
   - cnrm.cloud.google.com/deletion-defender

diff --git a/...ryanalyticshublisting-full/_generated_object_bigqueryanalyticshublisting-full.golden.yaml b/...ryanalyticshublisting-full/_generated_object_bigqueryanalyticshublisting-full.golden.yaml
@@ -1,8 +1,6 @@
 apiVersion: bigqueryanalyticshub.cnrm.cloud.google.com/v1beta1
 kind: BigQueryAnalyticsHubListing
 metadata:
-  annotations:
-    cnrm.cloud.google.com/management-conflict-prevention-policy: none
   finalizers:
   - cnrm.cloud.google.com/finalizer
   - cnrm.cloud.google.com/deletion-defender

diff --git a/...yconnectionconnection/awsconnectionbasic/_generated_object_awsconnectionbasic.golden.yaml b/...yconnectionconnection/awsconnectionbasic/_generated_object_awsconnectionbasic.golden.yaml
@@ -1,8 +1,6 @@
 apiVersion: bigqueryconnection.cnrm.cloud.google.com/v1beta1
 kind: BigQueryConnectionConnection
 metadata:
-  annotations:
-    cnrm.cloud.google.com/management-conflict-prevention-policy: none
   finalizers:
   - cnrm.cloud.google.com/finalizer
   - cnrm.cloud.google.com/deletion-defender

diff --git a/...nectionconnection/azureconnectionbasic/_generated_object_azureconnectionbasic.golden.yaml b/...nectionconnection/azureconnectionbasic/_generated_object_azureconnectionbasic.golden.yaml
@@ -1,8 +1,6 @@
 apiVersion: bigqueryconnection.cnrm.cloud.google.com/v1beta1
 kind: BigQueryConnectionConnection
 metadata:
-  annotations:
-    cnrm.cloud.google.com/management-conflict-prevention-policy: none
   finalizers:
   - cnrm.cloud.google.com/finalizer
   - cnrm.cloud.google.com/deletion-defender

diff --git a/...connectionconnectionbasic/_generated_object_bigqueryconnectionconnectionbasic.golden.yaml b/...connectionconnectionbasic/_generated_object_bigqueryconnectionconnectionbasic.golden.yaml
@@ -1,8 +1,6 @@
 apiVersion: bigqueryconnection.cnrm.cloud.google.com/v1beta1
 kind: BigQueryConnectionConnection
 metadata:
-  annotations:
-    cnrm.cloud.google.com/management-conflict-prevention-policy: none
   finalizers:
   - cnrm.cloud.google.com/finalizer
   - cnrm.cloud.google.com/deletion-defender

diff --git a/...ryconnectionconnectionfull/_generated_object_bigqueryconnectionconnectionfull.golden.yaml b/...ryconnectionconnectionfull/_generated_object_bigqueryconnectionconnectionfull.golden.yaml
@@ -1,8 +1,6 @@
 apiVersion: bigqueryconnection.cnrm.cloud.google.com/v1beta1
 kind: BigQueryConnectionConnection
 metadata:
-  annotations:
-    cnrm.cloud.google.com/management-conflict-prevention-policy: none
   finalizers:
   - cnrm.cloud.google.com/finalizer
   - cnrm.cloud.google.com/deletion-defender

diff --git a/...ion/cloudspannerconnectionbasic/_generated_object_cloudspannerconnectionbasic.golden.yaml b/...ion/cloudspannerconnectionbasic/_generated_object_cloudspannerconnectionbasic.golden.yaml
@@ -1,8 +1,6 @@
 apiVersion: bigqueryconnection.cnrm.cloud.google.com/v1beta1
 kind: BigQueryConnectionConnection
 metadata:
-  annotations:
-    cnrm.cloud.google.com/management-conflict-prevention-policy: none
   finalizers:
   - cnrm.cloud.google.com/finalizer
   - cnrm.cloud.google.com/deletion-defender

diff --git a/...nconnection/cloudsqlconnectionbasic/_generated_object_cloudsqlconnectionbasic.golden.yaml b/...nconnection/cloudsqlconnectionbasic/_generated_object_cloudsqlconnectionbasic.golden.yaml
@@ -1,8 +1,6 @@
 apiVersion: bigqueryconnection.cnrm.cloud.google.com/v1beta1
 kind: BigQueryConnectionConnection
 metadata:
-  annotations:
-    cnrm.cloud.google.com/management-conflict-prevention-policy: none
   finalizers:
   - cnrm.cloud.google.com/finalizer
   - cnrm.cloud.google.com/deletion-defender

diff --git a/...nectionconnection/sparkconnectionbasic/_generated_object_sparkconnectionbasic.golden.yaml b/...nectionconnection/sparkconnectionbasic/_generated_object_sparkconnectionbasic.golden.yaml
@@ -1,8 +1,6 @@
 apiVersion: bigqueryconnection.cnrm.cloud.google.com/v1beta1
 kind: BigQueryConnectionConnection
 metadata:
-  annotations:
-    cnrm.cloud.google.com/management-conflict-prevention-policy: none
   finalizers:
   - cnrm.cloud.google.com/finalizer
   - cnrm.cloud.google.com/deletion-defender

diff --git a/...sferconfig-salesforce/_generated_object_bigquerydatatransferconfig-salesforce.golden.yaml b/...sferconfig-salesforce/_generated_object_bigquerydatatransferconfig-salesforce.golden.yaml
@@ -1,8 +1,6 @@
 apiVersion: bigquerydatatransfer.cnrm.cloud.google.com/v1beta1
 kind: BigQueryDataTransferConfig
 metadata:
-  annotations:
-    cnrm.cloud.google.com/management-conflict-prevention-policy: none
   finalizers:
   - cnrm.cloud.google.com/finalizer
   - cnrm.cloud.google.com/deletion-defender

diff --git a/...ig-scheduledquery/_generated_object_bigquerydatatransferconfig-scheduledquery.golden.yaml b/...ig-scheduledquery/_generated_object_bigquerydatatransferconfig-scheduledquery.golden.yaml
@@ -1,8 +1,6 @@
 apiVersion: bigquerydatatransfer.cnrm.cloud.google.com/v1beta1
 kind: BigQueryDataTransferConfig
 metadata:
-  annotations:
-    cnrm.cloud.google.com/management-conflict-prevention-policy: none
   finalizers:
   - cnrm.cloud.google.com/finalizer
   - cnrm.cloud.google.com/deletion-defender

diff --git a/...sauthorization-full/_generated_object_certificatemanagerdnsauthorization-full.golden.yaml b/...sauthorization-full/_generated_object_certificatemanagerdnsauthorization-full.golden.yaml
@@ -1,8 +1,6 @@
 apiVersion: certificatemanager.cnrm.cloud.google.com/v1beta1
 kind: CertificateManagerDNSAuthorization
 metadata:
-  annotations:
-    cnrm.cloud.google.com/management-conflict-prevention-policy: none
   finalizers:
   - cnrm.cloud.google.com/finalizer
   - cnrm.cloud.google.com/deletion-defender

diff --git a/...rization-minimal/_generated_object_certificatemanagerdnsauthorization-minimal.golden.yaml b/...rization-minimal/_generated_object_certificatemanagerdnsauthorization-minimal.golden.yaml
@@ -1,8 +1,6 @@
 apiVersion: certificatemanager.cnrm.cloud.google.com/v1beta1
 kind: CertificateManagerDNSAuthorization
 metadata:
-  annotations:
-    cnrm.cloud.google.com/management-conflict-prevention-policy: none
   finalizers:
   - cnrm.cloud.google.com/finalizer
   - cnrm.cloud.google.com/deletion-defender

diff --git a/...emanagerdnsauthorization/_generated_object_certificatemanagerdnsauthorization.golden.yaml b/...emanagerdnsauthorization/_generated_object_certificatemanagerdnsauthorization.golden.yaml
@@ -1,8 +1,6 @@
 apiVersion: certificatemanager.cnrm.cloud.google.com/v1beta1
 kind: CertificateManagerDNSAuthorization
 metadata:
-  annotations:
-    cnrm.cloud.google.com/management-conflict-prevention-policy: none
   finalizers:
   - cnrm.cloud.google.com/finalizer
   - cnrm.cloud.google.com/deletion-defender

diff --git a/...loudbuild/v1beta1/cloudbuildworkerpool/_generated_object_cloudbuildworkerpool.golden.yaml b/...loudbuild/v1beta1/cloudbuildworkerpool/_generated_object_cloudbuildworkerpool.golden.yaml
@@ -1,8 +1,6 @@
 apiVersion: cloudbuild.cnrm.cloud.google.com/v1beta1
 kind: CloudBuildWorkerPool
 metadata:
-  annotations:
-    cnrm.cloud.google.com/management-conflict-prevention-policy: none
   finalizers:
   - cnrm.cloud.google.com/finalizer
   - cnrm.cloud.google.com/deletion-defender

diff --git a/...m/v1beta1/dataformrepository-basic/_generated_object_dataformrepository-basic.golden.yaml b/...m/v1beta1/dataformrepository-basic/_generated_object_dataformrepository-basic.golden.yaml
@@ -1,8 +1,6 @@
 apiVersion: dataform.cnrm.cloud.google.com/v1beta1
 kind: DataformRepository
 metadata:
-  annotations:
-    cnrm.cloud.google.com/management-conflict-prevention-policy: none
   finalizers:
   - cnrm.cloud.google.com/finalizer
   - cnrm.cloud.google.com/deletion-defender

diff --git a/...orm/v1beta1/dataformrepository-full/_generated_object_dataformrepository-full.golden.yaml b/...orm/v1beta1/dataformrepository-full/_generated_object_dataformrepository-full.golden.yaml
@@ -1,8 +1,6 @@
 apiVersion: dataform.cnrm.cloud.google.com/v1beta1
 kind: DataformRepository
 metadata:
-  annotations:
-    cnrm.cloud.google.com/management-conflict-prevention-policy: none
   finalizers:
   - cnrm.cloud.google.com/finalizer
   - cnrm.cloud.google.com/deletion-defender

diff --git a/...storedatabase/firestoredatabase-full/_generated_object_firestoredatabase-full.golden.yaml b/...storedatabase/firestoredatabase-full/_generated_object_firestoredatabase-full.golden.yaml
@@ -1,8 +1,6 @@
 apiVersion: firestore.cnrm.cloud.google.com/v1beta1
 kind: FirestoreDatabase
 metadata:
-  annotations:
-    cnrm.cloud.google.com/management-conflict-prevention-policy: none
   finalizers:
   - cnrm.cloud.google.com/finalizer
   - cnrm.cloud.google.com/deletion-defender

diff --git a/...atabase/firestoredatabase-minimal/_generated_object_firestoredatabase-minimal.golden.yaml b/...atabase/firestoredatabase-minimal/_generated_object_firestoredatabase-minimal.golden.yaml
@@ -1,8 +1,6 @@
 apiVersion: firestore.cnrm.cloud.google.com/v1beta1
 kind: FirestoreDatabase
 metadata:
-  annotations:
-    cnrm.cloud.google.com/management-conflict-prevention-policy: none
   finalizers:
   - cnrm.cloud.google.com/finalizer
   - cnrm.cloud.google.com/deletion-defender

diff --git a/...cacmgkehubfeaturemembership/_generated_object_basicacmgkehubfeaturemembership.golden.yaml b/...cacmgkehubfeaturemembership/_generated_object_basicacmgkehubfeaturemembership.golden.yaml
@@ -1,8 +1,6 @@
 apiVersion: gkehub.cnrm.cloud.google.com/v1beta1
 kind: GKEHubFeatureMembership
 metadata:
-  annotations:
-    cnrm.cloud.google.com/management-conflict-prevention-policy: none
   finalizers:
   - cnrm.cloud.google.com/finalizer
   - cnrm.cloud.google.com/deletion-defender

diff --git a/...saugkehubfeaturemembership/_generated_object_basiccsaugkehubfeaturemembership.golden.yaml b/...saugkehubfeaturemembership/_generated_object_basiccsaugkehubfeaturemembership.golden.yaml
@@ -1,8 +1,6 @@
 apiVersion: gkehub.cnrm.cloud.google.com/v1beta1
 kind: GKEHubFeatureMembership
 metadata:
-  annotations:
-    cnrm.cloud.google.com/management-conflict-prevention-policy: none
   finalizers:
   - cnrm.cloud.google.com/finalizer
   - cnrm.cloud.google.com/deletion-defender

diff --git a/...ocogkehubfeaturemembership/_generated_object_basicpocogkehubfeaturemembership.golden.yaml b/...ocogkehubfeaturemembership/_generated_object_basicpocogkehubfeaturemembership.golden.yaml
@@ -1,8 +1,6 @@
 apiVersion: gkehub.cnrm.cloud.google.com/v1beta1
 kind: GKEHubFeatureMembership
 metadata:
-  annotations:
-    cnrm.cloud.google.com/management-conflict-prevention-policy: none
   finalizers:
   - cnrm.cloud.google.com/finalizer
   - cnrm.cloud.google.com/deletion-defender

diff --git a/...llacmgkehubfeaturemembership/_generated_object_fullacmgkehubfeaturemembership.golden.yaml b/...llacmgkehubfeaturemembership/_generated_object_fullacmgkehubfeaturemembership.golden.yaml
@@ -1,8 +1,6 @@
 apiVersion: gkehub.cnrm.cloud.google.com/v1beta1
 kind: GKEHubFeatureMembership
 metadata:
-  annotations:
-    cnrm.cloud.google.com/management-conflict-prevention-policy: none
   finalizers:
   - cnrm.cloud.google.com/finalizer
   - cnrm.cloud.google.com/deletion-defender

diff --git a/...csaugkehubfeaturemembership/_generated_object_fullcsaugkehubfeaturemembership.golden.yaml b/...csaugkehubfeaturemembership/_generated_object_fullcsaugkehubfeaturemembership.golden.yaml
@@ -1,8 +1,6 @@
 apiVersion: gkehub.cnrm.cloud.google.com/v1beta1
 kind: GKEHubFeatureMembership
 metadata:
-  annotations:
-    cnrm.cloud.google.com/management-conflict-prevention-policy: none
   finalizers:
   - cnrm.cloud.google.com/finalizer
   - cnrm.cloud.google.com/deletion-defender

diff --git a/...pocogkehubfeaturemembership/_generated_object_fullpocogkehubfeaturemembership.golden.yaml b/...pocogkehubfeaturemembership/_generated_object_fullpocogkehubfeaturemembership.golden.yaml
@@ -1,8 +1,6 @@
 apiVersion: gkehub.cnrm.cloud.google.com/v1beta1
 kind: GKEHubFeatureMembership
 metadata:
-  annotations:
-    cnrm.cloud.google.com/management-conflict-prevention-policy: none
   finalizers:
   - cnrm.cloud.google.com/finalizer
   - cnrm.cloud.google.com/deletion-defender

diff --git a/...hip/meshgkehubfeaturemembership/_generated_object_meshgkehubfeaturemembership.golden.yaml b/...hip/meshgkehubfeaturemembership/_generated_object_meshgkehubfeaturemembership.golden.yaml
@@ -1,8 +1,6 @@
 apiVersion: gkehub.cnrm.cloud.google.com/v1beta1
 kind: GKEHubFeatureMembership
 metadata:
-  annotations:
-    cnrm.cloud.google.com/management-conflict-prevention-policy: none
   finalizers:
   - cnrm.cloud.google.com/finalizer
   - cnrm.cloud.google.com/deletion-defender

diff --git a/...estdata/basic/kms/v1beta1/kmsautokeyconfig/_generated_object_kmsautokeyconfig.golden.yaml b/...estdata/basic/kms/v1beta1/kmsautokeyconfig/_generated_object_kmsautokeyconfig.golden.yaml
@@ -1,8 +1,6 @@
 apiVersion: kms.cnrm.cloud.google.com/v1beta1
 kind: KMSAutokeyConfig
 metadata:
-  annotations:
-    cnrm.cloud.google.com/management-conflict-prevention-policy: none
   finalizers:
   - cnrm.cloud.google.com/finalizer
   - cnrm.cloud.google.com/deletion-defender

diff --git a/...ixture/testdata/basic/kms/v1beta1/kmskeyhandle/_generated_object_kmskeyhandle.golden.yaml b/...ixture/testdata/basic/kms/v1beta1/kmskeyhandle/_generated_object_kmskeyhandle.golden.yaml
@@ -1,8 +1,6 @@
 apiVersion: kms.cnrm.cloud.google.com/v1beta1
 kind: KMSKeyHandle
 metadata:
-  annotations:
-    cnrm.cloud.google.com/management-conflict-prevention-policy: none
   finalizers:
   - cnrm.cloud.google.com/finalizer
   - cnrm.cloud.google.com/deletion-defender

diff --git a/...1beta1/logginglogmetric/explicitlogmetric/_generated_object_explicitlogmetric.golden.yaml b/...1beta1/logginglogmetric/explicitlogmetric/_generated_object_explicitlogmetric.golden.yaml
@@ -1,8 +1,6 @@
 apiVersion: logging.cnrm.cloud.google.com/v1beta1
 kind: LoggingLogMetric
 metadata:
-  annotations:
-    cnrm.cloud.google.com/management-conflict-prevention-policy: none
   finalizers:
   - cnrm.cloud.google.com/finalizer
   - cnrm.cloud.google.com/deletion-defender

diff --git a/.../logginglogmetric/exponentiallogmetric/_generated_object_exponentiallogmetric.golden.yaml b/.../logginglogmetric/exponentiallogmetric/_generated_object_exponentiallogmetric.golden.yaml
@@ -1,8 +1,6 @@
 apiVersion: logging.cnrm.cloud.google.com/v1beta1
 kind: LoggingLogMetric
 metadata:
-  annotations:
-    cnrm.cloud.google.com/management-conflict-prevention-policy: none
   finalizers:
   - cnrm.cloud.google.com/finalizer
   - cnrm.cloud.google.com/deletion-defender

diff --git a/...ng/v1beta1/logginglogmetric/linearlogmetric/_generated_object_linearlogmetric.golden.yaml b/...ng/v1beta1/logginglogmetric/linearlogmetric/_generated_object_linearlogmetric.golden.yaml
@@ -15,8 +15,6 @@
 apiVersion: logging.cnrm.cloud.google.com/v1beta1
 kind: LoggingLogMetric
 metadata:
-  annotations:
-    cnrm.cloud.google.com/management-conflict-prevention-policy: none
   finalizers:
   - cnrm.cloud.google.com/finalizer
   - cnrm.cloud.google.com/deletion-defender

diff --git a/...ng/v1beta1/logginglogmetric/logbucketmetric/_generated_object_logbucketmetric.golden.yaml b/...ng/v1beta1/logginglogmetric/logbucketmetric/_generated_object_logbucketmetric.golden.yaml
@@ -1,8 +1,6 @@
 apiVersion: logging.cnrm.cloud.google.com/v1beta1
 kind: LoggingLogMetric
 metadata:
-  annotations:
-    cnrm.cloud.google.com/management-conflict-prevention-policy: none
   finalizers:
   - cnrm.cloud.google.com/finalizer
   - cnrm.cloud.google.com/deletion-defender

diff --git a/...dashboard/monitoringdashboardbasic/_generated_object_monitoringdashboardbasic.golden.yaml b/...dashboard/monitoringdashboardbasic/_generated_object_monitoringdashboardbasic.golden.yaml
@@ -1,8 +1,6 @@
 apiVersion: monitoring.cnrm.cloud.google.com/v1beta1
 kind: MonitoringDashboard
 metadata:
-  annotations:
-    cnrm.cloud.google.com/management-conflict-prevention-policy: none
   finalizers:
   - cnrm.cloud.google.com/finalizer
   - cnrm.cloud.google.com/deletion-defender

diff --git a/...ngdashboard/monitoringdashboardfull/_generated_object_monitoringdashboardfull.golden.yaml b/...ngdashboard/monitoringdashboardfull/_generated_object_monitoringdashboardfull.golden.yaml
@@ -1,8 +1,6 @@
 apiVersion: monitoring.cnrm.cloud.google.com/v1beta1
 kind: MonitoringDashboard
 metadata:
-  annotations:
-    cnrm.cloud.google.com/management-conflict-prevention-policy: none
   finalizers:
   - cnrm.cloud.google.com/finalizer
   - cnrm.cloud.google.com/deletion-defender

diff --git a/...toringdashboardmosaiclayout/_generated_object_monitoringdashboardmosaiclayout.golden.yaml b/...toringdashboardmosaiclayout/_generated_object_monitoringdashboardmosaiclayout.golden.yaml
@@ -1,8 +1,6 @@
 apiVersion: monitoring.cnrm.cloud.google.com/v1beta1
 kind: MonitoringDashboard
 metadata:
-  annotations:
-    cnrm.cloud.google.com/management-conflict-prevention-policy: none
   finalizers:
   - cnrm.cloud.google.com/finalizer
   - cnrm.cloud.google.com/deletion-defender

diff --git a/...ngdashboard/monitoringdashboardrefs/_generated_object_monitoringdashboardrefs.golden.yaml b/...ngdashboard/monitoringdashboardrefs/_generated_object_monitoringdashboardrefs.golden.yaml
@@ -1,8 +1,6 @@
 apiVersion: monitoring.cnrm.cloud.google.com/v1beta1
 kind: MonitoringDashboard
 metadata:
-  annotations:
-    cnrm.cloud.google.com/management-conflict-prevention-policy: none
   finalizers:
   - cnrm.cloud.google.com/finalizer
   - cnrm.cloud.google.com/deletion-defender

diff --git a/...y/serviceconnectionpolicybasic/_generated_object_serviceconnectionpolicybasic.golden.yaml b/...y/serviceconnectionpolicybasic/_generated_object_serviceconnectionpolicybasic.golden.yaml
@@ -1,8 +1,6 @@
 apiVersion: networkconnectivity.cnrm.cloud.google.com/v1alpha1
 kind: NetworkConnectivityServiceConnectionPolicy
 metadata:
-  annotations:
-    cnrm.cloud.google.com/management-conflict-prevention-policy: none
   finalizers:
   - cnrm.cloud.google.com/finalizer
   - cnrm.cloud.google.com/deletion-defender

diff --git a/...basicproject/_generated_object_privilegedaccessmanagerentitlementbasicproject.golden.yaml b/...basicproject/_generated_object_privilegedaccessmanagerentitlementbasicproject.golden.yaml
@@ -1,8 +1,6 @@
 apiVersion: privilegedaccessmanager.cnrm.cloud.google.com/v1beta1
 kind: PrivilegedAccessManagerEntitlement
 metadata:
-  annotations:
-    cnrm.cloud.google.com/management-conflict-prevention-policy: none
   finalizers:
   - cnrm.cloud.google.com/finalizer
   - cnrm.cloud.google.com/deletion-defender

diff --git a/...mentfullfolder/_generated_object_privilegedaccessmanagerentitlementfullfolder.golden.yaml b/...mentfullfolder/_generated_object_privilegedaccessmanagerentitlementfullfolder.golden.yaml
@@ -1,8 +1,6 @@
 apiVersion: privilegedaccessmanager.cnrm.cloud.google.com/v1beta1
 kind: PrivilegedAccessManagerEntitlement
 metadata:
-  annotations:
-    cnrm.cloud.google.com/management-conflict-prevention-policy: none
   finalizers:
   - cnrm.cloud.google.com/finalizer
   - cnrm.cloud.google.com/deletion-defender

diff --git a/...ntitlementfullorg/_generated_object_privilegedaccessmanagerentitlementfullorg.golden.yaml b/...ntitlementfullorg/_generated_object_privilegedaccessmanagerentitlementfullorg.golden.yaml
@@ -1,8 +1,6 @@
 apiVersion: privilegedaccessmanager.cnrm.cloud.google.com/v1beta1
 kind: PrivilegedAccessManagerEntitlement
 metadata:
-  annotations:
-    cnrm.cloud.google.com/management-conflict-prevention-policy: none
   finalizers:
   - cnrm.cloud.google.com/finalizer
   - cnrm.cloud.google.com/deletion-defender