diff --git a/config/samples/resources/alloydbcluster/secondary-cluster/alloydb_v1beta1_alloydbcluster.yaml b/config/samples/resources/alloydbcluster/secondary-cluster/alloydb_v1beta1_alloydbcluster.yaml index d4bd48f441..60f157fc2d 100644 --- a/config/samples/resources/alloydbcluster/secondary-cluster/alloydb_v1beta1_alloydbcluster.yaml +++ b/config/samples/resources/alloydbcluster/secondary-cluster/alloydb_v1beta1_alloydbcluster.yaml @@ -23,27 +23,9 @@ spec: name: alloydbcluster-dep-secondary projectRef: external: ${PROJECT_ID?} - automatedBackupPolicy: - backupWindow: 3600s - encryptionConfig: - kmsKeyNameRef: - name: alloydbcluster-dep-secondary - enabled: true - labels: - source: kcc - location: us-east1 - timeBasedRetention: - retentionPeriod: 43200s - weeklySchedule: - daysOfWeek: [MONDAY] - startTimes: - - hours: 4 - minutes: 0 - seconds: 0 - nanos: 0 encryptionConfig: - kmsKeyNameRef: - name: alloydbcluster-dep-secondary + kmsKeyNameRef: + name: alloydbcluster-dep1-secondary initialUser: user: "postgres" password: @@ -60,6 +42,9 @@ spec: name: alloydbcluster-dep-secondary projectRef: external: ${PROJECT_ID?} + encryptionConfig: + kmsKeyNameRef: + name: alloydbcluster-dep2-secondary clusterType: "SECONDARY" secondaryConfig: primaryClusterNameRef: diff --git a/config/samples/resources/alloydbcluster/secondary-cluster/iam_v1beta1_iampartialpolicy.yaml b/config/samples/resources/alloydbcluster/secondary-cluster/iam_v1beta1_iampartialpolicy.yaml index caf04d5660..9d6dffb895 100644 --- a/config/samples/resources/alloydbcluster/secondary-cluster/iam_v1beta1_iampartialpolicy.yaml +++ b/config/samples/resources/alloydbcluster/secondary-cluster/iam_v1beta1_iampartialpolicy.yaml @@ -15,15 +15,31 @@ apiVersion: iam.cnrm.cloud.google.com/v1beta1 kind: IAMPartialPolicy metadata: - name: alloydbcluster-dep-secondary + name: alloydbcluster-dep1-secondary spec: resourceRef: apiVersion: kms.cnrm.cloud.google.com/v1beta1 kind: KMSCryptoKey - name: alloydbcluster-dep-secondary + name: alloydbcluster-dep1-secondary bindings: - role: roles/cloudkms.cryptoKeyEncrypterDecrypter members: - memberFrom: serviceIdentityRef: - name: alloydbcluster-dep-secondary + name: alloydbcluster-dep1-secondary +--- +apiVersion: iam.cnrm.cloud.google.com/v1beta1 +kind: IAMPartialPolicy +metadata: + name: alloydbcluster-dep2-secondary +spec: + resourceRef: + apiVersion: kms.cnrm.cloud.google.com/v1beta1 + kind: KMSCryptoKey + name: alloydbcluster-dep2-secondary + bindings: + - role: roles/cloudkms.cryptoKeyEncrypterDecrypter + members: + - memberFrom: + serviceIdentityRef: + name: alloydbcluster-dep2-secondary diff --git a/config/samples/resources/alloydbcluster/secondary-cluster/kms_v1beta1_kmscryptokey.yaml b/config/samples/resources/alloydbcluster/secondary-cluster/kms_v1beta1_kmscryptokey.yaml index a8f928063f..4950735160 100644 --- a/config/samples/resources/alloydbcluster/secondary-cluster/kms_v1beta1_kmscryptokey.yaml +++ b/config/samples/resources/alloydbcluster/secondary-cluster/kms_v1beta1_kmscryptokey.yaml @@ -15,9 +15,15 @@ apiVersion: kms.cnrm.cloud.google.com/v1beta1 kind: KMSCryptoKey metadata: - labels: - source: kcc-alloydbcluster-sample - name: alloydbcluster-dep-secondary + name: alloydbcluster-dep1-secondary spec: keyRingRef: - name: alloydbcluster-dep-secondary + name: alloydbcluster-dep1-secondary +--- +apiVersion: kms.cnrm.cloud.google.com/v1beta1 +kind: KMSCryptoKey +metadata: + name: alloydbcluster-dep2-secondary +spec: + keyRingRef: + name: alloydbcluster-dep2-secondary diff --git a/config/samples/resources/alloydbcluster/secondary-cluster/kms_v1beta1_kmskeyring.yaml b/config/samples/resources/alloydbcluster/secondary-cluster/kms_v1beta1_kmskeyring.yaml index 9c46985cf0..3fb2c37676 100644 --- a/config/samples/resources/alloydbcluster/secondary-cluster/kms_v1beta1_kmskeyring.yaml +++ b/config/samples/resources/alloydbcluster/secondary-cluster/kms_v1beta1_kmskeyring.yaml @@ -15,6 +15,13 @@ apiVersion: kms.cnrm.cloud.google.com/v1beta1 kind: KMSKeyRing metadata: - name: alloydbcluster-dep-secondary + name: alloydbcluster-dep1-secondary spec: location: us-east1 +--- +apiVersion: kms.cnrm.cloud.google.com/v1beta1 +kind: KMSKeyRing +metadata: + name: alloydbcluster-dep2-secondary +spec: + location: us-west1 diff --git a/config/samples/resources/alloydbcluster/secondary-cluster/serviceusage_v1beta1_serviceidentity.yaml b/config/samples/resources/alloydbcluster/secondary-cluster/serviceusage_v1beta1_serviceidentity.yaml index b4803edb4e..c4ee016b7b 100644 --- a/config/samples/resources/alloydbcluster/secondary-cluster/serviceusage_v1beta1_serviceidentity.yaml +++ b/config/samples/resources/alloydbcluster/secondary-cluster/serviceusage_v1beta1_serviceidentity.yaml @@ -15,7 +15,16 @@ apiVersion: serviceusage.cnrm.cloud.google.com/v1beta1 kind: ServiceIdentity metadata: - name: alloydbcluster-dep-secondary + name: alloydbcluster-dep1-secondary +spec: + projectRef: + external: ${PROJECT_ID?} + resourceID: alloydb.googleapis.com +--- +apiVersion: serviceusage.cnrm.cloud.google.com/v1beta1 +kind: ServiceIdentity +metadata: + name: alloydbcluster-dep2-secondary spec: projectRef: external: ${PROJECT_ID?} diff --git a/scripts/generate-google3-docs/resource-reference/generated/resource-docs/alloydb/alloydbcluster.md b/scripts/generate-google3-docs/resource-reference/generated/resource-docs/alloydb/alloydbcluster.md index dcc46763d5..c1480d9752 100644 --- a/scripts/generate-google3-docs/resource-reference/generated/resource-docs/alloydb/alloydbcluster.md +++ b/scripts/generate-google3-docs/resource-reference/generated/resource-docs/alloydb/alloydbcluster.md @@ -1515,27 +1515,9 @@ spec: name: alloydbcluster-dep-secondary projectRef: external: ${PROJECT_ID?} - automatedBackupPolicy: - backupWindow: 3600s - encryptionConfig: - kmsKeyNameRef: - name: alloydbcluster-dep-secondary - enabled: true - labels: - source: kcc - location: us-east1 - timeBasedRetention: - retentionPeriod: 43200s - weeklySchedule: - daysOfWeek: [MONDAY] - startTimes: - - hours: 4 - minutes: 0 - seconds: 0 - nanos: 0 encryptionConfig: - kmsKeyNameRef: - name: alloydbcluster-dep-secondary + kmsKeyNameRef: + name: alloydbcluster-dep1-secondary initialUser: user: "postgres" password: @@ -1552,6 +1534,9 @@ spec: name: alloydbcluster-dep-secondary projectRef: external: ${PROJECT_ID?} + encryptionConfig: + kmsKeyNameRef: + name: alloydbcluster-dep2-secondary clusterType: "SECONDARY" secondaryConfig: primaryClusterNameRef: @@ -1578,36 +1563,65 @@ metadata: apiVersion: iam.cnrm.cloud.google.com/v1beta1 kind: IAMPartialPolicy metadata: - name: alloydbcluster-dep-secondary + name: alloydbcluster-dep1-secondary spec: resourceRef: apiVersion: kms.cnrm.cloud.google.com/v1beta1 kind: KMSCryptoKey - name: alloydbcluster-dep-secondary + name: alloydbcluster-dep1-secondary bindings: - role: roles/cloudkms.cryptoKeyEncrypterDecrypter members: - memberFrom: serviceIdentityRef: - name: alloydbcluster-dep-secondary + name: alloydbcluster-dep1-secondary +--- +apiVersion: iam.cnrm.cloud.google.com/v1beta1 +kind: IAMPartialPolicy +metadata: + name: alloydbcluster-dep2-secondary +spec: + resourceRef: + apiVersion: kms.cnrm.cloud.google.com/v1beta1 + kind: KMSCryptoKey + name: alloydbcluster-dep2-secondary + bindings: + - role: roles/cloudkms.cryptoKeyEncrypterDecrypter + members: + - memberFrom: + serviceIdentityRef: + name: alloydbcluster-dep2-secondary --- apiVersion: kms.cnrm.cloud.google.com/v1beta1 kind: KMSCryptoKey metadata: - labels: - source: kcc-alloydbcluster-sample - name: alloydbcluster-dep-secondary + name: alloydbcluster-dep1-secondary spec: keyRingRef: - name: alloydbcluster-dep-secondary + name: alloydbcluster-dep1-secondary +--- +apiVersion: kms.cnrm.cloud.google.com/v1beta1 +kind: KMSCryptoKey +metadata: + name: alloydbcluster-dep2-secondary +spec: + keyRingRef: + name: alloydbcluster-dep2-secondary --- apiVersion: kms.cnrm.cloud.google.com/v1beta1 kind: KMSKeyRing metadata: - name: alloydbcluster-dep-secondary + name: alloydbcluster-dep1-secondary spec: location: us-east1 --- +apiVersion: kms.cnrm.cloud.google.com/v1beta1 +kind: KMSKeyRing +metadata: + name: alloydbcluster-dep2-secondary +spec: + location: us-west1 +--- apiVersion: servicenetworking.cnrm.cloud.google.com/v1beta1 kind: ServiceNetworkingConnection metadata: @@ -1622,7 +1636,16 @@ spec: apiVersion: serviceusage.cnrm.cloud.google.com/v1beta1 kind: ServiceIdentity metadata: - name: alloydbcluster-dep-secondary + name: alloydbcluster-dep1-secondary +spec: + projectRef: + external: ${PROJECT_ID?} + resourceID: alloydb.googleapis.com +--- +apiVersion: serviceusage.cnrm.cloud.google.com/v1beta1 +kind: ServiceIdentity +metadata: + name: alloydbcluster-dep2-secondary spec: projectRef: external: ${PROJECT_ID?}