From d74380e5a1a538fc05b16a06aa6fa8cb686b19b1 Mon Sep 17 00:00:00 2001 From: Jason Vigil Date: Wed, 18 Dec 2024 20:37:48 +0000 Subject: [PATCH] fix: Do not add management conflict annotaiton for direct resources --- pkg/gvks/supportedgvks/supportedgvks.go | 14 ++++++++++++++ ...gqueryanalyticshubdataexchange-base.golden.yaml | 2 -- ...gqueryanalyticshubdataexchange-full.golden.yaml | 2 -- ...ct_bigqueryanalyticshublisting-base.golden.yaml | 2 -- ...ct_bigqueryanalyticshublisting-full.golden.yaml | 2 -- ...generated_object_awsconnectionbasic.golden.yaml | 2 -- ...nerated_object_azureconnectionbasic.golden.yaml | 2 -- ...t_bigqueryconnectionconnectionbasic.golden.yaml | 2 -- ...ct_bigqueryconnectionconnectionfull.golden.yaml | 2 -- ..._object_cloudspannerconnectionbasic.golden.yaml | 2 -- ...ated_object_cloudsqlconnectionbasic.golden.yaml | 2 -- ...nerated_object_sparkconnectionbasic.golden.yaml | 2 -- ...gquerydatatransferconfig-salesforce.golden.yaml | 2 -- ...rydatatransferconfig-scheduledquery.golden.yaml | 2 -- ...ificatemanagerdnsauthorization-full.golden.yaml | 2 -- ...catemanagerdnsauthorization-minimal.golden.yaml | 2 -- ..._certificatemanagerdnsauthorization.golden.yaml | 2 -- ...nerated_object_cloudbuildworkerpool.golden.yaml | 2 -- ...ted_object_dataformrepository-basic.golden.yaml | 2 -- ...ated_object_dataformrepository-full.golden.yaml | 2 -- ...rated_object_firestoredatabase-full.golden.yaml | 2 -- ...ed_object_firestoredatabase-minimal.golden.yaml | 2 -- ...ect_basicacmgkehubfeaturemembership.golden.yaml | 2 -- ...ct_basiccsaugkehubfeaturemembership.golden.yaml | 2 -- ...ct_basicpocogkehubfeaturemembership.golden.yaml | 2 -- ...ject_fullacmgkehubfeaturemembership.golden.yaml | 2 -- ...ect_fullcsaugkehubfeaturemembership.golden.yaml | 2 -- ...ect_fullpocogkehubfeaturemembership.golden.yaml | 2 -- ..._object_meshgkehubfeaturemembership.golden.yaml | 2 -- .../_generated_object_kmsautokeyconfig.golden.yaml | 2 -- .../_generated_object_kmskeyhandle.golden.yaml | 2 -- ..._generated_object_explicitlogmetric.golden.yaml | 2 -- ...nerated_object_exponentiallogmetric.golden.yaml | 2 -- .../_generated_object_linearlogmetric.golden.yaml | 2 -- .../_generated_object_logbucketmetric.golden.yaml | 2 -- ...ted_object_monitoringdashboardbasic.golden.yaml | 2 -- ...ated_object_monitoringdashboardfull.golden.yaml | 2 -- ...ect_monitoringdashboardmosaiclayout.golden.yaml | 2 -- ...ated_object_monitoringdashboardrefs.golden.yaml | 2 -- ...object_serviceconnectionpolicybasic.golden.yaml | 2 -- ...ccessmanagerentitlementbasicproject.golden.yaml | 2 -- ...daccessmanagerentitlementfullfolder.golden.yaml | 2 -- ...egedaccessmanagerentitlementfullorg.golden.yaml | 2 -- ..._generated_object_basicrediscluster.golden.yaml | 2 -- .../_generated_object_fullrediscluster.golden.yaml | 2 -- .../_generated_object_workstation-full.golden.yaml | 2 -- ...enerated_object_workstation-minimal.golden.yaml | 2 -- ...ated_object_workstationcluster-full.golden.yaml | 2 -- ...d_object_workstationcluster-minimal.golden.yaml | 2 -- ...rated_object_workstationconfig-full.golden.yaml | 2 -- ...ed_object_workstationconfig-minimal.golden.yaml | 2 -- .../management_conflict_annotation_defaulter.go | 4 ++++ .../value_type/label/_object00.yaml | 1 - .../value_type/label/_object01.yaml | 1 - .../labels_value_type/_object00.yaml | 1 - .../labels_value_type/_object01.yaml | 1 - .../metric_kind_and_value_type/_object00.yaml | 1 - .../metric_kind_and_value_type/_object01.yaml | 1 - .../fields/llm_lazy_reconcile/_object00.yaml | 1 - .../fields/llm_lazy_reconcile/_object01.yaml | 1 - .../featuremembership/set_unset/_object03.yaml | 1 - .../featuremembership/set_unset/_object04.yaml | 1 - .../featuremembership/set_unset/_object05.yaml | 1 - .../logging/logmetric/set-zero/_object00.yaml | 1 - .../logging/logmetric/set-zero/_object01.yaml | 1 - .../logmetric/set_unset/basic/_object00.yaml | 1 - .../logmetric/set_unset/basic/_object01.yaml | 1 - .../logmetric/set_unset/basic/_object02.yaml | 1 - .../set_unset/metric_descriptor/_object00.yaml | 1 - .../set_unset/metric_descriptor/_object01.yaml | 1 - .../set_unset/metric_descriptor/_object02.yaml | 1 - .../_object00.yaml | 1 - .../_object01.yaml | 1 - .../_object03.yaml | 1 - 74 files changed, 18 insertions(+), 122 deletions(-) diff --git a/pkg/gvks/supportedgvks/supportedgvks.go b/pkg/gvks/supportedgvks/supportedgvks.go index d5528d6717..9560076683 100644 --- 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/pkg/test/resourcefixture/testdata/basic/bigqueryanalyticshub/v1beta1/bigqueryanalyticshubdataexchange-base/_generated_object_bigqueryanalyticshubdataexchange-base.golden.yaml b/pkg/test/resourcefixture/testdata/basic/bigqueryanalyticshub/v1beta1/bigqueryanalyticshubdataexchange-base/_generated_object_bigqueryanalyticshubdataexchange-base.golden.yaml index e43fa1ca92..edd0305063 100644 --- a/pkg/test/resourcefixture/testdata/basic/bigqueryanalyticshub/v1beta1/bigqueryanalyticshubdataexchange-base/_generated_object_bigqueryanalyticshubdataexchange-base.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/bigqueryanalyticshub/v1beta1/bigqueryanalyticshubdataexchange-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/pkg/test/resourcefixture/testdata/basic/bigqueryanalyticshub/v1beta1/bigqueryanalyticshubdataexchange-full/_generated_object_bigqueryanalyticshubdataexchange-full.golden.yaml b/pkg/test/resourcefixture/testdata/basic/bigqueryanalyticshub/v1beta1/bigqueryanalyticshubdataexchange-full/_generated_object_bigqueryanalyticshubdataexchange-full.golden.yaml index ee75f852a4..fa76f13c4b 100644 --- a/pkg/test/resourcefixture/testdata/basic/bigqueryanalyticshub/v1beta1/bigqueryanalyticshubdataexchange-full/_generated_object_bigqueryanalyticshubdataexchange-full.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/bigqueryanalyticshub/v1beta1/bigqueryanalyticshubdataexchange-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/pkg/test/resourcefixture/testdata/basic/bigqueryanalyticshub/v1beta1/bigqueryanalyticshublisting-base/_generated_object_bigqueryanalyticshublisting-base.golden.yaml b/pkg/test/resourcefixture/testdata/basic/bigqueryanalyticshub/v1beta1/bigqueryanalyticshublisting-base/_generated_object_bigqueryanalyticshublisting-base.golden.yaml index aaedc990e8..4261bf7513 100644 --- a/pkg/test/resourcefixture/testdata/basic/bigqueryanalyticshub/v1beta1/bigqueryanalyticshublisting-base/_generated_object_bigqueryanalyticshublisting-base.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/bigqueryanalyticshub/v1beta1/bigqueryanalyticshublisting-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/pkg/test/resourcefixture/testdata/basic/bigqueryanalyticshub/v1beta1/bigqueryanalyticshublisting-full/_generated_object_bigqueryanalyticshublisting-full.golden.yaml b/pkg/test/resourcefixture/testdata/basic/bigqueryanalyticshub/v1beta1/bigqueryanalyticshublisting-full/_generated_object_bigqueryanalyticshublisting-full.golden.yaml index 677ab3379b..90e0c09ffc 100644 --- a/pkg/test/resourcefixture/testdata/basic/bigqueryanalyticshub/v1beta1/bigqueryanalyticshublisting-full/_generated_object_bigqueryanalyticshublisting-full.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/bigqueryanalyticshub/v1beta1/bigqueryanalyticshublisting-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/pkg/test/resourcefixture/testdata/basic/bigqueryconnection/v1beta1/bigqueryconnectionconnection/awsconnectionbasic/_generated_object_awsconnectionbasic.golden.yaml b/pkg/test/resourcefixture/testdata/basic/bigqueryconnection/v1beta1/bigqueryconnectionconnection/awsconnectionbasic/_generated_object_awsconnectionbasic.golden.yaml index 47c211398a..3350a88510 100644 --- a/pkg/test/resourcefixture/testdata/basic/bigqueryconnection/v1beta1/bigqueryconnectionconnection/awsconnectionbasic/_generated_object_awsconnectionbasic.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/bigqueryconnection/v1beta1/bigqueryconnectionconnection/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/pkg/test/resourcefixture/testdata/basic/bigqueryconnection/v1beta1/bigqueryconnectionconnection/azureconnectionbasic/_generated_object_azureconnectionbasic.golden.yaml b/pkg/test/resourcefixture/testdata/basic/bigqueryconnection/v1beta1/bigqueryconnectionconnection/azureconnectionbasic/_generated_object_azureconnectionbasic.golden.yaml index fa4b4d357a..813f4d6a6a 100644 --- a/pkg/test/resourcefixture/testdata/basic/bigqueryconnection/v1beta1/bigqueryconnectionconnection/azureconnectionbasic/_generated_object_azureconnectionbasic.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/bigqueryconnection/v1beta1/bigqueryconnectionconnection/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/pkg/test/resourcefixture/testdata/basic/bigqueryconnection/v1beta1/bigqueryconnectionconnection/bigqueryconnectionconnectionbasic/_generated_object_bigqueryconnectionconnectionbasic.golden.yaml b/pkg/test/resourcefixture/testdata/basic/bigqueryconnection/v1beta1/bigqueryconnectionconnection/bigqueryconnectionconnectionbasic/_generated_object_bigqueryconnectionconnectionbasic.golden.yaml index 9a5658a2af..808ae5309f 100644 --- a/pkg/test/resourcefixture/testdata/basic/bigqueryconnection/v1beta1/bigqueryconnectionconnection/bigqueryconnectionconnectionbasic/_generated_object_bigqueryconnectionconnectionbasic.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/bigqueryconnection/v1beta1/bigqueryconnectionconnection/bigqueryconnectionconnectionbasic/_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/pkg/test/resourcefixture/testdata/basic/bigqueryconnection/v1beta1/bigqueryconnectionconnection/bigqueryconnectionconnectionfull/_generated_object_bigqueryconnectionconnectionfull.golden.yaml b/pkg/test/resourcefixture/testdata/basic/bigqueryconnection/v1beta1/bigqueryconnectionconnection/bigqueryconnectionconnectionfull/_generated_object_bigqueryconnectionconnectionfull.golden.yaml index fa42de65f4..d476a1e593 100644 --- a/pkg/test/resourcefixture/testdata/basic/bigqueryconnection/v1beta1/bigqueryconnectionconnection/bigqueryconnectionconnectionfull/_generated_object_bigqueryconnectionconnectionfull.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/bigqueryconnection/v1beta1/bigqueryconnectionconnection/bigqueryconnectionconnectionfull/_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/pkg/test/resourcefixture/testdata/basic/bigqueryconnection/v1beta1/bigqueryconnectionconnection/cloudspannerconnectionbasic/_generated_object_cloudspannerconnectionbasic.golden.yaml b/pkg/test/resourcefixture/testdata/basic/bigqueryconnection/v1beta1/bigqueryconnectionconnection/cloudspannerconnectionbasic/_generated_object_cloudspannerconnectionbasic.golden.yaml index 8c6890f485..bfe485b5aa 100644 --- a/pkg/test/resourcefixture/testdata/basic/bigqueryconnection/v1beta1/bigqueryconnectionconnection/cloudspannerconnectionbasic/_generated_object_cloudspannerconnectionbasic.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/bigqueryconnection/v1beta1/bigqueryconnectionconnection/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/pkg/test/resourcefixture/testdata/basic/bigqueryconnection/v1beta1/bigqueryconnectionconnection/cloudsqlconnectionbasic/_generated_object_cloudsqlconnectionbasic.golden.yaml b/pkg/test/resourcefixture/testdata/basic/bigqueryconnection/v1beta1/bigqueryconnectionconnection/cloudsqlconnectionbasic/_generated_object_cloudsqlconnectionbasic.golden.yaml index da720ba032..7ab05e0124 100644 --- a/pkg/test/resourcefixture/testdata/basic/bigqueryconnection/v1beta1/bigqueryconnectionconnection/cloudsqlconnectionbasic/_generated_object_cloudsqlconnectionbasic.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/bigqueryconnection/v1beta1/bigqueryconnectionconnection/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/pkg/test/resourcefixture/testdata/basic/bigqueryconnection/v1beta1/bigqueryconnectionconnection/sparkconnectionbasic/_generated_object_sparkconnectionbasic.golden.yaml b/pkg/test/resourcefixture/testdata/basic/bigqueryconnection/v1beta1/bigqueryconnectionconnection/sparkconnectionbasic/_generated_object_sparkconnectionbasic.golden.yaml index 5043f936e1..63afd7f700 100644 --- a/pkg/test/resourcefixture/testdata/basic/bigqueryconnection/v1beta1/bigqueryconnectionconnection/sparkconnectionbasic/_generated_object_sparkconnectionbasic.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/bigqueryconnection/v1beta1/bigqueryconnectionconnection/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/pkg/test/resourcefixture/testdata/basic/bigquerydatatransfer/v1beta1/bigquerydatatransferconfig/bigquerydatatransferconfig-salesforce/_generated_object_bigquerydatatransferconfig-salesforce.golden.yaml b/pkg/test/resourcefixture/testdata/basic/bigquerydatatransfer/v1beta1/bigquerydatatransferconfig/bigquerydatatransferconfig-salesforce/_generated_object_bigquerydatatransferconfig-salesforce.golden.yaml index e7e424f402..6f2c0700bb 100644 --- a/pkg/test/resourcefixture/testdata/basic/bigquerydatatransfer/v1beta1/bigquerydatatransferconfig/bigquerydatatransferconfig-salesforce/_generated_object_bigquerydatatransferconfig-salesforce.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/bigquerydatatransfer/v1beta1/bigquerydatatransferconfig/bigquerydatatransferconfig-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/pkg/test/resourcefixture/testdata/basic/bigquerydatatransfer/v1beta1/bigquerydatatransferconfig/bigquerydatatransferconfig-scheduledquery/_generated_object_bigquerydatatransferconfig-scheduledquery.golden.yaml b/pkg/test/resourcefixture/testdata/basic/bigquerydatatransfer/v1beta1/bigquerydatatransferconfig/bigquerydatatransferconfig-scheduledquery/_generated_object_bigquerydatatransferconfig-scheduledquery.golden.yaml index 7a7caac5cb..dbb94656c3 100644 --- a/pkg/test/resourcefixture/testdata/basic/bigquerydatatransfer/v1beta1/bigquerydatatransferconfig/bigquerydatatransferconfig-scheduledquery/_generated_object_bigquerydatatransferconfig-scheduledquery.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/bigquerydatatransfer/v1beta1/bigquerydatatransferconfig/bigquerydatatransferconfig-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/pkg/test/resourcefixture/testdata/basic/certificatemanager/v1beta1/certificatemanagerdnsauthorization-full/_generated_object_certificatemanagerdnsauthorization-full.golden.yaml b/pkg/test/resourcefixture/testdata/basic/certificatemanager/v1beta1/certificatemanagerdnsauthorization-full/_generated_object_certificatemanagerdnsauthorization-full.golden.yaml index f8daa66471..0b05a80645 100644 --- a/pkg/test/resourcefixture/testdata/basic/certificatemanager/v1beta1/certificatemanagerdnsauthorization-full/_generated_object_certificatemanagerdnsauthorization-full.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/certificatemanager/v1beta1/certificatemanagerdnsauthorization-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/pkg/test/resourcefixture/testdata/basic/certificatemanager/v1beta1/certificatemanagerdnsauthorization-minimal/_generated_object_certificatemanagerdnsauthorization-minimal.golden.yaml b/pkg/test/resourcefixture/testdata/basic/certificatemanager/v1beta1/certificatemanagerdnsauthorization-minimal/_generated_object_certificatemanagerdnsauthorization-minimal.golden.yaml index 29b84bbeac..4e87b57d22 100644 --- a/pkg/test/resourcefixture/testdata/basic/certificatemanager/v1beta1/certificatemanagerdnsauthorization-minimal/_generated_object_certificatemanagerdnsauthorization-minimal.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/certificatemanager/v1beta1/certificatemanagerdnsauthorization-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/pkg/test/resourcefixture/testdata/basic/certificatemanager/v1beta1/certificatemanagerdnsauthorization/_generated_object_certificatemanagerdnsauthorization.golden.yaml b/pkg/test/resourcefixture/testdata/basic/certificatemanager/v1beta1/certificatemanagerdnsauthorization/_generated_object_certificatemanagerdnsauthorization.golden.yaml index 87c05cc2b5..1072e785b7 100644 --- a/pkg/test/resourcefixture/testdata/basic/certificatemanager/v1beta1/certificatemanagerdnsauthorization/_generated_object_certificatemanagerdnsauthorization.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/certificatemanager/v1beta1/certificatemanagerdnsauthorization/_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/pkg/test/resourcefixture/testdata/basic/cloudbuild/v1beta1/cloudbuildworkerpool/_generated_object_cloudbuildworkerpool.golden.yaml b/pkg/test/resourcefixture/testdata/basic/cloudbuild/v1beta1/cloudbuildworkerpool/_generated_object_cloudbuildworkerpool.golden.yaml index db0ccfc600..9733f584e3 100644 --- a/pkg/test/resourcefixture/testdata/basic/cloudbuild/v1beta1/cloudbuildworkerpool/_generated_object_cloudbuildworkerpool.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/cloudbuild/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/pkg/test/resourcefixture/testdata/basic/dataform/v1beta1/dataformrepository-basic/_generated_object_dataformrepository-basic.golden.yaml b/pkg/test/resourcefixture/testdata/basic/dataform/v1beta1/dataformrepository-basic/_generated_object_dataformrepository-basic.golden.yaml index 0bd44d8a48..71bd52b1a4 100644 --- a/pkg/test/resourcefixture/testdata/basic/dataform/v1beta1/dataformrepository-basic/_generated_object_dataformrepository-basic.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/dataform/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/pkg/test/resourcefixture/testdata/basic/dataform/v1beta1/dataformrepository-full/_generated_object_dataformrepository-full.golden.yaml b/pkg/test/resourcefixture/testdata/basic/dataform/v1beta1/dataformrepository-full/_generated_object_dataformrepository-full.golden.yaml index a570368c1d..832f2dd575 100644 --- a/pkg/test/resourcefixture/testdata/basic/dataform/v1beta1/dataformrepository-full/_generated_object_dataformrepository-full.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/dataform/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/pkg/test/resourcefixture/testdata/basic/firestore/v1beta1/firestoredatabase/firestoredatabase-full/_generated_object_firestoredatabase-full.golden.yaml b/pkg/test/resourcefixture/testdata/basic/firestore/v1beta1/firestoredatabase/firestoredatabase-full/_generated_object_firestoredatabase-full.golden.yaml index fad3d446a4..a9e6113d42 100644 --- a/pkg/test/resourcefixture/testdata/basic/firestore/v1beta1/firestoredatabase/firestoredatabase-full/_generated_object_firestoredatabase-full.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/firestore/v1beta1/firestoredatabase/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/pkg/test/resourcefixture/testdata/basic/firestore/v1beta1/firestoredatabase/firestoredatabase-minimal/_generated_object_firestoredatabase-minimal.golden.yaml b/pkg/test/resourcefixture/testdata/basic/firestore/v1beta1/firestoredatabase/firestoredatabase-minimal/_generated_object_firestoredatabase-minimal.golden.yaml index e980e87ddb..cf6726af1e 100644 --- a/pkg/test/resourcefixture/testdata/basic/firestore/v1beta1/firestoredatabase/firestoredatabase-minimal/_generated_object_firestoredatabase-minimal.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/firestore/v1beta1/firestoredatabase/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/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubfeaturemembership/basicacmgkehubfeaturemembership/_generated_object_basicacmgkehubfeaturemembership.golden.yaml b/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubfeaturemembership/basicacmgkehubfeaturemembership/_generated_object_basicacmgkehubfeaturemembership.golden.yaml index d154a1a2a4..22cdc8f44b 100644 --- a/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubfeaturemembership/basicacmgkehubfeaturemembership/_generated_object_basicacmgkehubfeaturemembership.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubfeaturemembership/basicacmgkehubfeaturemembership/_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/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubfeaturemembership/basiccsaugkehubfeaturemembership/_generated_object_basiccsaugkehubfeaturemembership.golden.yaml b/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubfeaturemembership/basiccsaugkehubfeaturemembership/_generated_object_basiccsaugkehubfeaturemembership.golden.yaml index 79188915cc..03a6fa7b81 100644 --- a/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubfeaturemembership/basiccsaugkehubfeaturemembership/_generated_object_basiccsaugkehubfeaturemembership.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubfeaturemembership/basiccsaugkehubfeaturemembership/_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/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubfeaturemembership/basicpocogkehubfeaturemembership/_generated_object_basicpocogkehubfeaturemembership.golden.yaml b/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubfeaturemembership/basicpocogkehubfeaturemembership/_generated_object_basicpocogkehubfeaturemembership.golden.yaml index a1bae5c0c9..c03bf1a5b3 100644 --- a/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubfeaturemembership/basicpocogkehubfeaturemembership/_generated_object_basicpocogkehubfeaturemembership.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubfeaturemembership/basicpocogkehubfeaturemembership/_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/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubfeaturemembership/fullacmgkehubfeaturemembership/_generated_object_fullacmgkehubfeaturemembership.golden.yaml b/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubfeaturemembership/fullacmgkehubfeaturemembership/_generated_object_fullacmgkehubfeaturemembership.golden.yaml index 36ff00f725..d35bd41bd7 100644 --- a/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubfeaturemembership/fullacmgkehubfeaturemembership/_generated_object_fullacmgkehubfeaturemembership.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubfeaturemembership/fullacmgkehubfeaturemembership/_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/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubfeaturemembership/fullcsaugkehubfeaturemembership/_generated_object_fullcsaugkehubfeaturemembership.golden.yaml b/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubfeaturemembership/fullcsaugkehubfeaturemembership/_generated_object_fullcsaugkehubfeaturemembership.golden.yaml index 9967b60008..9ad343a062 100644 --- a/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubfeaturemembership/fullcsaugkehubfeaturemembership/_generated_object_fullcsaugkehubfeaturemembership.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubfeaturemembership/fullcsaugkehubfeaturemembership/_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/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubfeaturemembership/fullpocogkehubfeaturemembership/_generated_object_fullpocogkehubfeaturemembership.golden.yaml b/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubfeaturemembership/fullpocogkehubfeaturemembership/_generated_object_fullpocogkehubfeaturemembership.golden.yaml index 2ea3897010..936d26ff8f 100644 --- a/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubfeaturemembership/fullpocogkehubfeaturemembership/_generated_object_fullpocogkehubfeaturemembership.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubfeaturemembership/fullpocogkehubfeaturemembership/_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/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubfeaturemembership/meshgkehubfeaturemembership/_generated_object_meshgkehubfeaturemembership.golden.yaml b/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubfeaturemembership/meshgkehubfeaturemembership/_generated_object_meshgkehubfeaturemembership.golden.yaml index 86583c1200..7c761e63b7 100644 --- a/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubfeaturemembership/meshgkehubfeaturemembership/_generated_object_meshgkehubfeaturemembership.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubfeaturemembership/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/pkg/test/resourcefixture/testdata/basic/kms/v1beta1/kmsautokeyconfig/_generated_object_kmsautokeyconfig.golden.yaml b/pkg/test/resourcefixture/testdata/basic/kms/v1beta1/kmsautokeyconfig/_generated_object_kmsautokeyconfig.golden.yaml index 5deda8ac75..e7f9377c4a 100644 --- a/pkg/test/resourcefixture/testdata/basic/kms/v1beta1/kmsautokeyconfig/_generated_object_kmsautokeyconfig.golden.yaml +++ b/pkg/test/resourcefixture/testdata/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/pkg/test/resourcefixture/testdata/basic/kms/v1beta1/kmskeyhandle/_generated_object_kmskeyhandle.golden.yaml b/pkg/test/resourcefixture/testdata/basic/kms/v1beta1/kmskeyhandle/_generated_object_kmskeyhandle.golden.yaml index 99354c43ee..d07b20c84f 100644 --- a/pkg/test/resourcefixture/testdata/basic/kms/v1beta1/kmskeyhandle/_generated_object_kmskeyhandle.golden.yaml +++ b/pkg/test/resourcefixture/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/pkg/test/resourcefixture/testdata/basic/logging/v1beta1/logginglogmetric/explicitlogmetric/_generated_object_explicitlogmetric.golden.yaml b/pkg/test/resourcefixture/testdata/basic/logging/v1beta1/logginglogmetric/explicitlogmetric/_generated_object_explicitlogmetric.golden.yaml index af2f6ccd56..55e328cb2c 100644 --- a/pkg/test/resourcefixture/testdata/basic/logging/v1beta1/logginglogmetric/explicitlogmetric/_generated_object_explicitlogmetric.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/logging/v1beta1/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/pkg/test/resourcefixture/testdata/basic/logging/v1beta1/logginglogmetric/exponentiallogmetric/_generated_object_exponentiallogmetric.golden.yaml b/pkg/test/resourcefixture/testdata/basic/logging/v1beta1/logginglogmetric/exponentiallogmetric/_generated_object_exponentiallogmetric.golden.yaml index da7346f74c..7d9fd20617 100644 --- a/pkg/test/resourcefixture/testdata/basic/logging/v1beta1/logginglogmetric/exponentiallogmetric/_generated_object_exponentiallogmetric.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/logging/v1beta1/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/pkg/test/resourcefixture/testdata/basic/logging/v1beta1/logginglogmetric/linearlogmetric/_generated_object_linearlogmetric.golden.yaml b/pkg/test/resourcefixture/testdata/basic/logging/v1beta1/logginglogmetric/linearlogmetric/_generated_object_linearlogmetric.golden.yaml index 67720ec932..f52c1d6554 100644 --- a/pkg/test/resourcefixture/testdata/basic/logging/v1beta1/logginglogmetric/linearlogmetric/_generated_object_linearlogmetric.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/logging/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/pkg/test/resourcefixture/testdata/basic/logging/v1beta1/logginglogmetric/logbucketmetric/_generated_object_logbucketmetric.golden.yaml b/pkg/test/resourcefixture/testdata/basic/logging/v1beta1/logginglogmetric/logbucketmetric/_generated_object_logbucketmetric.golden.yaml index cf0634be6e..a785685542 100644 --- a/pkg/test/resourcefixture/testdata/basic/logging/v1beta1/logginglogmetric/logbucketmetric/_generated_object_logbucketmetric.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/logging/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/pkg/test/resourcefixture/testdata/basic/monitoring/v1beta1/monitoringdashboard/monitoringdashboardbasic/_generated_object_monitoringdashboardbasic.golden.yaml b/pkg/test/resourcefixture/testdata/basic/monitoring/v1beta1/monitoringdashboard/monitoringdashboardbasic/_generated_object_monitoringdashboardbasic.golden.yaml index 2899418d31..d12649d354 100644 --- a/pkg/test/resourcefixture/testdata/basic/monitoring/v1beta1/monitoringdashboard/monitoringdashboardbasic/_generated_object_monitoringdashboardbasic.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/monitoring/v1beta1/monitoringdashboard/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/pkg/test/resourcefixture/testdata/basic/monitoring/v1beta1/monitoringdashboard/monitoringdashboardfull/_generated_object_monitoringdashboardfull.golden.yaml b/pkg/test/resourcefixture/testdata/basic/monitoring/v1beta1/monitoringdashboard/monitoringdashboardfull/_generated_object_monitoringdashboardfull.golden.yaml index 4dca4a1286..5001a7c5ee 100644 --- a/pkg/test/resourcefixture/testdata/basic/monitoring/v1beta1/monitoringdashboard/monitoringdashboardfull/_generated_object_monitoringdashboardfull.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/monitoring/v1beta1/monitoringdashboard/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/pkg/test/resourcefixture/testdata/basic/monitoring/v1beta1/monitoringdashboard/monitoringdashboardmosaiclayout/_generated_object_monitoringdashboardmosaiclayout.golden.yaml b/pkg/test/resourcefixture/testdata/basic/monitoring/v1beta1/monitoringdashboard/monitoringdashboardmosaiclayout/_generated_object_monitoringdashboardmosaiclayout.golden.yaml index fd17a37bf2..757f2da181 100644 --- a/pkg/test/resourcefixture/testdata/basic/monitoring/v1beta1/monitoringdashboard/monitoringdashboardmosaiclayout/_generated_object_monitoringdashboardmosaiclayout.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/monitoring/v1beta1/monitoringdashboard/monitoringdashboardmosaiclayout/_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/pkg/test/resourcefixture/testdata/basic/monitoring/v1beta1/monitoringdashboard/monitoringdashboardrefs/_generated_object_monitoringdashboardrefs.golden.yaml b/pkg/test/resourcefixture/testdata/basic/monitoring/v1beta1/monitoringdashboard/monitoringdashboardrefs/_generated_object_monitoringdashboardrefs.golden.yaml index 2b0f27ce42..6d12110101 100644 --- a/pkg/test/resourcefixture/testdata/basic/monitoring/v1beta1/monitoringdashboard/monitoringdashboardrefs/_generated_object_monitoringdashboardrefs.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/monitoring/v1beta1/monitoringdashboard/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/pkg/test/resourcefixture/testdata/basic/networkconnectivity/v1alpha1/serviceconnectionpolicy/serviceconnectionpolicybasic/_generated_object_serviceconnectionpolicybasic.golden.yaml b/pkg/test/resourcefixture/testdata/basic/networkconnectivity/v1alpha1/serviceconnectionpolicy/serviceconnectionpolicybasic/_generated_object_serviceconnectionpolicybasic.golden.yaml index d4a928318c..45080d4aa2 100644 --- a/pkg/test/resourcefixture/testdata/basic/networkconnectivity/v1alpha1/serviceconnectionpolicy/serviceconnectionpolicybasic/_generated_object_serviceconnectionpolicybasic.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/networkconnectivity/v1alpha1/serviceconnectionpolicy/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/pkg/test/resourcefixture/testdata/basic/privilegedaccessmanager/v1alpha1/privilegedaccessmanagerentitlement/privilegedaccessmanagerentitlementbasicproject/_generated_object_privilegedaccessmanagerentitlementbasicproject.golden.yaml b/pkg/test/resourcefixture/testdata/basic/privilegedaccessmanager/v1alpha1/privilegedaccessmanagerentitlement/privilegedaccessmanagerentitlementbasicproject/_generated_object_privilegedaccessmanagerentitlementbasicproject.golden.yaml index fb027343e9..859ea79fb7 100644 --- a/pkg/test/resourcefixture/testdata/basic/privilegedaccessmanager/v1alpha1/privilegedaccessmanagerentitlement/privilegedaccessmanagerentitlementbasicproject/_generated_object_privilegedaccessmanagerentitlementbasicproject.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/privilegedaccessmanager/v1alpha1/privilegedaccessmanagerentitlement/privilegedaccessmanagerentitlementbasicproject/_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/pkg/test/resourcefixture/testdata/basic/privilegedaccessmanager/v1alpha1/privilegedaccessmanagerentitlement/privilegedaccessmanagerentitlementfullfolder/_generated_object_privilegedaccessmanagerentitlementfullfolder.golden.yaml b/pkg/test/resourcefixture/testdata/basic/privilegedaccessmanager/v1alpha1/privilegedaccessmanagerentitlement/privilegedaccessmanagerentitlementfullfolder/_generated_object_privilegedaccessmanagerentitlementfullfolder.golden.yaml index 85ab508214..a61df8a1e3 100644 --- a/pkg/test/resourcefixture/testdata/basic/privilegedaccessmanager/v1alpha1/privilegedaccessmanagerentitlement/privilegedaccessmanagerentitlementfullfolder/_generated_object_privilegedaccessmanagerentitlementfullfolder.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/privilegedaccessmanager/v1alpha1/privilegedaccessmanagerentitlement/privilegedaccessmanagerentitlementfullfolder/_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/pkg/test/resourcefixture/testdata/basic/privilegedaccessmanager/v1alpha1/privilegedaccessmanagerentitlement/privilegedaccessmanagerentitlementfullorg/_generated_object_privilegedaccessmanagerentitlementfullorg.golden.yaml b/pkg/test/resourcefixture/testdata/basic/privilegedaccessmanager/v1alpha1/privilegedaccessmanagerentitlement/privilegedaccessmanagerentitlementfullorg/_generated_object_privilegedaccessmanagerentitlementfullorg.golden.yaml index 06b20db417..56e241baf7 100644 --- a/pkg/test/resourcefixture/testdata/basic/privilegedaccessmanager/v1alpha1/privilegedaccessmanagerentitlement/privilegedaccessmanagerentitlementfullorg/_generated_object_privilegedaccessmanagerentitlementfullorg.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/privilegedaccessmanager/v1alpha1/privilegedaccessmanagerentitlement/privilegedaccessmanagerentitlementfullorg/_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 diff --git a/pkg/test/resourcefixture/testdata/basic/redis/v1beta1/basicrediscluster/_generated_object_basicrediscluster.golden.yaml b/pkg/test/resourcefixture/testdata/basic/redis/v1beta1/basicrediscluster/_generated_object_basicrediscluster.golden.yaml index 9d342cd1ba..470e89add4 100644 --- a/pkg/test/resourcefixture/testdata/basic/redis/v1beta1/basicrediscluster/_generated_object_basicrediscluster.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/redis/v1beta1/basicrediscluster/_generated_object_basicrediscluster.golden.yaml @@ -1,8 +1,6 @@ apiVersion: redis.cnrm.cloud.google.com/v1beta1 kind: RedisCluster 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/pkg/test/resourcefixture/testdata/basic/redis/v1beta1/fullrediscluster/_generated_object_fullrediscluster.golden.yaml b/pkg/test/resourcefixture/testdata/basic/redis/v1beta1/fullrediscluster/_generated_object_fullrediscluster.golden.yaml index 7d03af8413..fbbcd646f7 100644 --- a/pkg/test/resourcefixture/testdata/basic/redis/v1beta1/fullrediscluster/_generated_object_fullrediscluster.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/redis/v1beta1/fullrediscluster/_generated_object_fullrediscluster.golden.yaml @@ -1,8 +1,6 @@ apiVersion: redis.cnrm.cloud.google.com/v1beta1 kind: RedisCluster 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/pkg/test/resourcefixture/testdata/basic/workstations/workstation/workstation-full/_generated_object_workstation-full.golden.yaml b/pkg/test/resourcefixture/testdata/basic/workstations/workstation/workstation-full/_generated_object_workstation-full.golden.yaml index f83479f341..07f240e932 100644 --- a/pkg/test/resourcefixture/testdata/basic/workstations/workstation/workstation-full/_generated_object_workstation-full.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/workstations/workstation/workstation-full/_generated_object_workstation-full.golden.yaml @@ -1,8 +1,6 @@ apiVersion: workstations.cnrm.cloud.google.com/v1beta1 kind: Workstation 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/pkg/test/resourcefixture/testdata/basic/workstations/workstation/workstation-minimal/_generated_object_workstation-minimal.golden.yaml b/pkg/test/resourcefixture/testdata/basic/workstations/workstation/workstation-minimal/_generated_object_workstation-minimal.golden.yaml index 0cc0341e33..053ffcda9d 100644 --- a/pkg/test/resourcefixture/testdata/basic/workstations/workstation/workstation-minimal/_generated_object_workstation-minimal.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/workstations/workstation/workstation-minimal/_generated_object_workstation-minimal.golden.yaml @@ -1,8 +1,6 @@ apiVersion: workstations.cnrm.cloud.google.com/v1beta1 kind: Workstation 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/pkg/test/resourcefixture/testdata/basic/workstations/workstationcluster/workstationcluster-full/_generated_object_workstationcluster-full.golden.yaml b/pkg/test/resourcefixture/testdata/basic/workstations/workstationcluster/workstationcluster-full/_generated_object_workstationcluster-full.golden.yaml index 183360a13d..f599271dbb 100644 --- a/pkg/test/resourcefixture/testdata/basic/workstations/workstationcluster/workstationcluster-full/_generated_object_workstationcluster-full.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/workstations/workstationcluster/workstationcluster-full/_generated_object_workstationcluster-full.golden.yaml @@ -1,8 +1,6 @@ apiVersion: workstations.cnrm.cloud.google.com/v1beta1 kind: WorkstationCluster 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/pkg/test/resourcefixture/testdata/basic/workstations/workstationcluster/workstationcluster-minimal/_generated_object_workstationcluster-minimal.golden.yaml b/pkg/test/resourcefixture/testdata/basic/workstations/workstationcluster/workstationcluster-minimal/_generated_object_workstationcluster-minimal.golden.yaml index 345357fbc7..6fe58669a0 100644 --- a/pkg/test/resourcefixture/testdata/basic/workstations/workstationcluster/workstationcluster-minimal/_generated_object_workstationcluster-minimal.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/workstations/workstationcluster/workstationcluster-minimal/_generated_object_workstationcluster-minimal.golden.yaml @@ -1,8 +1,6 @@ apiVersion: workstations.cnrm.cloud.google.com/v1beta1 kind: WorkstationCluster 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/pkg/test/resourcefixture/testdata/basic/workstations/workstationconfig/workstationconfig-full/_generated_object_workstationconfig-full.golden.yaml b/pkg/test/resourcefixture/testdata/basic/workstations/workstationconfig/workstationconfig-full/_generated_object_workstationconfig-full.golden.yaml index 4dfc68687a..642a2e245d 100644 --- a/pkg/test/resourcefixture/testdata/basic/workstations/workstationconfig/workstationconfig-full/_generated_object_workstationconfig-full.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/workstations/workstationconfig/workstationconfig-full/_generated_object_workstationconfig-full.golden.yaml @@ -1,8 +1,6 @@ apiVersion: workstations.cnrm.cloud.google.com/v1beta1 kind: WorkstationConfig 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/pkg/test/resourcefixture/testdata/basic/workstations/workstationconfig/workstationconfig-minimal/_generated_object_workstationconfig-minimal.golden.yaml b/pkg/test/resourcefixture/testdata/basic/workstations/workstationconfig/workstationconfig-minimal/_generated_object_workstationconfig-minimal.golden.yaml index 65d404af47..ae63ac395c 100644 --- a/pkg/test/resourcefixture/testdata/basic/workstations/workstationconfig/workstationconfig-minimal/_generated_object_workstationconfig-minimal.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/workstations/workstationconfig/workstationconfig-minimal/_generated_object_workstationconfig-minimal.golden.yaml @@ -1,8 +1,6 @@ apiVersion: workstations.cnrm.cloud.google.com/v1beta1 kind: WorkstationConfig 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/pkg/webhook/management_conflict_annotation_defaulter.go b/pkg/webhook/management_conflict_annotation_defaulter.go index 9b93de2795..f24a8357cc 100644 --- a/pkg/webhook/management_conflict_annotation_defaulter.go +++ b/pkg/webhook/management_conflict_annotation_defaulter.go @@ -21,6 +21,7 @@ import ( dclmetadata "github.com/GoogleCloudPlatform/k8s-config-connector/pkg/dcl/metadata" "github.com/GoogleCloudPlatform/k8s-config-connector/pkg/dcl/schema/dclschemaloader" + "github.com/GoogleCloudPlatform/k8s-config-connector/pkg/gvks/supportedgvks" "github.com/GoogleCloudPlatform/k8s-config-connector/pkg/k8s" "github.com/GoogleCloudPlatform/k8s-config-connector/pkg/servicemapping/servicemappingloader" @@ -68,6 +69,9 @@ func (a *managementConflictAnnotationDefaulter) Handle(ctx context.Context, req return admission.Errored(http.StatusInternalServerError, fmt.Errorf("error getting Namespace %v: %w", obj.GetNamespace(), err)) } + if supportedgvks.IsDirectByGVK(obj.GroupVersionKind()) { + return admission.Allowed("") + } if dclmetadata.IsDCLBasedResourceKind(obj.GroupVersionKind(), a.serviceMetadataLoader) { return defaultManagementConflictAnnotationForDCLBasedResources(obj, ns, a.dclSchemaLoader, a.serviceMetadataLoader) } diff --git a/tests/e2e/testdata/scenarios/fields/llm_custom_diff/value_type/label/_object00.yaml b/tests/e2e/testdata/scenarios/fields/llm_custom_diff/value_type/label/_object00.yaml index 3f499aa864..cdf2b624c8 100644 --- a/tests/e2e/testdata/scenarios/fields/llm_custom_diff/value_type/label/_object00.yaml +++ b/tests/e2e/testdata/scenarios/fields/llm_custom_diff/value_type/label/_object00.yaml @@ -16,7 +16,6 @@ apiVersion: logging.cnrm.cloud.google.com/v1beta1 kind: LoggingLogMetric metadata: annotations: - cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} cnrm.cloud.google.com/state-into-spec: absent finalizers: diff --git a/tests/e2e/testdata/scenarios/fields/llm_custom_diff/value_type/label/_object01.yaml b/tests/e2e/testdata/scenarios/fields/llm_custom_diff/value_type/label/_object01.yaml index 4befb3a433..e3a44d3ff4 100644 --- a/tests/e2e/testdata/scenarios/fields/llm_custom_diff/value_type/label/_object01.yaml +++ b/tests/e2e/testdata/scenarios/fields/llm_custom_diff/value_type/label/_object01.yaml @@ -16,7 +16,6 @@ apiVersion: logging.cnrm.cloud.google.com/v1beta1 kind: LoggingLogMetric metadata: annotations: - cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} cnrm.cloud.google.com/state-into-spec: absent finalizers: diff --git a/tests/e2e/testdata/scenarios/fields/llm_immutable_field/labels_value_type/_object00.yaml b/tests/e2e/testdata/scenarios/fields/llm_immutable_field/labels_value_type/_object00.yaml index f7faf3d6b4..f8e62c1e04 100644 --- a/tests/e2e/testdata/scenarios/fields/llm_immutable_field/labels_value_type/_object00.yaml +++ b/tests/e2e/testdata/scenarios/fields/llm_immutable_field/labels_value_type/_object00.yaml @@ -16,7 +16,6 @@ apiVersion: logging.cnrm.cloud.google.com/v1beta1 kind: LoggingLogMetric metadata: annotations: - cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} cnrm.cloud.google.com/state-into-spec: absent finalizers: diff --git a/tests/e2e/testdata/scenarios/fields/llm_immutable_field/labels_value_type/_object01.yaml b/tests/e2e/testdata/scenarios/fields/llm_immutable_field/labels_value_type/_object01.yaml index b8a5949be9..b7f00fc431 100644 --- a/tests/e2e/testdata/scenarios/fields/llm_immutable_field/labels_value_type/_object01.yaml +++ b/tests/e2e/testdata/scenarios/fields/llm_immutable_field/labels_value_type/_object01.yaml @@ -2,7 +2,6 @@ apiVersion: logging.cnrm.cloud.google.com/v1beta1 kind: LoggingLogMetric metadata: annotations: - cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} cnrm.cloud.google.com/state-into-spec: absent finalizers: diff --git a/tests/e2e/testdata/scenarios/fields/llm_immutable_field/metric_kind_and_value_type/_object00.yaml b/tests/e2e/testdata/scenarios/fields/llm_immutable_field/metric_kind_and_value_type/_object00.yaml index f7faf3d6b4..f8e62c1e04 100644 --- a/tests/e2e/testdata/scenarios/fields/llm_immutable_field/metric_kind_and_value_type/_object00.yaml +++ b/tests/e2e/testdata/scenarios/fields/llm_immutable_field/metric_kind_and_value_type/_object00.yaml @@ -16,7 +16,6 @@ apiVersion: logging.cnrm.cloud.google.com/v1beta1 kind: LoggingLogMetric metadata: annotations: - cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} cnrm.cloud.google.com/state-into-spec: absent finalizers: diff --git a/tests/e2e/testdata/scenarios/fields/llm_immutable_field/metric_kind_and_value_type/_object01.yaml b/tests/e2e/testdata/scenarios/fields/llm_immutable_field/metric_kind_and_value_type/_object01.yaml index 5bd993412f..d680e92c5d 100644 --- a/tests/e2e/testdata/scenarios/fields/llm_immutable_field/metric_kind_and_value_type/_object01.yaml +++ b/tests/e2e/testdata/scenarios/fields/llm_immutable_field/metric_kind_and_value_type/_object01.yaml @@ -2,7 +2,6 @@ apiVersion: logging.cnrm.cloud.google.com/v1beta1 kind: LoggingLogMetric metadata: annotations: - cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} cnrm.cloud.google.com/state-into-spec: absent finalizers: diff --git a/tests/e2e/testdata/scenarios/fields/llm_lazy_reconcile/_object00.yaml b/tests/e2e/testdata/scenarios/fields/llm_lazy_reconcile/_object00.yaml index 02efc23d9e..529d3469df 100644 --- a/tests/e2e/testdata/scenarios/fields/llm_lazy_reconcile/_object00.yaml +++ b/tests/e2e/testdata/scenarios/fields/llm_lazy_reconcile/_object00.yaml @@ -2,7 +2,6 @@ apiVersion: logging.cnrm.cloud.google.com/v1beta1 kind: LoggingLogMetric metadata: annotations: - cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} cnrm.cloud.google.com/state-into-spec: absent finalizers: diff --git a/tests/e2e/testdata/scenarios/fields/llm_lazy_reconcile/_object01.yaml b/tests/e2e/testdata/scenarios/fields/llm_lazy_reconcile/_object01.yaml index ad88cb6ef2..d730eeeb7e 100644 --- a/tests/e2e/testdata/scenarios/fields/llm_lazy_reconcile/_object01.yaml +++ b/tests/e2e/testdata/scenarios/fields/llm_lazy_reconcile/_object01.yaml @@ -2,7 +2,6 @@ apiVersion: logging.cnrm.cloud.google.com/v1beta1 kind: LoggingLogMetric metadata: annotations: - cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} cnrm.cloud.google.com/state-into-spec: absent test.cnrm.cloud.google.com/reconcile-cookie: (removed) diff --git a/tests/e2e/testdata/scenarios/fields/management/gkehub/featuremembership/set_unset/_object03.yaml b/tests/e2e/testdata/scenarios/fields/management/gkehub/featuremembership/set_unset/_object03.yaml index 62a36a652f..6c15a5d086 100644 --- a/tests/e2e/testdata/scenarios/fields/management/gkehub/featuremembership/set_unset/_object03.yaml +++ b/tests/e2e/testdata/scenarios/fields/management/gkehub/featuremembership/set_unset/_object03.yaml @@ -2,7 +2,6 @@ apiVersion: gkehub.cnrm.cloud.google.com/v1beta1 kind: GKEHubFeatureMembership metadata: annotations: - cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} cnrm.cloud.google.com/state-into-spec: absent finalizers: diff --git a/tests/e2e/testdata/scenarios/fields/management/gkehub/featuremembership/set_unset/_object04.yaml b/tests/e2e/testdata/scenarios/fields/management/gkehub/featuremembership/set_unset/_object04.yaml index e2194566ff..88e750d817 100644 --- a/tests/e2e/testdata/scenarios/fields/management/gkehub/featuremembership/set_unset/_object04.yaml +++ b/tests/e2e/testdata/scenarios/fields/management/gkehub/featuremembership/set_unset/_object04.yaml @@ -2,7 +2,6 @@ apiVersion: gkehub.cnrm.cloud.google.com/v1beta1 kind: GKEHubFeatureMembership metadata: annotations: - cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} cnrm.cloud.google.com/state-into-spec: absent finalizers: diff --git a/tests/e2e/testdata/scenarios/fields/management/gkehub/featuremembership/set_unset/_object05.yaml b/tests/e2e/testdata/scenarios/fields/management/gkehub/featuremembership/set_unset/_object05.yaml index 85acb467c0..f561f20afd 100644 --- a/tests/e2e/testdata/scenarios/fields/management/gkehub/featuremembership/set_unset/_object05.yaml +++ b/tests/e2e/testdata/scenarios/fields/management/gkehub/featuremembership/set_unset/_object05.yaml @@ -2,7 +2,6 @@ apiVersion: gkehub.cnrm.cloud.google.com/v1beta1 kind: GKEHubFeatureMembership metadata: annotations: - cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} cnrm.cloud.google.com/state-into-spec: absent finalizers: diff --git a/tests/e2e/testdata/scenarios/fields/management/logging/logmetric/set-zero/_object00.yaml b/tests/e2e/testdata/scenarios/fields/management/logging/logmetric/set-zero/_object00.yaml index 9c754f16ed..b69a8ce3bd 100644 --- a/tests/e2e/testdata/scenarios/fields/management/logging/logmetric/set-zero/_object00.yaml +++ b/tests/e2e/testdata/scenarios/fields/management/logging/logmetric/set-zero/_object00.yaml @@ -2,7 +2,6 @@ apiVersion: logging.cnrm.cloud.google.com/v1beta1 kind: LoggingLogMetric metadata: annotations: - cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} cnrm.cloud.google.com/state-into-spec: absent finalizers: diff --git a/tests/e2e/testdata/scenarios/fields/management/logging/logmetric/set-zero/_object01.yaml b/tests/e2e/testdata/scenarios/fields/management/logging/logmetric/set-zero/_object01.yaml index 8c6a6fa187..61f64fc9db 100644 --- a/tests/e2e/testdata/scenarios/fields/management/logging/logmetric/set-zero/_object01.yaml +++ b/tests/e2e/testdata/scenarios/fields/management/logging/logmetric/set-zero/_object01.yaml @@ -2,7 +2,6 @@ apiVersion: logging.cnrm.cloud.google.com/v1beta1 kind: LoggingLogMetric metadata: annotations: - cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} cnrm.cloud.google.com/state-into-spec: absent finalizers: diff --git a/tests/e2e/testdata/scenarios/fields/management/logging/logmetric/set_unset/basic/_object00.yaml b/tests/e2e/testdata/scenarios/fields/management/logging/logmetric/set_unset/basic/_object00.yaml index 4d9de202a1..b1128b8492 100644 --- a/tests/e2e/testdata/scenarios/fields/management/logging/logmetric/set_unset/basic/_object00.yaml +++ b/tests/e2e/testdata/scenarios/fields/management/logging/logmetric/set_unset/basic/_object00.yaml @@ -16,7 +16,6 @@ apiVersion: logging.cnrm.cloud.google.com/v1beta1 kind: LoggingLogMetric metadata: annotations: - cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/mutable-but-unreadable-fields: '{}' cnrm.cloud.google.com/project-id: ${projectId} cnrm.cloud.google.com/state-into-spec: absent diff --git a/tests/e2e/testdata/scenarios/fields/management/logging/logmetric/set_unset/basic/_object01.yaml b/tests/e2e/testdata/scenarios/fields/management/logging/logmetric/set_unset/basic/_object01.yaml index 4e554fbb54..6b21ca0289 100644 --- a/tests/e2e/testdata/scenarios/fields/management/logging/logmetric/set_unset/basic/_object01.yaml +++ b/tests/e2e/testdata/scenarios/fields/management/logging/logmetric/set_unset/basic/_object01.yaml @@ -16,7 +16,6 @@ apiVersion: logging.cnrm.cloud.google.com/v1beta1 kind: LoggingLogMetric metadata: annotations: - cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/mutable-but-unreadable-fields: '{}' cnrm.cloud.google.com/project-id: ${projectId} cnrm.cloud.google.com/state-into-spec: absent diff --git a/tests/e2e/testdata/scenarios/fields/management/logging/logmetric/set_unset/basic/_object02.yaml b/tests/e2e/testdata/scenarios/fields/management/logging/logmetric/set_unset/basic/_object02.yaml index d29b857483..bd6fb9de02 100644 --- a/tests/e2e/testdata/scenarios/fields/management/logging/logmetric/set_unset/basic/_object02.yaml +++ b/tests/e2e/testdata/scenarios/fields/management/logging/logmetric/set_unset/basic/_object02.yaml @@ -16,7 +16,6 @@ apiVersion: logging.cnrm.cloud.google.com/v1beta1 kind: LoggingLogMetric metadata: annotations: - cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/mutable-but-unreadable-fields: '{}' cnrm.cloud.google.com/project-id: ${projectId} cnrm.cloud.google.com/state-into-spec: absent diff --git a/tests/e2e/testdata/scenarios/fields/management/logging/logmetric/set_unset/metric_descriptor/_object00.yaml b/tests/e2e/testdata/scenarios/fields/management/logging/logmetric/set_unset/metric_descriptor/_object00.yaml index 0815ddd300..29b2bddc55 100644 --- a/tests/e2e/testdata/scenarios/fields/management/logging/logmetric/set_unset/metric_descriptor/_object00.yaml +++ b/tests/e2e/testdata/scenarios/fields/management/logging/logmetric/set_unset/metric_descriptor/_object00.yaml @@ -16,7 +16,6 @@ apiVersion: logging.cnrm.cloud.google.com/v1beta1 kind: LoggingLogMetric metadata: annotations: - cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/mutable-but-unreadable-fields: '{}' cnrm.cloud.google.com/project-id: ${projectId} cnrm.cloud.google.com/state-into-spec: absent diff --git a/tests/e2e/testdata/scenarios/fields/management/logging/logmetric/set_unset/metric_descriptor/_object01.yaml b/tests/e2e/testdata/scenarios/fields/management/logging/logmetric/set_unset/metric_descriptor/_object01.yaml index adf9c630fa..3d2d957e37 100644 --- a/tests/e2e/testdata/scenarios/fields/management/logging/logmetric/set_unset/metric_descriptor/_object01.yaml +++ b/tests/e2e/testdata/scenarios/fields/management/logging/logmetric/set_unset/metric_descriptor/_object01.yaml @@ -16,7 +16,6 @@ apiVersion: logging.cnrm.cloud.google.com/v1beta1 kind: LoggingLogMetric metadata: annotations: - cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/mutable-but-unreadable-fields: '{"spec":{"metricDescriptor":{"launchStage":"EARLY_ACCESS","metadata":{"ingestDelay":"1s","samplePeriod":"1s"}}}}' cnrm.cloud.google.com/project-id: ${projectId} cnrm.cloud.google.com/state-into-spec: absent diff --git a/tests/e2e/testdata/scenarios/fields/management/logging/logmetric/set_unset/metric_descriptor/_object02.yaml b/tests/e2e/testdata/scenarios/fields/management/logging/logmetric/set_unset/metric_descriptor/_object02.yaml index ff402e3af7..ce4744f5ee 100644 --- a/tests/e2e/testdata/scenarios/fields/management/logging/logmetric/set_unset/metric_descriptor/_object02.yaml +++ b/tests/e2e/testdata/scenarios/fields/management/logging/logmetric/set_unset/metric_descriptor/_object02.yaml @@ -16,7 +16,6 @@ apiVersion: logging.cnrm.cloud.google.com/v1beta1 kind: LoggingLogMetric metadata: annotations: - cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/mutable-but-unreadable-fields: '{}' cnrm.cloud.google.com/project-id: ${projectId} cnrm.cloud.google.com/state-into-spec: absent diff --git a/tests/e2e/testdata/scenarios/powertool/logginglogmetric_clear_state_into_spec/_object00.yaml b/tests/e2e/testdata/scenarios/powertool/logginglogmetric_clear_state_into_spec/_object00.yaml index 399633105b..8c3572a0d5 100644 --- a/tests/e2e/testdata/scenarios/powertool/logginglogmetric_clear_state_into_spec/_object00.yaml +++ b/tests/e2e/testdata/scenarios/powertool/logginglogmetric_clear_state_into_spec/_object00.yaml @@ -2,7 +2,6 @@ apiVersion: logging.cnrm.cloud.google.com/v1beta1 kind: LoggingLogMetric metadata: annotations: - cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} cnrm.cloud.google.com/state-into-spec: merge finalizers: diff --git a/tests/e2e/testdata/scenarios/powertool/logginglogmetric_clear_state_into_spec/_object01.yaml b/tests/e2e/testdata/scenarios/powertool/logginglogmetric_clear_state_into_spec/_object01.yaml index bff30163a4..f8d4864ed5 100644 --- a/tests/e2e/testdata/scenarios/powertool/logginglogmetric_clear_state_into_spec/_object01.yaml +++ b/tests/e2e/testdata/scenarios/powertool/logginglogmetric_clear_state_into_spec/_object01.yaml @@ -2,7 +2,6 @@ apiVersion: logging.cnrm.cloud.google.com/v1beta1 kind: LoggingLogMetric metadata: annotations: - cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} cnrm.cloud.google.com/state-into-spec: merge finalizers: diff --git a/tests/e2e/testdata/scenarios/powertool/logginglogmetric_clear_state_into_spec/_object03.yaml b/tests/e2e/testdata/scenarios/powertool/logginglogmetric_clear_state_into_spec/_object03.yaml index 27693fe567..72e4ddbdaa 100644 --- a/tests/e2e/testdata/scenarios/powertool/logginglogmetric_clear_state_into_spec/_object03.yaml +++ b/tests/e2e/testdata/scenarios/powertool/logginglogmetric_clear_state_into_spec/_object03.yaml @@ -2,7 +2,6 @@ apiVersion: logging.cnrm.cloud.google.com/v1beta1 kind: LoggingLogMetric metadata: annotations: - cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} cnrm.cloud.google.com/state-into-spec: absent finalizers: