From eba21f1a41d235496bf1899eb2206a562eca486c Mon Sep 17 00:00:00 2001 From: Jason Vigil Date: Fri, 20 Dec 2024 19:38:26 +0000 Subject: [PATCH] Revert "fix: Add helper comment for ResourceID validation" This reverts commit 7d5756a4e223646b3862f0ec0addd6e77f861dad. --- apis/bigquerydatatransfer/v1alpha1/config_types.go | 1 - apis/bigquerydatatransfer/v1beta1/transferconfig_types.go | 1 - .../certificatemanager/v1alpha1/dnsauthorization_types.go | 1 - apis/certificatemanager/v1beta1/dnsauthorization_types.go | 1 - apis/compute/v1beta1/targettcpproxy_types.go | 1 - apis/containerattached/v1beta1/cluster_types.go | 1 - .../v1alpha1/discoveryenginedatastore_types.go | 1 - apis/kms/v1alpha1/keyhandle_types.go | 1 - apis/kms/v1beta1/keyhandle_types.go | 1 - .../privilegedaccessmanager/v1alpha1/entitlement_types.go | 1 - .../v1beta1/privilegedaccessmanagerentitlement_types.go | 1 - apis/secretmanager/v1beta1/secret_types.go | 1 - apis/securesourcemanager/v1alpha1/repository_types.go | 1 - apis/spanner/v1beta1/instance_types.go | 1 - apis/workstations/v1alpha1/cluster_types.go | 1 - apis/workstations/v1alpha1/config_types.go | 1 - apis/workstations/v1alpha1/workstation_types.go | 1 - apis/workstations/v1beta1/cluster_types.go | 1 - apis/workstations/v1beta1/config_types.go | 1 - apis/workstations/v1beta1/workstation_types.go | 1 - ...onfigs.bigquerydatatransfer.cnrm.cloud.google.com.yaml | 6 ++---- ...izations.certificatemanager.cnrm.cloud.google.com.yaml | 6 ++---- ...utetargettcpproxies.compute.cnrm.cloud.google.com.yaml | 3 +-- ...dclusters.containerattached.cnrm.cloud.google.com.yaml | 3 +-- ...edatastores.discoveryengine.cnrm.cloud.google.com.yaml | 3 +-- ...efinition_kmskeyhandles.kms.cnrm.cloud.google.com.yaml | 8 ++------ ...nts.privilegedaccessmanager.cnrm.cloud.google.com.yaml | 7 ++----- ...anagersecrets.secretmanager.cnrm.cloud.google.com.yaml | 3 +-- ...itories.securesourcemanager.cnrm.cloud.google.com.yaml | 3 +-- ...on_spannerinstances.spanner.cnrm.cloud.google.com.yaml | 3 +-- ...tationclusters.workstations.cnrm.cloud.google.com.yaml | 6 ++---- ...stationconfigs.workstations.cnrm.cloud.google.com.yaml | 6 ++---- ...n_workstations.workstations.cnrm.cloud.google.com.yaml | 6 ++---- dev/tools/controllerbuilder/template/apis/types.go | 1 - .../bigquerydatatransfer/bigquerydatatransferconfig.md | 2 +- .../certificatemanagerdnsauthorization.md | 2 +- .../resource-docs/compute/computetargettcpproxy.md | 2 +- .../containerattached/containerattachedcluster.md | 2 +- .../generated/resource-docs/kms/kmskeyhandle.md | 2 +- .../privilegedaccessmanagerentitlement.md | 2 +- .../resource-docs/secretmanager/secretmanagersecret.md | 2 +- .../generated/resource-docs/spanner/spannerinstance.md | 2 +- .../generated/resource-docs/workstations/workstation.md | 2 +- .../resource-docs/workstations/workstationcluster.md | 2 +- .../resource-docs/workstations/workstationconfig.md | 2 +- 45 files changed, 31 insertions(+), 75 deletions(-) diff --git a/apis/bigquerydatatransfer/v1alpha1/config_types.go b/apis/bigquerydatatransfer/v1alpha1/config_types.go index 4fa5a74b44..96e44e8e51 100644 --- a/apis/bigquerydatatransfer/v1alpha1/config_types.go +++ b/apis/bigquerydatatransfer/v1alpha1/config_types.go @@ -83,7 +83,6 @@ type BigQueryDataTransferConfigSpec struct { Parent `json:",inline"` // The BigQueryDataTransferConfig name. If not given, the metadata.name will be used. - // Cannot be changed after create, except for updating from empty string to the actual resource ID. ResourceID *string `json:"resourceID,omitempty"` // Data transfer schedule. diff --git a/apis/bigquerydatatransfer/v1beta1/transferconfig_types.go b/apis/bigquerydatatransfer/v1beta1/transferconfig_types.go index 1b84e11bd7..5286345be2 100644 --- a/apis/bigquerydatatransfer/v1beta1/transferconfig_types.go +++ b/apis/bigquerydatatransfer/v1beta1/transferconfig_types.go @@ -109,7 +109,6 @@ type BigQueryDataTransferConfigSpec struct { Parent `json:",inline"` // The BigQueryDataTransferConfig name. If not given, the metadata.name will be used. - // Cannot be changed after create, except for updating from empty string to the actual resource ID. ResourceID *string `json:"resourceID,omitempty"` // Data transfer schedule. diff --git a/apis/certificatemanager/v1alpha1/dnsauthorization_types.go b/apis/certificatemanager/v1alpha1/dnsauthorization_types.go index d6076f6950..058bc3e5d3 100644 --- a/apis/certificatemanager/v1alpha1/dnsauthorization_types.go +++ b/apis/certificatemanager/v1alpha1/dnsauthorization_types.go @@ -41,7 +41,6 @@ type CertificateManagerDNSAuthorizationSpec struct { ProjectRef refs.ProjectRef `json:"projectRef"` /* Optional. The name of the resource. Used for creation and acquisition. When unset, the value of `metadata.name` is used as the default. */ - // Cannot be changed after create, except for updating from empty string to the actual resource ID. // +optional ResourceID *string `json:"resourceID,omitempty"` } diff --git a/apis/certificatemanager/v1beta1/dnsauthorization_types.go b/apis/certificatemanager/v1beta1/dnsauthorization_types.go index 051aa4fbd8..82e3897c61 100644 --- a/apis/certificatemanager/v1beta1/dnsauthorization_types.go +++ b/apis/certificatemanager/v1beta1/dnsauthorization_types.go @@ -45,7 +45,6 @@ type CertificateManagerDNSAuthorizationSpec struct { Location string `json:"location"` /* Optional. The name of the resource. Used for creation and acquisition. When unset, the value of `metadata.name` is used as the default. */ - // Cannot be changed after create, except for updating from empty string to the actual resource ID. // +optional ResourceID *string `json:"resourceID,omitempty"` } diff --git a/apis/compute/v1beta1/targettcpproxy_types.go b/apis/compute/v1beta1/targettcpproxy_types.go index 3c8d7ef166..93467358ae 100644 --- a/apis/compute/v1beta1/targettcpproxy_types.go +++ b/apis/compute/v1beta1/targettcpproxy_types.go @@ -54,7 +54,6 @@ type ComputeTargetTCPProxySpec struct { ProxyHeader *string `json:"proxyHeader,omitempty"` // The ComputeTargetTCPProxy name. If not given, the metadata.name will be used. - // Cannot be changed after create, except for updating from empty string to the actual resource ID. ResourceID *string `json:"resourceID,omitempty"` } diff --git a/apis/containerattached/v1beta1/cluster_types.go b/apis/containerattached/v1beta1/cluster_types.go index e7fa877d82..4cc336ef19 100644 --- a/apis/containerattached/v1beta1/cluster_types.go +++ b/apis/containerattached/v1beta1/cluster_types.go @@ -30,7 +30,6 @@ type ContainerAttachedClusterSpec struct { // Optional. // The ContainerAttachedCluster name. If not given, the metadata.name will be used. - // Cannot be changed after create, except for updating from empty string to the actual resource ID. ResourceID *string `json:"resourceID,omitempty"` // +kubebuilder:validation:XValidation:rule="self == oldSelf",message="Location field is immutable" diff --git a/apis/discoveryengine/v1alpha1/discoveryenginedatastore_types.go b/apis/discoveryengine/v1alpha1/discoveryenginedatastore_types.go index e3d1747baf..ff834c3184 100644 --- a/apis/discoveryengine/v1alpha1/discoveryenginedatastore_types.go +++ b/apis/discoveryengine/v1alpha1/discoveryenginedatastore_types.go @@ -26,7 +26,6 @@ var DiscoveryEngineDataStoreGVK = GroupVersion.WithKind("DiscoveryEngineDataStor // +kcc:proto=google.cloud.discoveryengine.v1.DataStore type DiscoveryEngineDataStoreSpec struct { // The DiscoveryEngineDataStore name. If not given, the metadata.name will be used. - // Cannot be changed after create, except for updating from empty string to the actual resource ID. ResourceID *string `json:"resourceID,omitempty"` // Required. The data store display name. diff --git a/apis/kms/v1alpha1/keyhandle_types.go b/apis/kms/v1alpha1/keyhandle_types.go index 9346bc0a8b..ddd165e677 100644 --- a/apis/kms/v1alpha1/keyhandle_types.go +++ b/apis/kms/v1alpha1/keyhandle_types.go @@ -30,7 +30,6 @@ type KMSKeyHandleSpec struct { // The KMS Key Handle ID used for resource creation or acquisition. // For creation: If specified, this value is used as the key handle ID. If not provided, a UUID will be generated and assigned as the key handle ID. // For acquisition: This field must be provided to identify the key handle resource to acquire. - // Cannot be changed after create, except for updating from empty string to the actual resource ID. ResourceID *string `json:"resourceID,omitempty"` // Project hosting KMSKeyHandle diff --git a/apis/kms/v1beta1/keyhandle_types.go b/apis/kms/v1beta1/keyhandle_types.go index 2ebf9dd180..80dd800dee 100644 --- a/apis/kms/v1beta1/keyhandle_types.go +++ b/apis/kms/v1beta1/keyhandle_types.go @@ -30,7 +30,6 @@ type KMSKeyHandleSpec struct { // The KMS Key Handle ID used for resource creation or acquisition. // For creation: If specified, this value is used as the key handle ID. If not provided, a UUID will be generated and assigned as the key handle ID. // For acquisition: This field must be provided to identify the key handle resource to acquire. - // Cannot be changed after create, except for updating from empty string to the actual resource ID. ResourceID *string `json:"resourceID,omitempty"` // Project hosting KMSKeyHandle diff --git a/apis/privilegedaccessmanager/v1alpha1/entitlement_types.go b/apis/privilegedaccessmanager/v1alpha1/entitlement_types.go index 9c1399c7dc..6013c22dfc 100644 --- a/apis/privilegedaccessmanager/v1alpha1/entitlement_types.go +++ b/apis/privilegedaccessmanager/v1alpha1/entitlement_types.go @@ -50,7 +50,6 @@ type PrivilegedAccessManagerEntitlementSpec struct { // The PrivilegedAccessManagerEntitlement name. If not given, the // 'metadata.name' will be used. - // Cannot be changed after create, except for updating from empty string to the actual resource ID. // +optional ResourceID *string `json:"resourceID,omitempty"` diff --git a/apis/privilegedaccessmanager/v1beta1/privilegedaccessmanagerentitlement_types.go b/apis/privilegedaccessmanager/v1beta1/privilegedaccessmanagerentitlement_types.go index 0f0c6ed834..e67fcebc08 100644 --- a/apis/privilegedaccessmanager/v1beta1/privilegedaccessmanagerentitlement_types.go +++ b/apis/privilegedaccessmanager/v1beta1/privilegedaccessmanagerentitlement_types.go @@ -51,7 +51,6 @@ type PrivilegedAccessManagerEntitlementSpec struct { // Immutable. // The PrivilegedAccessManagerEntitlement name. If not given, the // 'metadata.name' will be used. - // Cannot be changed after create, except for updating from empty string to the actual resource ID. // +optional ResourceID *string `json:"resourceID,omitempty"` diff --git a/apis/secretmanager/v1beta1/secret_types.go b/apis/secretmanager/v1beta1/secret_types.go index 4dc4a945db..eaf1c3fc93 100644 --- a/apis/secretmanager/v1beta1/secret_types.go +++ b/apis/secretmanager/v1beta1/secret_types.go @@ -29,7 +29,6 @@ var SecretManagerSecretGVK = GroupVersion.WithKind("SecretManagerSecret") // +kcc:proto=google.cloud.secretmanager.v1.Secret type SecretManagerSecretSpec struct { // The SecretManagerSecret name. If not given, the metadata.name will be used. - // Cannot be changed after create, except for updating from empty string to the actual resource ID. ResourceID *string `json:"resourceID,omitempty"` // Optional. Immutable. The replication policy of the secret data attached to diff --git a/apis/securesourcemanager/v1alpha1/repository_types.go b/apis/securesourcemanager/v1alpha1/repository_types.go index c2225c36b6..da1e6859a8 100644 --- a/apis/securesourcemanager/v1alpha1/repository_types.go +++ b/apis/securesourcemanager/v1alpha1/repository_types.go @@ -36,7 +36,6 @@ type SecureSourceManagerRepositorySpec struct { Location string `json:"location"` // The SecureSourceManagerRepository name. If not given, the metadata.name will be used. - // Cannot be changed after create, except for updating from empty string to the actual resource ID. ResourceID *string `json:"resourceID,omitempty"` // The name of the instance in which the repository is hosted, formatted as diff --git a/apis/spanner/v1beta1/instance_types.go b/apis/spanner/v1beta1/instance_types.go index 84a4d5f9f9..135ba30a46 100644 --- a/apis/spanner/v1beta1/instance_types.go +++ b/apis/spanner/v1beta1/instance_types.go @@ -46,7 +46,6 @@ type SpannerInstanceSpec struct { ProcessingUnits *int32 `json:"processingUnits,omitempty"` // The SpannerInstance name. If not given, the metadata.name will be used. - // Cannot be changed after create, except for updating from empty string to the actual resource ID. ResourceID *string `json:"resourceID,omitempty"` } diff --git a/apis/workstations/v1alpha1/cluster_types.go b/apis/workstations/v1alpha1/cluster_types.go index 47b67346cb..18813affed 100644 --- a/apis/workstations/v1alpha1/cluster_types.go +++ b/apis/workstations/v1alpha1/cluster_types.go @@ -37,7 +37,6 @@ type WorkstationClusterSpec struct { Location string `json:"location,omitempty"` // The WorkstationCluster name. If not given, the metadata.name will be used. - // Cannot be changed after create, except for updating from empty string to the actual resource ID. ResourceID *string `json:"resourceID,omitempty"` // Optional. Human-readable name for this workstation cluster. diff --git a/apis/workstations/v1alpha1/config_types.go b/apis/workstations/v1alpha1/config_types.go index 7783423b81..c3ab8df420 100644 --- a/apis/workstations/v1alpha1/config_types.go +++ b/apis/workstations/v1alpha1/config_types.go @@ -275,7 +275,6 @@ type WorkstationConfigSpec struct { Parent *WorkstationClusterRef `json:"parentRef"` // The WorkstationConfig name. If not given, the metadata.name will be used. - // Cannot be changed after create, except for updating from empty string to the actual resource ID. ResourceID *string `json:"resourceID,omitempty"` // Optional. Human-readable name for this workstation configuration. diff --git a/apis/workstations/v1alpha1/workstation_types.go b/apis/workstations/v1alpha1/workstation_types.go index 5a4e289cee..0601371243 100644 --- a/apis/workstations/v1alpha1/workstation_types.go +++ b/apis/workstations/v1alpha1/workstation_types.go @@ -28,7 +28,6 @@ type WorkstationSpec struct { Parent *WorkstationConfigRef `json:"parentRef"` // The Workstation name. If not given, the metadata.name will be used. - // Cannot be changed after create, except for updating from empty string to the actual resource ID. ResourceID *string `json:"resourceID,omitempty"` // Optional. Human-readable name for this workstation. diff --git a/apis/workstations/v1beta1/cluster_types.go b/apis/workstations/v1beta1/cluster_types.go index a0dd6ddeed..acd2f85560 100644 --- a/apis/workstations/v1beta1/cluster_types.go +++ b/apis/workstations/v1beta1/cluster_types.go @@ -37,7 +37,6 @@ type WorkstationClusterSpec struct { Location string `json:"location,omitempty"` // The WorkstationCluster name. If not given, the metadata.name will be used. - // Cannot be changed after create, except for updating from empty string to the actual resource ID. ResourceID *string `json:"resourceID,omitempty"` // Optional. Human-readable name for this workstation cluster. diff --git a/apis/workstations/v1beta1/config_types.go b/apis/workstations/v1beta1/config_types.go index 22128f9977..ec65fecea8 100644 --- a/apis/workstations/v1beta1/config_types.go +++ b/apis/workstations/v1beta1/config_types.go @@ -275,7 +275,6 @@ type WorkstationConfigSpec struct { Parent *WorkstationClusterRef `json:"parentRef"` // The WorkstationConfig name. If not given, the metadata.name will be used. - // Cannot be changed after create, except for updating from empty string to the actual resource ID. ResourceID *string `json:"resourceID,omitempty"` // Optional. Human-readable name for this workstation configuration. diff --git a/apis/workstations/v1beta1/workstation_types.go b/apis/workstations/v1beta1/workstation_types.go index 97541122ff..1df85c01d2 100644 --- a/apis/workstations/v1beta1/workstation_types.go +++ b/apis/workstations/v1beta1/workstation_types.go @@ -28,7 +28,6 @@ type WorkstationSpec struct { Parent *WorkstationConfigRef `json:"parentRef"` // The Workstation name. If not given, the metadata.name will be used. - // Cannot be changed after create, except for updating from empty string to the actual resource ID. ResourceID *string `json:"resourceID,omitempty"` // Optional. Human-readable name for this workstation. diff --git a/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_bigquerydatatransferconfigs.bigquerydatatransfer.cnrm.cloud.google.com.yaml b/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_bigquerydatatransferconfigs.bigquerydatatransfer.cnrm.cloud.google.com.yaml index fe62114671..2cbad467a2 100644 --- a/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_bigquerydatatransferconfigs.bigquerydatatransfer.cnrm.cloud.google.com.yaml +++ b/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_bigquerydatatransferconfigs.bigquerydatatransfer.cnrm.cloud.google.com.yaml @@ -233,8 +233,7 @@ spec: type: object resourceID: description: The BigQueryDataTransferConfig name. If not given, the - metadata.name will be used. Cannot be changed after create, except - for updating from empty string to the actual resource ID. + metadata.name will be used. type: string schedule: description: |- @@ -620,8 +619,7 @@ spec: type: object resourceID: description: The BigQueryDataTransferConfig name. If not given, the - metadata.name will be used. Cannot be changed after create, except - for updating from empty string to the actual resource ID. + metadata.name will be used. type: string schedule: description: |- diff --git a/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_certificatemanagerdnsauthorizations.certificatemanager.cnrm.cloud.google.com.yaml b/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_certificatemanagerdnsauthorizations.certificatemanager.cnrm.cloud.google.com.yaml index 7bf8dcb8f6..86681936a3 100644 --- a/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_certificatemanagerdnsauthorizations.certificatemanager.cnrm.cloud.google.com.yaml +++ b/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_certificatemanagerdnsauthorizations.certificatemanager.cnrm.cloud.google.com.yaml @@ -109,8 +109,7 @@ spec: resourceID: description: Optional. The name of the resource. Used for creation and acquisition. When unset, the value of `metadata.name` is used - as the default. Cannot be changed after create, except for updating - from empty string to the actual resource ID. + as the default. type: string required: - domain @@ -270,8 +269,7 @@ spec: resourceID: description: Optional. The name of the resource. Used for creation and acquisition. When unset, the value of `metadata.name` is used - as the default. Cannot be changed after create, except for updating - from empty string to the actual resource ID. + as the default. type: string required: - domain diff --git a/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_computetargettcpproxies.compute.cnrm.cloud.google.com.yaml b/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_computetargettcpproxies.compute.cnrm.cloud.google.com.yaml index d47d0574ce..d6382d0376 100644 --- a/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_computetargettcpproxies.compute.cnrm.cloud.google.com.yaml +++ b/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_computetargettcpproxies.compute.cnrm.cloud.google.com.yaml @@ -117,8 +117,7 @@ spec: type: string resourceID: description: The ComputeTargetTCPProxy name. If not given, the metadata.name - will be used. Cannot be changed after create, except for updating - from empty string to the actual resource ID. + will be used. type: string required: - backendServiceRef diff --git a/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_containerattachedclusters.containerattached.cnrm.cloud.google.com.yaml b/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_containerattachedclusters.containerattached.cnrm.cloud.google.com.yaml index ff56fef34d..4f03b72b64 100644 --- a/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_containerattachedclusters.containerattached.cnrm.cloud.google.com.yaml +++ b/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_containerattachedclusters.containerattached.cnrm.cloud.google.com.yaml @@ -271,8 +271,7 @@ spec: type: object resourceID: description: Optional. The ContainerAttachedCluster name. If not given, - the metadata.name will be used. Cannot be changed after create, - except for updating from empty string to the actual resource ID. + the metadata.name will be used. type: string required: - distribution diff --git a/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_discoveryenginedatastores.discoveryengine.cnrm.cloud.google.com.yaml b/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_discoveryenginedatastores.discoveryengine.cnrm.cloud.google.com.yaml index 31feadaadc..d2d981fec4 100644 --- a/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_discoveryenginedatastores.discoveryengine.cnrm.cloud.google.com.yaml +++ b/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_discoveryenginedatastores.discoveryengine.cnrm.cloud.google.com.yaml @@ -122,8 +122,7 @@ spec: type: object resourceID: description: The DiscoveryEngineDataStore name. If not given, the - metadata.name will be used. Cannot be changed after create, except - for updating from empty string to the actual resource ID. + metadata.name will be used. type: string solutionTypes: description: |- diff --git a/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_kmskeyhandles.kms.cnrm.cloud.google.com.yaml b/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_kmskeyhandles.kms.cnrm.cloud.google.com.yaml index 9bcc7f6c6c..404ae3f702 100644 --- a/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_kmskeyhandles.kms.cnrm.cloud.google.com.yaml +++ b/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_kmskeyhandles.kms.cnrm.cloud.google.com.yaml @@ -100,9 +100,7 @@ spec: acquisition. For creation: If specified, this value is used as the key handle ID. If not provided, a UUID will be generated and assigned as the key handle ID. For acquisition: This field must be provided - to identify the key handle resource to acquire. Cannot be changed - after create, except for updating from empty string to the actual - resource ID.' + to identify the key handle resource to acquire.' type: string resourceTypeSelector: description: Indicates the resource type that the resulting [CryptoKey][] @@ -242,9 +240,7 @@ spec: acquisition. For creation: If specified, this value is used as the key handle ID. If not provided, a UUID will be generated and assigned as the key handle ID. For acquisition: This field must be provided - to identify the key handle resource to acquire. Cannot be changed - after create, except for updating from empty string to the actual - resource ID.' + to identify the key handle resource to acquire.' type: string resourceTypeSelector: description: Indicates the resource type that the resulting [CryptoKey][] diff --git a/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_privilegedaccessmanagerentitlements.privilegedaccessmanager.cnrm.cloud.google.com.yaml b/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_privilegedaccessmanagerentitlements.privilegedaccessmanager.cnrm.cloud.google.com.yaml index 8ec36b2411..a51b2c38bf 100644 --- a/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_privilegedaccessmanagerentitlements.privilegedaccessmanager.cnrm.cloud.google.com.yaml +++ b/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_privilegedaccessmanagerentitlements.privilegedaccessmanager.cnrm.cloud.google.com.yaml @@ -304,8 +304,7 @@ spec: type: object resourceID: description: The PrivilegedAccessManagerEntitlement name. If not given, - the 'metadata.name' will be used. Cannot be changed after create, - except for updating from empty string to the actual resource ID. + the 'metadata.name' will be used. type: string required: - eligibleUsers @@ -669,9 +668,7 @@ spec: type: object resourceID: description: Immutable. The PrivilegedAccessManagerEntitlement name. - If not given, the 'metadata.name' will be used. Cannot be changed - after create, except for updating from empty string to the actual - resource ID. + If not given, the 'metadata.name' will be used. type: string required: - eligibleUsers diff --git a/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_secretmanagersecrets.secretmanager.cnrm.cloud.google.com.yaml b/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_secretmanagersecrets.secretmanager.cnrm.cloud.google.com.yaml index c951e79f96..0390b61062 100644 --- a/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_secretmanagersecrets.secretmanager.cnrm.cloud.google.com.yaml +++ b/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_secretmanagersecrets.secretmanager.cnrm.cloud.google.com.yaml @@ -240,8 +240,7 @@ spec: type: object resourceID: description: The SecretManagerSecret name. If not given, the metadata.name - will be used. Cannot be changed after create, except for updating - from empty string to the actual resource ID. + will be used. type: string rotation: description: Optional. Rotation policy attached to the [Secret][google.cloud.secretmanager.v1.Secret]. diff --git a/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_securesourcemanagerrepositories.securesourcemanager.cnrm.cloud.google.com.yaml b/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_securesourcemanagerrepositories.securesourcemanager.cnrm.cloud.google.com.yaml index 7370e6d5b6..be6ccb19e7 100644 --- a/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_securesourcemanagerrepositories.securesourcemanager.cnrm.cloud.google.com.yaml +++ b/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_securesourcemanagerrepositories.securesourcemanager.cnrm.cloud.google.com.yaml @@ -269,8 +269,7 @@ spec: type: object resourceID: description: The SecureSourceManagerRepository name. If not given, - the metadata.name will be used. Cannot be changed after create, - except for updating from empty string to the actual resource ID. + the metadata.name will be used. type: string required: - instanceRef diff --git a/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_spannerinstances.spanner.cnrm.cloud.google.com.yaml b/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_spannerinstances.spanner.cnrm.cloud.google.com.yaml index 5e506239d9..7107942e95 100644 --- a/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_spannerinstances.spanner.cnrm.cloud.google.com.yaml +++ b/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_spannerinstances.spanner.cnrm.cloud.google.com.yaml @@ -84,8 +84,7 @@ spec: type: integer resourceID: description: The SpannerInstance name. If not given, the metadata.name - will be used. Cannot be changed after create, except for updating - from empty string to the actual resource ID. + will be used. type: string required: - config diff --git a/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_workstationclusters.workstations.cnrm.cloud.google.com.yaml b/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_workstationclusters.workstations.cnrm.cloud.google.com.yaml index 017c95217a..6872239ffc 100644 --- a/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_workstationclusters.workstations.cnrm.cloud.google.com.yaml +++ b/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_workstationclusters.workstations.cnrm.cloud.google.com.yaml @@ -203,8 +203,7 @@ spec: rule: self == oldSelf resourceID: description: The WorkstationCluster name. If not given, the metadata.name - will be used. Cannot be changed after create, except for updating - from empty string to the actual resource ID. + will be used. type: string subnetworkRef: description: Immutable. Reference to the Compute Engine subnetwork @@ -547,8 +546,7 @@ spec: rule: self == oldSelf resourceID: description: The WorkstationCluster name. If not given, the metadata.name - will be used. Cannot be changed after create, except for updating - from empty string to the actual resource ID. + will be used. type: string subnetworkRef: description: Immutable. Reference to the Compute Engine subnetwork diff --git a/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_workstationconfigs.workstations.cnrm.cloud.google.com.yaml b/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_workstationconfigs.workstations.cnrm.cloud.google.com.yaml index 50aecec4b0..24158c3108 100644 --- a/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_workstationconfigs.workstations.cnrm.cloud.google.com.yaml +++ b/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_workstationconfigs.workstations.cnrm.cloud.google.com.yaml @@ -507,8 +507,7 @@ spec: type: array resourceID: description: The WorkstationConfig name. If not given, the metadata.name - will be used. Cannot be changed after create, except for updating - from empty string to the actual resource ID. + will be used. type: string runningTimeout: description: |- @@ -1135,8 +1134,7 @@ spec: type: array resourceID: description: The WorkstationConfig name. If not given, the metadata.name - will be used. Cannot be changed after create, except for updating - from empty string to the actual resource ID. + will be used. type: string runningTimeout: description: |- diff --git a/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_workstations.workstations.cnrm.cloud.google.com.yaml b/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_workstations.workstations.cnrm.cloud.google.com.yaml index e23c2be9ae..c680d7c072 100644 --- a/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_workstations.workstations.cnrm.cloud.google.com.yaml +++ b/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_workstations.workstations.cnrm.cloud.google.com.yaml @@ -119,8 +119,7 @@ spec: type: object resourceID: description: The Workstation name. If not given, the metadata.name - will be used. Cannot be changed after create, except for updating - from empty string to the actual resource ID. + will be used. type: string required: - parentRef @@ -309,8 +308,7 @@ spec: type: object resourceID: description: The Workstation name. If not given, the metadata.name - will be used. Cannot be changed after create, except for updating - from empty string to the actual resource ID. + will be used. type: string required: - parentRef diff --git a/dev/tools/controllerbuilder/template/apis/types.go b/dev/tools/controllerbuilder/template/apis/types.go index 26d017d11e..97d083c018 100644 --- a/dev/tools/controllerbuilder/template/apis/types.go +++ b/dev/tools/controllerbuilder/template/apis/types.go @@ -38,7 +38,6 @@ var {{ .Kind }}GVK = GroupVersion.WithKind("{{ .Kind }}") {{- end }} type {{ .Kind }}Spec struct { // The {{ .Kind }} name. If not given, the metadata.name will be used. - // Cannot be changed after create, except for updating from empty string to the actual resource ID. ResourceID *string ` + "`" + `json:"resourceID,omitempty"` + "`" + ` } diff --git a/scripts/generate-google3-docs/resource-reference/generated/resource-docs/bigquerydatatransfer/bigquerydatatransferconfig.md b/scripts/generate-google3-docs/resource-reference/generated/resource-docs/bigquerydatatransfer/bigquerydatatransferconfig.md index 8cc7474b5b..b9a298c03d 100644 --- a/scripts/generate-google3-docs/resource-reference/generated/resource-docs/bigquerydatatransfer/bigquerydatatransferconfig.md +++ b/scripts/generate-google3-docs/resource-reference/generated/resource-docs/bigquerydatatransfer/bigquerydatatransferconfig.md @@ -387,7 +387,7 @@ serviceAccountRef:

string

-

{% verbatim %}The BigQueryDataTransferConfig name. If not given, the metadata.name will be used. Cannot be changed after create, except for updating from empty string to the actual resource ID.{% endverbatim %}

+

{% verbatim %}The BigQueryDataTransferConfig name. If not given, the metadata.name will be used.{% endverbatim %}

diff --git a/scripts/generate-google3-docs/resource-reference/generated/resource-docs/certificatemanager/certificatemanagerdnsauthorization.md b/scripts/generate-google3-docs/resource-reference/generated/resource-docs/certificatemanager/certificatemanagerdnsauthorization.md index 5afbf2b9fa..2b29ebe952 100644 --- a/scripts/generate-google3-docs/resource-reference/generated/resource-docs/certificatemanager/certificatemanagerdnsauthorization.md +++ b/scripts/generate-google3-docs/resource-reference/generated/resource-docs/certificatemanager/certificatemanagerdnsauthorization.md @@ -168,7 +168,7 @@ resourceID: string

string

-

{% verbatim %}Optional. The name of the resource. Used for creation and acquisition. When unset, the value of `metadata.name` is used as the default. Cannot be changed after create, except for updating from empty string to the actual resource ID.{% endverbatim %}

+

{% verbatim %}Optional. The name of the resource. Used for creation and acquisition. When unset, the value of `metadata.name` is used as the default.{% endverbatim %}

diff --git a/scripts/generate-google3-docs/resource-reference/generated/resource-docs/compute/computetargettcpproxy.md b/scripts/generate-google3-docs/resource-reference/generated/resource-docs/compute/computetargettcpproxy.md index d01c07c9fa..ab23080999 100644 --- a/scripts/generate-google3-docs/resource-reference/generated/resource-docs/compute/computetargettcpproxy.md +++ b/scripts/generate-google3-docs/resource-reference/generated/resource-docs/compute/computetargettcpproxy.md @@ -182,7 +182,7 @@ resourceID: string

string

-

{% verbatim %}The ComputeTargetTCPProxy name. If not given, the metadata.name will be used. Cannot be changed after create, except for updating from empty string to the actual resource ID.{% endverbatim %}

+

{% verbatim %}The ComputeTargetTCPProxy name. If not given, the metadata.name will be used.{% endverbatim %}

diff --git a/scripts/generate-google3-docs/resource-reference/generated/resource-docs/containerattached/containerattachedcluster.md b/scripts/generate-google3-docs/resource-reference/generated/resource-docs/containerattached/containerattachedcluster.md index c14594b33e..3cea3273b0 100644 --- a/scripts/generate-google3-docs/resource-reference/generated/resource-docs/containerattached/containerattachedcluster.md +++ b/scripts/generate-google3-docs/resource-reference/generated/resource-docs/containerattached/containerattachedcluster.md @@ -512,7 +512,7 @@ while clusters with private issuers need to provide both 'issuerUrl' and 'jwks'.

string

-

{% verbatim %}Optional. The ContainerAttachedCluster name. If not given, the metadata.name will be used. Cannot be changed after create, except for updating from empty string to the actual resource ID.{% endverbatim %}

+

{% verbatim %}Optional. The ContainerAttachedCluster name. If not given, the metadata.name will be used.{% endverbatim %}

diff --git a/scripts/generate-google3-docs/resource-reference/generated/resource-docs/kms/kmskeyhandle.md b/scripts/generate-google3-docs/resource-reference/generated/resource-docs/kms/kmskeyhandle.md index fbda7ed506..fe15c216ed 100644 --- a/scripts/generate-google3-docs/resource-reference/generated/resource-docs/kms/kmskeyhandle.md +++ b/scripts/generate-google3-docs/resource-reference/generated/resource-docs/kms/kmskeyhandle.md @@ -147,7 +147,7 @@ resourceTypeSelector: string

string

-

{% verbatim %}The KMS Key Handle ID used for resource creation or acquisition. For creation: If specified, this value is used as the key handle ID. If not provided, a UUID will be generated and assigned as the key handle ID. For acquisition: This field must be provided to identify the key handle resource to acquire. Cannot be changed after create, except for updating from empty string to the actual resource ID.{% endverbatim %}

+

{% verbatim %}The KMS Key Handle ID used for resource creation or acquisition. For creation: If specified, this value is used as the key handle ID. If not provided, a UUID will be generated and assigned as the key handle ID. For acquisition: This field must be provided to identify the key handle resource to acquire.{% endverbatim %}

diff --git a/scripts/generate-google3-docs/resource-reference/generated/resource-docs/privilegedaccessmanager/privilegedaccessmanagerentitlement.md b/scripts/generate-google3-docs/resource-reference/generated/resource-docs/privilegedaccessmanager/privilegedaccessmanagerentitlement.md index 9833be7cc6..9a73baa71c 100644 --- a/scripts/generate-google3-docs/resource-reference/generated/resource-docs/privilegedaccessmanager/privilegedaccessmanagerentitlement.md +++ b/scripts/generate-google3-docs/resource-reference/generated/resource-docs/privilegedaccessmanager/privilegedaccessmanagerentitlement.md @@ -562,7 +562,7 @@ https://cloud.google.com/iam/docs/conditions-overview#attributes.{% endverbatim

string

-

{% verbatim %}Immutable. The PrivilegedAccessManagerEntitlement name. If not given, the 'metadata.name' will be used. Cannot be changed after create, except for updating from empty string to the actual resource ID.{% endverbatim %}

+

{% verbatim %}Immutable. The PrivilegedAccessManagerEntitlement name. If not given, the 'metadata.name' will be used.{% endverbatim %}

diff --git a/scripts/generate-google3-docs/resource-reference/generated/resource-docs/secretmanager/secretmanagersecret.md b/scripts/generate-google3-docs/resource-reference/generated/resource-docs/secretmanager/secretmanagersecret.md index 16fa71d199..2cee06f808 100644 --- a/scripts/generate-google3-docs/resource-reference/generated/resource-docs/secretmanager/secretmanagersecret.md +++ b/scripts/generate-google3-docs/resource-reference/generated/resource-docs/secretmanager/secretmanagersecret.md @@ -395,7 +395,7 @@ versionAliases:

string

-

{% verbatim %}The SecretManagerSecret name. If not given, the metadata.name will be used. Cannot be changed after create, except for updating from empty string to the actual resource ID.{% endverbatim %}

+

{% verbatim %}The SecretManagerSecret name. If not given, the metadata.name will be used.{% endverbatim %}

diff --git a/scripts/generate-google3-docs/resource-reference/generated/resource-docs/spanner/spannerinstance.md b/scripts/generate-google3-docs/resource-reference/generated/resource-docs/spanner/spannerinstance.md index 703c07f20c..48cd9330bb 100644 --- a/scripts/generate-google3-docs/resource-reference/generated/resource-docs/spanner/spannerinstance.md +++ b/scripts/generate-google3-docs/resource-reference/generated/resource-docs/spanner/spannerinstance.md @@ -159,7 +159,7 @@ resourceID: string

string

-

{% verbatim %}The SpannerInstance name. If not given, the metadata.name will be used. Cannot be changed after create, except for updating from empty string to the actual resource ID.{% endverbatim %}

+

{% verbatim %}The SpannerInstance name. If not given, the metadata.name will be used.{% endverbatim %}

diff --git a/scripts/generate-google3-docs/resource-reference/generated/resource-docs/workstations/workstation.md b/scripts/generate-google3-docs/resource-reference/generated/resource-docs/workstations/workstation.md index bc375f68e6..9eac4309a1 100644 --- a/scripts/generate-google3-docs/resource-reference/generated/resource-docs/workstations/workstation.md +++ b/scripts/generate-google3-docs/resource-reference/generated/resource-docs/workstations/workstation.md @@ -219,7 +219,7 @@ resourceID: string

string

-

{% verbatim %}The Workstation name. If not given, the metadata.name will be used. Cannot be changed after create, except for updating from empty string to the actual resource ID.{% endverbatim %}

+

{% verbatim %}The Workstation name. If not given, the metadata.name will be used.{% endverbatim %}

diff --git a/scripts/generate-google3-docs/resource-reference/generated/resource-docs/workstations/workstationcluster.md b/scripts/generate-google3-docs/resource-reference/generated/resource-docs/workstations/workstationcluster.md index ffa548beaa..423077e179 100644 --- a/scripts/generate-google3-docs/resource-reference/generated/resource-docs/workstations/workstationcluster.md +++ b/scripts/generate-google3-docs/resource-reference/generated/resource-docs/workstations/workstationcluster.md @@ -376,7 +376,7 @@ subnetworkRef:

string

-

{% verbatim %}The WorkstationCluster name. If not given, the metadata.name will be used. Cannot be changed after create, except for updating from empty string to the actual resource ID.{% endverbatim %}

+

{% verbatim %}The WorkstationCluster name. If not given, the metadata.name will be used.{% endverbatim %}

diff --git a/scripts/generate-google3-docs/resource-reference/generated/resource-docs/workstations/workstationconfig.md b/scripts/generate-google3-docs/resource-reference/generated/resource-docs/workstations/workstationconfig.md index 230574ff09..c5baeed10b 100644 --- a/scripts/generate-google3-docs/resource-reference/generated/resource-docs/workstations/workstationconfig.md +++ b/scripts/generate-google3-docs/resource-reference/generated/resource-docs/workstations/workstationconfig.md @@ -955,7 +955,7 @@ runningTimeout: string

string

-

{% verbatim %}The WorkstationConfig name. If not given, the metadata.name will be used. Cannot be changed after create, except for updating from empty string to the actual resource ID.{% endverbatim %}

+

{% verbatim %}The WorkstationConfig name. If not given, the metadata.name will be used.{% endverbatim %}