diff --git a/.release-please-manifest.json b/.release-please-manifest.json index de5fe0bb..0c534414 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,19 +1,19 @@ { - "catalog/acm": "0.1.1", - "catalog/anthos-cluster": "0.1.1", - "catalog/bucket": "0.4.3", - "catalog/empty": "0.3.0", - "catalog/gitops": "0.4.2", - "catalog/gke": "0.4.0", - "catalog/gke-autopilot": "0.1.0", - "catalog/hierarchy": "0.3.0", - "catalog/iam-foundation": "0.1.0", - "catalog/landing-zone": "0.5.0", - "catalog/landing-zone-lite": "0.1.0", - "catalog/log-export": "0.4.0", - "catalog/networking": "0.4.0", - "catalog/project": "0.4.2", - "catalog/redis-bucket": "0.3.2", - "catalog/spanner": "0.3.0", - "catalog/sql/auth-proxy": "0.0.1" + "catalog/acm": "0.1.2", + "catalog/anthos-cluster": "0.1.2", + "catalog/bucket": "0.4.4", + "catalog/empty": "0.3.1", + "catalog/gitops": "0.5.0", + "catalog/gke": "0.4.1", + "catalog/gke-autopilot": "0.1.1", + "catalog/hierarchy": "0.4.0", + "catalog/iam-foundation": "0.1.1", + "catalog/landing-zone": "0.5.1", + "catalog/landing-zone-lite": "0.1.1", + "catalog/log-export": "0.5.0", + "catalog/networking": "0.4.1", + "catalog/project": "0.4.3", + "catalog/redis-bucket": "0.3.3", + "catalog/spanner": "0.3.1", + "catalog/sql/auth-proxy": "0.1.0" } diff --git a/catalog/acm/CHANGELOG.md b/catalog/acm/CHANGELOG.md index 4bd755f9..e60743e3 100644 --- a/catalog/acm/CHANGELOG.md +++ b/catalog/acm/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +### [0.1.2](https://github.com/GoogleCloudPlatform/blueprints/compare/acm-blueprint-v0.1.1...acm-blueprint-v0.1.2) (2022-05-24) + + +### Bug Fixes + +* add local-config annotations to kptfiles and functionConfigs ([#176](https://github.com/GoogleCloudPlatform/blueprints/issues/176)) ([0d005f0](https://github.com/GoogleCloudPlatform/blueprints/commit/0d005f0174d95d3aca1691e67deffa573c3e7db7)) +* reduce setters for ACM blueprint ([#157](https://github.com/GoogleCloudPlatform/blueprints/issues/157)) ([0529ae6](https://github.com/GoogleCloudPlatform/blueprints/commit/0529ae669cf9af5f09bd7f71bde6445710e75377)) + ### [0.1.1](https://github.com/GoogleCloudPlatform/blueprints/compare/acm-blueprint-v0.1.0...acm-blueprint-v0.1.1) (2022-02-02) diff --git a/catalog/acm/config-mgmt-csr.yaml b/catalog/acm/config-mgmt-csr.yaml index 0828f325..05117bde 100644 --- a/catalog/acm/config-mgmt-csr.yaml +++ b/catalog/acm/config-mgmt-csr.yaml @@ -17,7 +17,7 @@ metadata: name: acm-membership-cluster-name # kpt-set: acm-membership-${cluster-name} namespace: config-control annotations: - cnrm.cloud.google.com/blueprint: cnrm/acm/v0.1.1 + cnrm.cloud.google.com/blueprint: cnrm/acm/v0.1.2 cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} spec: projectRef: diff --git a/catalog/acm/config-mgmt-iam.yaml b/catalog/acm/config-mgmt-iam.yaml index 22e23150..30531236 100644 --- a/catalog/acm/config-mgmt-iam.yaml +++ b/catalog/acm/config-mgmt-iam.yaml @@ -19,7 +19,7 @@ metadata: name: sa-acm-cluster-name # kpt-set: sa-acm-${cluster-name} namespace: config-control annotations: - cnrm.cloud.google.com/blueprint: cnrm/acm/v0.1.1 + cnrm.cloud.google.com/blueprint: cnrm/acm/v0.1.2 cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} spec: displayName: sa-acm-cluster-name # kpt-set: sa-acm-${cluster-name} @@ -32,7 +32,7 @@ metadata: name: sa-acm-cluster-name # kpt-set: sa-acm-${cluster-name} namespace: config-control annotations: - cnrm.cloud.google.com/blueprint: cnrm/acm/v0.1.1 + cnrm.cloud.google.com/blueprint: cnrm/acm/v0.1.2 cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} spec: resourceRef: @@ -51,7 +51,7 @@ metadata: name: source-reader-sync-cluster-name-project-id # kpt-set: source-reader-sync-${cluster-name}-${project-id} namespace: config-control annotations: - cnrm.cloud.google.com/blueprint: cnrm/acm/v0.1.1 + cnrm.cloud.google.com/blueprint: cnrm/acm/v0.1.2 cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} spec: resourceRef: diff --git a/catalog/acm/feat-config-mgmt.yaml b/catalog/acm/feat-config-mgmt.yaml index 01ad8abc..5a46c75a 100644 --- a/catalog/acm/feat-config-mgmt.yaml +++ b/catalog/acm/feat-config-mgmt.yaml @@ -17,7 +17,7 @@ metadata: name: feat-acm-cluster-name # kpt-set: feat-acm-${cluster-name} namespace: config-control annotations: - cnrm.cloud.google.com/blueprint: cnrm/acm/v0.1.1 + cnrm.cloud.google.com/blueprint: cnrm/acm/v0.1.2 cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} spec: projectRef: diff --git a/catalog/acm/membership.yaml b/catalog/acm/membership.yaml index c4582d42..0ec39cdb 100644 --- a/catalog/acm/membership.yaml +++ b/catalog/acm/membership.yaml @@ -17,7 +17,7 @@ metadata: name: hub-membership-cluster-name # kpt-set: hub-membership-${cluster-name} namespace: config-control annotations: - cnrm.cloud.google.com/blueprint: cnrm/acm/v0.1.1 + cnrm.cloud.google.com/blueprint: cnrm/acm/v0.1.2 cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} spec: location: global diff --git a/catalog/acm/services.yaml b/catalog/acm/services.yaml index 08feb30a..75ece491 100644 --- a/catalog/acm/services.yaml +++ b/catalog/acm/services.yaml @@ -18,7 +18,7 @@ metadata: name: project-id-cluster-name-gkehub # kpt-set: ${project-id}-${cluster-name}-gkehub namespace: config-control annotations: - cnrm.cloud.google.com/blueprint: cnrm/acm/v0.1.1 + cnrm.cloud.google.com/blueprint: cnrm/acm/v0.1.2 cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} cnrm.cloud.google.com/deletion-policy: abandon spec: @@ -30,7 +30,7 @@ metadata: name: project-id-cluster-name-acm # kpt-set: ${project-id}-${cluster-name}-acm namespace: config-control annotations: - cnrm.cloud.google.com/blueprint: cnrm/acm/v0.1.1 + cnrm.cloud.google.com/blueprint: cnrm/acm/v0.1.2 cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} cnrm.cloud.google.com/deletion-policy: abandon spec: diff --git a/catalog/anthos-cluster/CHANGELOG.md b/catalog/anthos-cluster/CHANGELOG.md index 61935a9e..93304ea7 100644 --- a/catalog/anthos-cluster/CHANGELOG.md +++ b/catalog/anthos-cluster/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [0.1.2](https://github.com/GoogleCloudPlatform/blueprints/compare/anthos-cluster-blueprint-v0.1.1...anthos-cluster-blueprint-v0.1.2) (2022-05-24) + + +### Bug Fixes + +* add local-config annotations to kptfiles and functionConfigs ([#176](https://github.com/GoogleCloudPlatform/blueprints/issues/176)) ([0d005f0](https://github.com/GoogleCloudPlatform/blueprints/commit/0d005f0174d95d3aca1691e67deffa573c3e7db7)) + ### [0.1.1](https://github.com/GoogleCloudPlatform/blueprints/compare/anthos-cluster-blueprint-v0.1.0...anthos-cluster-blueprint-v0.1.1) (2022-02-02) diff --git a/catalog/anthos-cluster/acm/acm-membership-api.yaml b/catalog/anthos-cluster/acm/acm-membership-api.yaml index 70dda751..5ba5fb3b 100644 --- a/catalog/anthos-cluster/acm/acm-membership-api.yaml +++ b/catalog/anthos-cluster/acm/acm-membership-api.yaml @@ -18,7 +18,7 @@ metadata: # kpt-merge: platform-namespace/project-id-cluster-name-gkehub name: project-id-cluster-name-gkehub # kpt-set: ${project-id}-${cluster-name}-gkehub namespace: platform-namespace # kpt-set: ${platform-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/acm/v0.1.1 + cnrm.cloud.google.com/blueprint: cnrm/acm/v0.1.2 cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} cnrm.cloud.google.com/deletion-policy: abandon spec: @@ -30,7 +30,7 @@ metadata: # kpt-merge: platform-namespace/project-id-cluster-name-acm name: project-id-cluster-name-acm # kpt-set: ${project-id}-${cluster-name}-acm namespace: platform-namespace # kpt-set: ${platform-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/acm/v0.1.1 + cnrm.cloud.google.com/blueprint: cnrm/acm/v0.1.2 cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} cnrm.cloud.google.com/deletion-policy: abandon spec: diff --git a/catalog/anthos-cluster/acm/config-mgmt-csr.yaml b/catalog/anthos-cluster/acm/config-mgmt-csr.yaml index 33f12d33..de01adbb 100644 --- a/catalog/anthos-cluster/acm/config-mgmt-csr.yaml +++ b/catalog/anthos-cluster/acm/config-mgmt-csr.yaml @@ -17,7 +17,7 @@ metadata: # kpt-merge: platform-namespace/feature-membership-name name: feature-membership-name # kpt-set: acm-membership-${cluster-name} namespace: platform-namespace # kpt-set: ${platform-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/acm/v0.1.1 + cnrm.cloud.google.com/blueprint: cnrm/acm/v0.1.2 cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} spec: projectRef: diff --git a/catalog/anthos-cluster/acm/config-mgmt-iam.yaml b/catalog/anthos-cluster/acm/config-mgmt-iam.yaml index 1649e01a..98db3e1d 100644 --- a/catalog/anthos-cluster/acm/config-mgmt-iam.yaml +++ b/catalog/anthos-cluster/acm/config-mgmt-iam.yaml @@ -19,7 +19,7 @@ metadata: # kpt-merge: platform-namespace/sa-acm-gke-cluster name: sa-acm-gke-cluster # kpt-set: sa-acm-${cluster-name} namespace: platform-namespace # kpt-set: ${platform-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/acm/v0.1.1 + cnrm.cloud.google.com/blueprint: cnrm/acm/v0.1.2 cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} spec: displayName: sa-acm-gke-cluster # kpt-set: sa-acm-${cluster-name} @@ -32,7 +32,7 @@ metadata: # kpt-merge: platform-namespace/sa-acm-gke-cluster name: sa-acm-gke-cluster # kpt-set: sa-acm-${cluster-name} namespace: platform-namespace # kpt-set: ${platform-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/acm/v0.1.1 + cnrm.cloud.google.com/blueprint: cnrm/acm/v0.1.2 cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} spec: resourceRef: @@ -51,7 +51,7 @@ metadata: # kpt-merge: platform-namespace/source-reader-sync-cluster-name-projec name: source-reader-sync-cluster-name-project-id # kpt-set: source-reader-sync-${cluster-name}-${project-id} namespace: platform-namespace # kpt-set: ${platform-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/acm/v0.1.1 + cnrm.cloud.google.com/blueprint: cnrm/acm/v0.1.2 cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} spec: resourceRef: diff --git a/catalog/anthos-cluster/acm/feat-config-mgmt.yaml b/catalog/anthos-cluster/acm/feat-config-mgmt.yaml index 41067d69..ea49060e 100644 --- a/catalog/anthos-cluster/acm/feat-config-mgmt.yaml +++ b/catalog/anthos-cluster/acm/feat-config-mgmt.yaml @@ -17,7 +17,7 @@ metadata: # kpt-merge: platform-namespace/feature-name name: feature-name # kpt-set: feat-acm-${cluster-name} namespace: platform-namespace # kpt-set: ${platform-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/acm/v0.1.1 + cnrm.cloud.google.com/blueprint: cnrm/acm/v0.1.2 cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} spec: projectRef: diff --git a/catalog/anthos-cluster/acm/membership.yaml b/catalog/anthos-cluster/acm/membership.yaml index d78a12bf..15203a25 100644 --- a/catalog/anthos-cluster/acm/membership.yaml +++ b/catalog/anthos-cluster/acm/membership.yaml @@ -17,7 +17,7 @@ metadata: # kpt-merge: platform-namespace/membership-name name: membership-name # kpt-set: hub-membership-${cluster-name} namespace: platform-namespace # kpt-set: ${platform-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/acm/v0.1.1 + cnrm.cloud.google.com/blueprint: cnrm/acm/v0.1.2 cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} spec: location: global diff --git a/catalog/anthos-cluster/acm/services.yaml b/catalog/anthos-cluster/acm/services.yaml index 1e5a97e3..40d76e76 100644 --- a/catalog/anthos-cluster/acm/services.yaml +++ b/catalog/anthos-cluster/acm/services.yaml @@ -18,7 +18,7 @@ metadata: # kpt-merge: platform-namespace/project-id-cluster-name-gkehub name: project-id-cluster-name-gkehub # kpt-set: ${project-id}-${cluster-name}-gkehub namespace: platform-namespace # kpt-set: ${platform-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/acm/v0.1.1 + cnrm.cloud.google.com/blueprint: cnrm/acm/v0.1.2 cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} cnrm.cloud.google.com/deletion-policy: abandon spec: @@ -30,7 +30,7 @@ metadata: # kpt-merge: platform-namespace/project-id-cluster-name-acm name: project-id-cluster-name-acm # kpt-set: ${project-id}-${cluster-name}-acm namespace: platform-namespace # kpt-set: ${platform-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/acm/v0.1.1 + cnrm.cloud.google.com/blueprint: cnrm/acm/v0.1.2 cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} cnrm.cloud.google.com/deletion-policy: abandon spec: diff --git a/catalog/bucket/CHANGELOG.md b/catalog/bucket/CHANGELOG.md index c6420586..2259895c 100644 --- a/catalog/bucket/CHANGELOG.md +++ b/catalog/bucket/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [0.4.4](https://github.com/GoogleCloudPlatform/blueprints/compare/bucket-blueprint-v0.4.3...bucket-blueprint-v0.4.4) (2022-05-24) + + +### Bug Fixes + +* add local-config annotations to kptfiles and functionConfigs ([#176](https://github.com/GoogleCloudPlatform/blueprints/issues/176)) ([0d005f0](https://github.com/GoogleCloudPlatform/blueprints/commit/0d005f0174d95d3aca1691e67deffa573c3e7db7)) + ### [0.4.3](https://github.com/GoogleCloudPlatform/blueprints/compare/bucket-blueprint-v0.4.2...bucket-blueprint-v0.4.3) (2022-02-02) diff --git a/catalog/empty/CHANGELOG.md b/catalog/empty/CHANGELOG.md new file mode 100644 index 00000000..933a10a4 --- /dev/null +++ b/catalog/empty/CHANGELOG.md @@ -0,0 +1,8 @@ +# Changelog + +### [0.3.1](https://github.com/GoogleCloudPlatform/blueprints/compare/empty-blueprint-v0.3.0...empty-blueprint-v0.3.1) (2022-05-24) + + +### Bug Fixes + +* add local-config annotations to kptfiles and functionConfigs ([#176](https://github.com/GoogleCloudPlatform/blueprints/issues/176)) ([0d005f0](https://github.com/GoogleCloudPlatform/blueprints/commit/0d005f0174d95d3aca1691e67deffa573c3e7db7)) diff --git a/catalog/gitops/CHANGELOG.md b/catalog/gitops/CHANGELOG.md index 152a4401..426e2f39 100644 --- a/catalog/gitops/CHANGELOG.md +++ b/catalog/gitops/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## [0.5.0](https://github.com/GoogleCloudPlatform/blueprints/compare/gitops-blueprint-v0.4.2...gitops-blueprint-v0.5.0) (2022-05-24) + + +### Features + +* gitops multirepo update ([#177](https://github.com/GoogleCloudPlatform/blueprints/issues/177)) ([ed6ed51](https://github.com/GoogleCloudPlatform/blueprints/commit/ed6ed51dbc4467141bc5f125836f534631333444)) + + +### Bug Fixes + +* add local-config annotations to kptfiles and functionConfigs ([#176](https://github.com/GoogleCloudPlatform/blueprints/issues/176)) ([0d005f0](https://github.com/GoogleCloudPlatform/blueprints/commit/0d005f0174d95d3aca1691e67deffa573c3e7db7)) +* remove gitops ConfigManagement syncRevision field ([#179](https://github.com/GoogleCloudPlatform/blueprints/issues/179)) ([783380c](https://github.com/GoogleCloudPlatform/blueprints/commit/783380ce4e6c3f21e9e90055b3a88bada0410154)) + ### [0.4.2](https://github.com/GoogleCloudPlatform/blueprints/compare/gitops-blueprint-v0.4.1...gitops-blueprint-v0.4.2) (2022-02-02) diff --git a/catalog/gitops/cloudbuild-iam.yaml b/catalog/gitops/cloudbuild-iam.yaml index 337acfd7..b521416c 100644 --- a/catalog/gitops/cloudbuild-iam.yaml +++ b/catalog/gitops/cloudbuild-iam.yaml @@ -18,7 +18,7 @@ metadata: name: deployment-repo-cloudbuild-write namespace: config-control # kpt-set: ${namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/gitops/v0.4.2 + cnrm.cloud.google.com/blueprint: cnrm/gitops/v0.5.0 cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} spec: resourceRef: @@ -37,7 +37,7 @@ metadata: name: source-repo-cloudbuild-read namespace: config-control # kpt-set: ${namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/gitops/v0.4.2 + cnrm.cloud.google.com/blueprint: cnrm/gitops/v0.5.0 cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} spec: resourceRef: diff --git a/catalog/gitops/configsync/configsync-iam.yaml b/catalog/gitops/configsync/configsync-iam.yaml index f71363dc..3c5a815d 100644 --- a/catalog/gitops/configsync/configsync-iam.yaml +++ b/catalog/gitops/configsync/configsync-iam.yaml @@ -19,7 +19,7 @@ metadata: name: sync-cluster-name # kpt-set: sync-${cluster-name} namespace: config-control # kpt-set: ${namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/gitops/configsync/v0.4.2 + cnrm.cloud.google.com/blueprint: cnrm/gitops/configsync/v0.5.0 cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} spec: displayName: sync-cluster-name # kpt-set: sync-${cluster-name} @@ -31,7 +31,7 @@ metadata: name: sync-cluster-name # kpt-set: sync-${cluster-name} namespace: config-control # kpt-set: ${namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/gitops/configsync/v0.4.2 + cnrm.cloud.google.com/blueprint: cnrm/gitops/configsync/v0.5.0 cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} spec: resourceRef: @@ -50,7 +50,7 @@ metadata: name: source-reader-sync-cluster-name-project-id # kpt-set: source-reader-sync-${cluster-name}-${project-id} namespace: config-control # kpt-set: ${namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/gitops/configsync/v0.4.2 + cnrm.cloud.google.com/blueprint: cnrm/gitops/configsync/v0.5.0 cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} spec: resourceRef: diff --git a/catalog/gitops/hydration-trigger.yaml b/catalog/gitops/hydration-trigger.yaml index c99161bd..b9a837b1 100644 --- a/catalog/gitops/hydration-trigger.yaml +++ b/catalog/gitops/hydration-trigger.yaml @@ -21,7 +21,7 @@ metadata: name: source-repo-cicd-trigger # kpt-set: ${source-repo}-cicd-trigger namespace: config-control # kpt-set: ${namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/gitops/v0.4.2 + cnrm.cloud.google.com/blueprint: cnrm/gitops/v0.5.0 cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} spec: build: diff --git a/catalog/gitops/services.yaml b/catalog/gitops/services.yaml index dae89fc0..8154e95a 100644 --- a/catalog/gitops/services.yaml +++ b/catalog/gitops/services.yaml @@ -17,7 +17,7 @@ metadata: name: sourcerepo.googleapis.com namespace: config-control # kpt-set: ${namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/gitops/v0.4.2 + cnrm.cloud.google.com/blueprint: cnrm/gitops/v0.5.0 cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} --- apiVersion: serviceusage.cnrm.cloud.google.com/v1beta1 @@ -26,5 +26,5 @@ metadata: name: cloudbuild.googleapis.com namespace: config-control # kpt-set: ${namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/gitops/v0.4.2 + cnrm.cloud.google.com/blueprint: cnrm/gitops/v0.5.0 cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} diff --git a/catalog/gitops/source-repositories.yaml b/catalog/gitops/source-repositories.yaml index d11510f5..d7a94eb8 100644 --- a/catalog/gitops/source-repositories.yaml +++ b/catalog/gitops/source-repositories.yaml @@ -17,7 +17,7 @@ metadata: name: source-repo # kpt-set: ${source-repo} namespace: config-control # kpt-set: ${namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/gitops/v0.4.2 + cnrm.cloud.google.com/blueprint: cnrm/gitops/v0.5.0 cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} --- apiVersion: sourcerepo.cnrm.cloud.google.com/v1beta1 @@ -26,5 +26,5 @@ metadata: name: deployment-repo # kpt-set: ${deployment-repo} namespace: config-control # kpt-set: ${namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/gitops/v0.4.2 + cnrm.cloud.google.com/blueprint: cnrm/gitops/v0.5.0 cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} diff --git a/catalog/gke-autopilot/CHANGELOG.md b/catalog/gke-autopilot/CHANGELOG.md index 31d22e97..5924f4af 100644 --- a/catalog/gke-autopilot/CHANGELOG.md +++ b/catalog/gke-autopilot/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +### [0.1.1](https://github.com/GoogleCloudPlatform/blueprints/compare/gke-autopilot-blueprint-v0.1.0...gke-autopilot-blueprint-v0.1.1) (2022-05-24) + + +### Bug Fixes + +* add local-config annotations to kptfiles and functionConfigs ([#176](https://github.com/GoogleCloudPlatform/blueprints/issues/176)) ([0d005f0](https://github.com/GoogleCloudPlatform/blueprints/commit/0d005f0174d95d3aca1691e67deffa573c3e7db7)) +* reduce setters ([#159](https://github.com/GoogleCloudPlatform/blueprints/issues/159)) ([91bc71d](https://github.com/GoogleCloudPlatform/blueprints/commit/91bc71dcc89801976f9049021a6e17628c0e00e9)) + ## [0.1.0](https://github.com/GoogleCloudPlatform/blueprints/compare/gke-autopilot-blueprint-v0.0.1...gke-autopilot-blueprint-v0.1.0) (2022-02-02) diff --git a/catalog/gke-autopilot/cluster/cluster.yaml b/catalog/gke-autopilot/cluster/cluster.yaml index 0f175ee4..3e882713 100644 --- a/catalog/gke-autopilot/cluster/cluster.yaml +++ b/catalog/gke-autopilot/cluster/cluster.yaml @@ -17,7 +17,7 @@ metadata: # kpt-merge: config-control/example-us-east4 name: example-us-east4 # kpt-set: ${cluster-name} namespace: config-control annotations: - cnrm.cloud.google.com/blueprint: cnrm/gke-autopilot/v0.1.0 + cnrm.cloud.google.com/blueprint: cnrm/gke-autopilot/v0.1.1 cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} # Remove the default node pool after bootstrapping. # Explcit node pool configuration allows for more isolation and makes it diff --git a/catalog/gke-autopilot/cluster/container-api.yaml b/catalog/gke-autopilot/cluster/container-api.yaml index e78a4ea1..df917805 100644 --- a/catalog/gke-autopilot/cluster/container-api.yaml +++ b/catalog/gke-autopilot/cluster/container-api.yaml @@ -19,7 +19,7 @@ metadata: # kpt-merge: projects/project-id-cluster-name-container name: project-id-cluster-name-container # kpt-set: ${project-id}-${cluster-name}-container namespace: config-control annotations: - cnrm.cloud.google.com/blueprint: cnrm/gke-autopilot/v0.1.0 + cnrm.cloud.google.com/blueprint: cnrm/gke-autopilot/v0.1.1 cnrm.cloud.google.com/deletion-policy: abandon cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} spec: diff --git a/catalog/gke/CHANGELOG.md b/catalog/gke/CHANGELOG.md index 155ec797..23adab6b 100644 --- a/catalog/gke/CHANGELOG.md +++ b/catalog/gke/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +### [0.4.1](https://github.com/GoogleCloudPlatform/blueprints/compare/gke-blueprint-v0.4.0...gke-blueprint-v0.4.1) (2022-05-24) + + +### Bug Fixes + +* add local-config annotations to kptfiles and functionConfigs ([#176](https://github.com/GoogleCloudPlatform/blueprints/issues/176)) ([0d005f0](https://github.com/GoogleCloudPlatform/blueprints/commit/0d005f0174d95d3aca1691e67deffa573c3e7db7)) +* reduce setters ([#158](https://github.com/GoogleCloudPlatform/blueprints/issues/158)) ([b020765](https://github.com/GoogleCloudPlatform/blueprints/commit/b020765de49640700347d74295616ea9fc4dd812)) + ## [0.4.0](https://www.github.com/GoogleCloudPlatform/blueprints/compare/gke-blueprint-v0.3.0...gke-blueprint-v0.4.0) (2021-12-22) diff --git a/catalog/gke/cluster/cluster.yaml b/catalog/gke/cluster/cluster.yaml index 22a338fe..384ca828 100644 --- a/catalog/gke/cluster/cluster.yaml +++ b/catalog/gke/cluster/cluster.yaml @@ -17,7 +17,7 @@ metadata: name: example-us-east4 # kpt-set: ${cluster-name} namespace: config-control annotations: - cnrm.cloud.google.com/blueprint: cnrm/gke:gke-cluster/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/gke:gke-cluster/v0.4.1 cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} # Remove the default node pool after bootstrapping. # Explcit node pool configuration allows for more isolation and makes it diff --git a/catalog/gke/cluster/container-api.yaml b/catalog/gke/cluster/container-api.yaml index b8aa7dd6..88953b96 100644 --- a/catalog/gke/cluster/container-api.yaml +++ b/catalog/gke/cluster/container-api.yaml @@ -19,7 +19,7 @@ metadata: name: project-id-cluster-name-container # kpt-set: ${project-id}-${cluster-name}-container namespace: config-control annotations: - cnrm.cloud.google.com/blueprint: cnrm/gke:gke-cluster/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/gke:gke-cluster/v0.4.1 cnrm.cloud.google.com/deletion-policy: abandon cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} spec: diff --git a/catalog/gke/nodepools/primary/node-iam.yaml b/catalog/gke/nodepools/primary/node-iam.yaml index df90548a..d982c660 100644 --- a/catalog/gke/nodepools/primary/node-iam.yaml +++ b/catalog/gke/nodepools/primary/node-iam.yaml @@ -18,7 +18,7 @@ metadata: name: gke-example-us-east4-primary # kpt-set: gke-${cluster-name}-${nodepool-name} namespace: config-control annotations: - cnrm.cloud.google.com/blueprint: cnrm/gke:gke-nodepool/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/gke:gke-nodepool/v0.4.1 cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} spec: displayName: gke-example-us-east4-primary # kpt-set: gke-${cluster-name}-${nodepool-name} @@ -30,7 +30,7 @@ metadata: name: logwriter-gke-example-us-east4-primary # kpt-set: logwriter-gke-${cluster-name}-${nodepool-name} namespace: config-control annotations: - cnrm.cloud.google.com/blueprint: cnrm/gke:gke-nodepool/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/gke:gke-nodepool/v0.4.1 spec: memberFrom: serviceAccountRef: @@ -49,7 +49,7 @@ metadata: name: metricwriter-gke-example-us-east4-primary # kpt-set: metricwriter-gke-${cluster-name}-${nodepool-name} namespace: config-control annotations: - cnrm.cloud.google.com/blueprint: cnrm/gke:gke-nodepool/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/gke:gke-nodepool/v0.4.1 spec: memberFrom: serviceAccountRef: @@ -68,7 +68,7 @@ metadata: name: artifactreader-gke-example-us-east4-primary # kpt-set: artifactreader-gke-${cluster-name}-${nodepool-name} namespace: config-control annotations: - cnrm.cloud.google.com/blueprint: cnrm/gke:gke-nodepool/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/gke:gke-nodepool/v0.4.1 spec: memberFrom: serviceAccountRef: diff --git a/catalog/gke/nodepools/primary/nodepool.yaml b/catalog/gke/nodepools/primary/nodepool.yaml index e9f0a189..5a26f04b 100644 --- a/catalog/gke/nodepools/primary/nodepool.yaml +++ b/catalog/gke/nodepools/primary/nodepool.yaml @@ -17,7 +17,7 @@ metadata: name: example-us-east4-primary # kpt-set: ${cluster-name}-${nodepool-name} namespace: config-control annotations: - cnrm.cloud.google.com/blueprint: cnrm/gke:gke-nodepool/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/gke:gke-nodepool/v0.4.1 cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} spec: autoscaling: diff --git a/catalog/hierarchy/CHANGELOG.md b/catalog/hierarchy/CHANGELOG.md new file mode 100644 index 00000000..99f0532f --- /dev/null +++ b/catalog/hierarchy/CHANGELOG.md @@ -0,0 +1,13 @@ +# Changelog + +## [0.4.0](https://github.com/GoogleCloudPlatform/blueprints/compare/hierarchy-blueprint-v0.3.0...hierarchy-blueprint-v0.4.0) (2022-05-24) + + +### Features + +* update hierarchy blueprint to use set-namespace instead of apply-setter and remove shared folders ([#168](https://github.com/GoogleCloudPlatform/blueprints/issues/168)) ([fa7e5b3](https://github.com/GoogleCloudPlatform/blueprints/commit/fa7e5b390afec2d619c9d94fb74397f924a428ce)) + + +### Bug Fixes + +* add local-config annotations to kptfiles and functionConfigs ([#176](https://github.com/GoogleCloudPlatform/blueprints/issues/176)) ([0d005f0](https://github.com/GoogleCloudPlatform/blueprints/commit/0d005f0174d95d3aca1691e67deffa573c3e7db7)) diff --git a/catalog/hierarchy/bu/hierarchy.yaml b/catalog/hierarchy/bu/hierarchy.yaml index af0b7b0d..f46e0df1 100644 --- a/catalog/hierarchy/bu/hierarchy.yaml +++ b/catalog/hierarchy/bu/hierarchy.yaml @@ -17,7 +17,7 @@ metadata: name: root-hierarchy namespace: hierarchy annotations: - cnrm.cloud.google.com/blueprint: 'cnrm/landing-zone:hierarchy:bu/v0.3.0' + cnrm.cloud.google.com/blueprint: 'cnrm/landing-zone:hierarchy:bu/v0.4.0' config.kubernetes.io/local-config: 'true' spec: config: diff --git a/catalog/hierarchy/env-bu/hierarchy.yaml b/catalog/hierarchy/env-bu/hierarchy.yaml index a7d7e447..cd7c5de5 100644 --- a/catalog/hierarchy/env-bu/hierarchy.yaml +++ b/catalog/hierarchy/env-bu/hierarchy.yaml @@ -17,7 +17,7 @@ metadata: name: root-hierarchy namespace: hierarchy annotations: - cnrm.cloud.google.com/blueprint: 'cnrm/landing-zone:hierarchy:env-bu/v0.3.0' + cnrm.cloud.google.com/blueprint: 'cnrm/landing-zone:hierarchy:env-bu/v0.4.0' config.kubernetes.io/local-config: 'true' spec: config: diff --git a/catalog/hierarchy/simple/hierarchy.yaml b/catalog/hierarchy/simple/hierarchy.yaml index 51c6080b..beff3018 100644 --- a/catalog/hierarchy/simple/hierarchy.yaml +++ b/catalog/hierarchy/simple/hierarchy.yaml @@ -17,7 +17,7 @@ metadata: name: root-hierarchy namespace: hierarchy annotations: - cnrm.cloud.google.com/blueprint: 'cnrm/landing-zone:hierarchy:simple/v0.3.0' + cnrm.cloud.google.com/blueprint: 'cnrm/landing-zone:hierarchy:simple/v0.4.0' config.kubernetes.io/local-config: 'true' spec: config: diff --git a/catalog/hierarchy/team/hierarchy.yaml b/catalog/hierarchy/team/hierarchy.yaml index b08aff55..1762e0f7 100644 --- a/catalog/hierarchy/team/hierarchy.yaml +++ b/catalog/hierarchy/team/hierarchy.yaml @@ -18,7 +18,7 @@ metadata: namespace: hierarchy annotations: config.kubernetes.io/local-config: 'true' - cnrm.cloud.google.com/blueprint: 'cnrm/landing-zone:hierarchy:team/v0.3.0' + cnrm.cloud.google.com/blueprint: 'cnrm/landing-zone:hierarchy:team/v0.4.0' spec: config: - retail: diff --git a/catalog/iam-foundation/CHANGELOG.md b/catalog/iam-foundation/CHANGELOG.md index 18086e50..26b4b3b4 100644 --- a/catalog/iam-foundation/CHANGELOG.md +++ b/catalog/iam-foundation/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [0.1.1](https://github.com/GoogleCloudPlatform/blueprints/compare/iam-foundation-blueprint-v0.1.0...iam-foundation-blueprint-v0.1.1) (2022-05-24) + + +### Bug Fixes + +* add local-config annotations to kptfiles and functionConfigs ([#176](https://github.com/GoogleCloudPlatform/blueprints/issues/176)) ([0d005f0](https://github.com/GoogleCloudPlatform/blueprints/commit/0d005f0174d95d3aca1691e67deffa573c3e7db7)) + ## [0.1.0](https://www.github.com/GoogleCloudPlatform/blueprints/compare/iam-foundation-blueprint-v0.0.1...iam-foundation-blueprint-v0.1.0) (2021-12-22) diff --git a/catalog/iam-foundation/devops.yaml b/catalog/iam-foundation/devops.yaml index 94144d1b..1ab1553a 100644 --- a/catalog/iam-foundation/devops.yaml +++ b/catalog/iam-foundation/devops.yaml @@ -16,7 +16,7 @@ kind: IAMPolicyMember metadata: name: foundation-devops-folders annotations: - cnrm.cloud.google.com/blueprint: cnrm/org-iam/v0.1.0 + cnrm.cloud.google.com/blueprint: cnrm/org-iam/v0.1.1 blueprints.cloud.google.com/description: This grants permissions to view folders. namespace: config-control spec: diff --git a/catalog/iam-foundation/networking.yaml b/catalog/iam-foundation/networking.yaml index aa8b5196..35929a91 100644 --- a/catalog/iam-foundation/networking.yaml +++ b/catalog/iam-foundation/networking.yaml @@ -16,7 +16,7 @@ kind: IAMPolicyMember metadata: name: network-admins-compute annotations: - cnrm.cloud.google.com/blueprint: cnrm/org-iam/v0.1.0 + cnrm.cloud.google.com/blueprint: cnrm/org-iam/v0.1.1 blueprints.cloud.google.com/description: This grants permissions to create, modify, and delete networking resources, except for firewall rules and SSL certificates. namespace: config-control spec: @@ -32,7 +32,7 @@ kind: IAMPolicyMember metadata: name: network-admins-shared-vpc annotations: - cnrm.cloud.google.com/blueprint: cnrm/org-iam/v0.1.0 + cnrm.cloud.google.com/blueprint: cnrm/org-iam/v0.1.1 blueprints.cloud.google.com/description: This grants permissions to administer Shared VPC host projects. namespace: config-control spec: @@ -48,7 +48,7 @@ kind: IAMPolicyMember metadata: name: network-admins-security annotations: - cnrm.cloud.google.com/blueprint: cnrm/org-iam/v0.1.0 + cnrm.cloud.google.com/blueprint: cnrm/org-iam/v0.1.1 blueprints.cloud.google.com/description: This grants permissions to create, modify, and delete firewall rules and SSL certificates. namespace: config-control spec: @@ -64,7 +64,7 @@ kind: IAMPolicyMember metadata: name: network-admins-folders annotations: - cnrm.cloud.google.com/blueprint: cnrm/org-iam/v0.1.0 + cnrm.cloud.google.com/blueprint: cnrm/org-iam/v0.1.1 blueprints.cloud.google.com/description: This grants permissions to view folders. namespace: config-control spec: diff --git a/catalog/iam-foundation/org.yaml b/catalog/iam-foundation/org.yaml index 7e66596e..e9dd0b43 100644 --- a/catalog/iam-foundation/org.yaml +++ b/catalog/iam-foundation/org.yaml @@ -16,7 +16,7 @@ kind: IAMPolicyMember metadata: name: foundation-org-admin annotations: - cnrm.cloud.google.com/blueprint: cnrm/org-iam/v0.1.0 + cnrm.cloud.google.com/blueprint: cnrm/org-iam/v0.1.1 blueprints.cloud.google.com/description: Access to administer all resources belonging to the organization. namespace: config-control spec: diff --git a/catalog/iam-foundation/security.yaml b/catalog/iam-foundation/security.yaml index de10012d..a79f063f 100644 --- a/catalog/iam-foundation/security.yaml +++ b/catalog/iam-foundation/security.yaml @@ -16,7 +16,7 @@ kind: IAMPolicyMember metadata: name: security-admins-org-policy annotations: - cnrm.cloud.google.com/blueprint: cnrm/org-iam/v0.1.0 + cnrm.cloud.google.com/blueprint: cnrm/org-iam/v0.1.1 blueprints.cloud.google.com/description: This grants permission to set organizational policy constraints. namespace: config-control spec: @@ -32,7 +32,7 @@ kind: IAMPolicyMember metadata: name: security-admins-security-reviewer annotations: - cnrm.cloud.google.com/blueprint: cnrm/org-iam/v0.1.0 + cnrm.cloud.google.com/blueprint: cnrm/org-iam/v0.1.1 blueprints.cloud.google.com/description: This grants permissions to view all resources for the organization, and to view the IAM policies that apply to them. namespace: config-control spec: @@ -48,7 +48,7 @@ kind: IAMPolicyMember metadata: name: security-admins-custom-roles annotations: - cnrm.cloud.google.com/blueprint: cnrm/org-iam/v0.1.0 + cnrm.cloud.google.com/blueprint: cnrm/org-iam/v0.1.1 blueprints.cloud.google.com/description: This grants permissions to view all custom IAM roles in the organization, and to view the projects that they apply to. namespace: config-control spec: @@ -64,7 +64,7 @@ kind: IAMPolicyMember metadata: name: security-admins-scc annotations: - cnrm.cloud.google.com/blueprint: cnrm/org-iam/v0.1.0 + cnrm.cloud.google.com/blueprint: cnrm/org-iam/v0.1.1 blueprints.cloud.google.com/description: This grants administrator access to the Security Command Center. namespace: config-control spec: @@ -80,7 +80,7 @@ kind: IAMPolicyMember metadata: name: security-admins-folder-iam annotations: - cnrm.cloud.google.com/blueprint: cnrm/org-iam/v0.1.0 + cnrm.cloud.google.com/blueprint: cnrm/org-iam/v0.1.1 blueprints.cloud.google.com/description: This grants permissions to set folder-level IAM policies. namespace: config-control spec: @@ -96,7 +96,7 @@ kind: IAMPolicyMember metadata: name: security-admins-private-logs annotations: - cnrm.cloud.google.com/blueprint: cnrm/org-iam/v0.1.0 + cnrm.cloud.google.com/blueprint: cnrm/org-iam/v0.1.1 blueprints.cloud.google.com/description: This grants read-only access to Cloud Logging features, including the ability to read private logs. namespace: config-control spec: @@ -112,7 +112,7 @@ kind: IAMPolicyMember metadata: name: security-admins-log-config annotations: - cnrm.cloud.google.com/blueprint: cnrm/org-iam/v0.1.0 + cnrm.cloud.google.com/blueprint: cnrm/org-iam/v0.1.1 blueprints.cloud.google.com/description: This grants permissions to create logs-based metrics and export sinks. namespace: config-control spec: @@ -128,7 +128,7 @@ kind: IAMPolicyMember metadata: name: security-admins-gke annotations: - cnrm.cloud.google.com/blueprint: cnrm/org-iam/v0.1.0 + cnrm.cloud.google.com/blueprint: cnrm/org-iam/v0.1.1 blueprints.cloud.google.com/description: This grants read-only access to Google Kubernetes Engine resources. namespace: config-control spec: @@ -144,7 +144,7 @@ kind: IAMPolicyMember metadata: name: security-admins-gce annotations: - cnrm.cloud.google.com/blueprint: cnrm/org-iam/v0.1.0 + cnrm.cloud.google.com/blueprint: cnrm/org-iam/v0.1.1 blueprints.cloud.google.com/description: This grants read-only access to Compute Engine resources. namespace: config-control spec: @@ -160,7 +160,7 @@ kind: IAMPolicyMember metadata: name: security-admins-bq annotations: - cnrm.cloud.google.com/blueprint: cnrm/org-iam/v0.1.0 + cnrm.cloud.google.com/blueprint: cnrm/org-iam/v0.1.1 blueprints.cloud.google.com/description: This grants read-only access to BigQuery datasets. namespace: config-control spec: diff --git a/catalog/landing-zone-lite/CHANGELOG.md b/catalog/landing-zone-lite/CHANGELOG.md index 2b9d7913..e33d9d73 100644 --- a/catalog/landing-zone-lite/CHANGELOG.md +++ b/catalog/landing-zone-lite/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [0.1.1](https://github.com/GoogleCloudPlatform/blueprints/compare/landing-zone-lite-blueprint-v0.1.0...landing-zone-lite-blueprint-v0.1.1) (2022-05-24) + + +### Bug Fixes + +* add local-config annotations to kptfiles and functionConfigs ([#176](https://github.com/GoogleCloudPlatform/blueprints/issues/176)) ([0d005f0](https://github.com/GoogleCloudPlatform/blueprints/commit/0d005f0174d95d3aca1691e67deffa573c3e7db7)) + ## [0.1.0](https://www.github.com/GoogleCloudPlatform/blueprints/compare/landing-zone-lite-blueprint-v0.0.1...landing-zone-lite-blueprint-v0.1.0) (2021-12-23) ### Features diff --git a/catalog/landing-zone-lite/iam.yaml b/catalog/landing-zone-lite/iam.yaml index 31fdc1dd..b00030b4 100644 --- a/catalog/landing-zone-lite/iam.yaml +++ b/catalog/landing-zone-lite/iam.yaml @@ -17,7 +17,7 @@ metadata: name: org-admins-iam namespace: config-control # kpt-set: ${management-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone-lite/v0.1.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone-lite/v0.1.1 spec: resourceRef: apiVersion: resourcemanager.cnrm.cloud.google.com/v1beta1 @@ -32,7 +32,7 @@ metadata: name: billing-admins-iam namespace: config-control # kpt-set: ${management-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone-lite/v0.1.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone-lite/v0.1.1 spec: resourceRef: apiVersion: resourcemanager.cnrm.cloud.google.com/v1beta1 diff --git a/catalog/landing-zone-lite/namespaces/hierarchy.yaml b/catalog/landing-zone-lite/namespaces/hierarchy.yaml index 714991b1..b5fdc0d7 100644 --- a/catalog/landing-zone-lite/namespaces/hierarchy.yaml +++ b/catalog/landing-zone-lite/namespaces/hierarchy.yaml @@ -17,7 +17,7 @@ metadata: name: hierarchy-sa namespace: config-control # kpt-set: ${management-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone-lite/v0.1.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone-lite/v0.1.1 cnrm.cloud.google.com/project-id: management-project-id # kpt-set: ${management-project-id} cnrm.cloud.google.com/ignore-clusterless: "true" spec: @@ -29,7 +29,7 @@ metadata: name: hierarchy-sa-folderadmin-permissions namespace: config-control # kpt-set: ${management-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone-lite/v0.1.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone-lite/v0.1.1 cnrm.cloud.google.com/project-id: management-project-id # kpt-set: ${management-project-id} cnrm.cloud.google.com/ignore-clusterless: "true" spec: @@ -46,7 +46,7 @@ metadata: name: hierarchy-sa-workload-identity-binding namespace: config-control # kpt-set: ${management-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone-lite/v0.1.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone-lite/v0.1.1 cnrm.cloud.google.com/project-id: management-project-id # kpt-set: ${management-project-id} cnrm.cloud.google.com/ignore-clusterless: "true" spec: @@ -89,7 +89,7 @@ metadata: name: configconnectorcontext.core.cnrm.cloud.google.com namespace: hierarchy annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone-lite/v0.1.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone-lite/v0.1.1 cnrm.cloud.google.com/ignore-clusterless: "true" spec: googleServiceAccount: hierarchy-sa@management-project-id.iam.gserviceaccount.com # kpt-set: hierarchy-sa@${management-project-id}.iam.gserviceaccount.com diff --git a/catalog/landing-zone-lite/namespaces/projects.yaml b/catalog/landing-zone-lite/namespaces/projects.yaml index 88ffd0bd..a38c3ce2 100644 --- a/catalog/landing-zone-lite/namespaces/projects.yaml +++ b/catalog/landing-zone-lite/namespaces/projects.yaml @@ -17,7 +17,7 @@ metadata: name: projects-sa namespace: config-control # kpt-set: ${management-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone-lite/v0.1.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone-lite/v0.1.1 cnrm.cloud.google.com/project-id: management-project-id # kpt-set: ${management-project-id} cnrm.cloud.google.com/ignore-clusterless: "true" spec: @@ -29,7 +29,7 @@ metadata: name: projects-sa-projectiamadmin-permissions namespace: config-control # kpt-set: ${management-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone-lite/v0.1.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone-lite/v0.1.1 cnrm.cloud.google.com/project-id: management-project-id # kpt-set: ${management-project-id} cnrm.cloud.google.com/ignore-clusterless: "true" spec: @@ -46,7 +46,7 @@ metadata: name: projects-sa-projectcreator-permissions namespace: config-control # kpt-set: ${management-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone-lite/v0.1.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone-lite/v0.1.1 cnrm.cloud.google.com/project-id: management-project-id # kpt-set: ${management-project-id} cnrm.cloud.google.com/ignore-clusterless: "true" spec: @@ -63,7 +63,7 @@ metadata: name: projects-sa-projectmover-permissions namespace: config-control # kpt-set: ${management-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone-lite/v0.1.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone-lite/v0.1.1 cnrm.cloud.google.com/project-id: management-project-id # kpt-set: ${management-project-id} cnrm.cloud.google.com/ignore-clusterless: "true" spec: @@ -80,7 +80,7 @@ metadata: name: projects-sa-projectdeleter-permissions namespace: config-control # kpt-set: ${management-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone-lite/v0.1.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone-lite/v0.1.1 cnrm.cloud.google.com/project-id: management-project-id # kpt-set: ${management-project-id} cnrm.cloud.google.com/ignore-clusterless: "true" spec: @@ -97,7 +97,7 @@ metadata: name: projects-sa-billinguser-permissions namespace: config-control # kpt-set: ${management-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone-lite/v0.1.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone-lite/v0.1.1 cnrm.cloud.google.com/project-id: management-project-id # kpt-set: ${management-project-id} cnrm.cloud.google.com/ignore-clusterless: "true" spec: @@ -114,7 +114,7 @@ metadata: name: projects-sa-serviceusageadmin-permissions namespace: config-control # kpt-set: ${management-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone-lite/v0.1.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone-lite/v0.1.1 cnrm.cloud.google.com/project-id: management-project-id # kpt-set: ${management-project-id} cnrm.cloud.google.com/ignore-clusterless: "true" spec: @@ -131,7 +131,7 @@ metadata: name: projects-sa-workload-identity-binding namespace: config-control # kpt-set: ${management-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone-lite/v0.1.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone-lite/v0.1.1 cnrm.cloud.google.com/project-id: management-project-id # kpt-set: ${management-project-id} cnrm.cloud.google.com/ignore-clusterless: "true" spec: diff --git a/catalog/landing-zone-lite/services.yaml b/catalog/landing-zone-lite/services.yaml index 8f86dab7..5e1854c4 100644 --- a/catalog/landing-zone-lite/services.yaml +++ b/catalog/landing-zone-lite/services.yaml @@ -17,7 +17,7 @@ metadata: name: management-project-id # kpt-set: ${management-project-id} namespace: config-control # kpt-set: ${management-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone-lite/v0.1.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone-lite/v0.1.1 cnrm.cloud.google.com/deletion-policy: "abandon" config.kubernetes.io/local-config: "true" spec: diff --git a/catalog/landing-zone/CHANGELOG.md b/catalog/landing-zone/CHANGELOG.md index c1a2491f..37ed52f4 100644 --- a/catalog/landing-zone/CHANGELOG.md +++ b/catalog/landing-zone/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +### [0.5.1](https://github.com/GoogleCloudPlatform/blueprints/compare/landing-zone-blueprint-v0.5.0...landing-zone-blueprint-v0.5.1) (2022-05-24) + + +### Bug Fixes + +* Add 'ignore-clusterless' annotations to resources that are irrelevant to clusterless actuation mode (when a GKE cluster is not involved) ([#164](https://github.com/GoogleCloudPlatform/blueprints/issues/164)) ([84fa763](https://github.com/GoogleCloudPlatform/blueprints/commit/84fa76359253eca234ab5664a97c62dc88b1a860)) +* add local-config annotations to kptfiles and functionConfigs ([#176](https://github.com/GoogleCloudPlatform/blueprints/issues/176)) ([0d005f0](https://github.com/GoogleCloudPlatform/blueprints/commit/0d005f0174d95d3aca1691e67deffa573c3e7db7)) +* ignore namespace IAM resources in clusterless mode ([#170](https://github.com/GoogleCloudPlatform/blueprints/issues/170)) ([4a298ad](https://github.com/GoogleCloudPlatform/blueprints/commit/4a298addae80b239b8a298bf6a057a242470a081)) + ## [0.5.0](https://www.github.com/GoogleCloudPlatform/blueprints/compare/landing-zone-blueprint-v0.4.0...landing-zone-blueprint-v0.5.0) (2021-12-22) diff --git a/catalog/landing-zone/iam.yaml b/catalog/landing-zone/iam.yaml index a2199783..43f41517 100644 --- a/catalog/landing-zone/iam.yaml +++ b/catalog/landing-zone/iam.yaml @@ -17,7 +17,7 @@ metadata: name: org-admins-iam namespace: config-control # kpt-set: ${management-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.1 spec: resourceRef: apiVersion: resourcemanager.cnrm.cloud.google.com/v1beta1 @@ -32,7 +32,7 @@ metadata: name: billing-admins-iam namespace: config-control # kpt-set: ${management-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.1 spec: resourceRef: apiVersion: resourcemanager.cnrm.cloud.google.com/v1beta1 diff --git a/catalog/landing-zone/namespaces/hierarchy.yaml b/catalog/landing-zone/namespaces/hierarchy.yaml index b782f15e..3dde55d4 100644 --- a/catalog/landing-zone/namespaces/hierarchy.yaml +++ b/catalog/landing-zone/namespaces/hierarchy.yaml @@ -17,7 +17,7 @@ metadata: name: hierarchy-sa namespace: config-control # kpt-set: ${management-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.1 cnrm.cloud.google.com/project-id: management-project-id # kpt-set: ${management-project-id} cnrm.cloud.google.com/ignore-clusterless: "true" spec: @@ -29,7 +29,7 @@ metadata: name: hierarchy-sa-folderadmin-permissions namespace: config-control # kpt-set: ${management-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.1 cnrm.cloud.google.com/project-id: management-project-id # kpt-set: ${management-project-id} cnrm.cloud.google.com/ignore-clusterless: "true" spec: @@ -46,7 +46,7 @@ metadata: name: hierarchy-sa-workload-identity-binding namespace: config-control # kpt-set: ${management-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.1 cnrm.cloud.google.com/project-id: management-project-id # kpt-set: ${management-project-id} cnrm.cloud.google.com/ignore-clusterless: "true" spec: @@ -89,7 +89,7 @@ metadata: name: configconnectorcontext.core.cnrm.cloud.google.com namespace: hierarchy annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.1 cnrm.cloud.google.com/ignore-clusterless: "true" spec: googleServiceAccount: hierarchy-sa@management-project-id.iam.gserviceaccount.com # kpt-set: hierarchy-sa@${management-project-id}.iam.gserviceaccount.com diff --git a/catalog/landing-zone/namespaces/logging.yaml b/catalog/landing-zone/namespaces/logging.yaml index 6e3d8adf..a4feb774 100644 --- a/catalog/landing-zone/namespaces/logging.yaml +++ b/catalog/landing-zone/namespaces/logging.yaml @@ -25,7 +25,7 @@ metadata: name: configconnectorcontext.core.cnrm.cloud.google.com namespace: logging annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.1 cnrm.cloud.google.com/ignore-clusterless: "true" spec: googleServiceAccount: logging-sa@management-project-id.iam.gserviceaccount.com # kpt-set: logging-sa@${management-project-id}.iam.gserviceaccount.com @@ -36,7 +36,7 @@ metadata: name: logging-sa namespace: config-control # kpt-set: ${management-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.1 cnrm.cloud.google.com/project-id: management-project-id # kpt-set: ${management-project-id} cnrm.cloud.google.com/ignore-clusterless: "true" spec: @@ -48,7 +48,7 @@ metadata: name: logging-sa-logadmin-permissions namespace: config-control # kpt-set: ${management-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.1 cnrm.cloud.google.com/project-id: management-project-id # kpt-set: ${management-project-id} cnrm.cloud.google.com/ignore-clusterless: "true" spec: @@ -65,7 +65,7 @@ metadata: name: logging-sa-bigqueryadmin-permissions namespace: config-control # kpt-set: ${management-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.1 cnrm.cloud.google.com/project-id: management-project-id # kpt-set: ${management-project-id} cnrm.cloud.google.com/ignore-clusterless: "true" spec: @@ -82,7 +82,7 @@ metadata: name: logging-sa-workload-identity-binding namespace: config-control # kpt-set: ${management-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.1 cnrm.cloud.google.com/project-id: management-project-id # kpt-set: ${management-project-id} cnrm.cloud.google.com/ignore-clusterless: "true" spec: diff --git a/catalog/landing-zone/namespaces/networking.yaml b/catalog/landing-zone/namespaces/networking.yaml index 0e058059..bdb507ab 100644 --- a/catalog/landing-zone/namespaces/networking.yaml +++ b/catalog/landing-zone/namespaces/networking.yaml @@ -17,7 +17,7 @@ metadata: name: networking-sa namespace: config-control # kpt-set: ${management-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.1 cnrm.cloud.google.com/project-id: management-project-id # kpt-set: ${management-project-id} cnrm.cloud.google.com/ignore-clusterless: "true" spec: @@ -29,7 +29,7 @@ metadata: name: networking-sa-networkadmin-permissions namespace: config-control # kpt-set: ${management-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.1 cnrm.cloud.google.com/project-id: management-project-id # kpt-set: ${management-project-id} cnrm.cloud.google.com/ignore-clusterless: "true" spec: @@ -46,7 +46,7 @@ metadata: name: networking-sa-security-permissions namespace: config-control # kpt-set: ${management-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.1 cnrm.cloud.google.com/project-id: management-project-id # kpt-set: ${management-project-id} cnrm.cloud.google.com/ignore-clusterless: "true" spec: @@ -63,7 +63,7 @@ metadata: name: networking-sa-dns-permissions namespace: config-control # kpt-set: ${management-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.1 cnrm.cloud.google.com/project-id: management-project-id # kpt-set: ${management-project-id} cnrm.cloud.google.com/ignore-clusterless: "true" spec: @@ -80,7 +80,7 @@ metadata: name: networking-sa-service-control-permissions namespace: config-control # kpt-set: ${management-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.1 cnrm.cloud.google.com/project-id: management-project-id # kpt-set: ${management-project-id} cnrm.cloud.google.com/ignore-clusterless: "true" spec: @@ -97,7 +97,7 @@ metadata: name: networking-sa-xpnadmin-permissions namespace: config-control # kpt-set: ${management-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.1 cnrm.cloud.google.com/project-id: management-project-id # kpt-set: ${management-project-id} cnrm.cloud.google.com/ignore-clusterless: "true" spec: @@ -114,7 +114,7 @@ metadata: name: networking-sa-workload-identity-binding namespace: config-control # kpt-set: ${management-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.1 cnrm.cloud.google.com/project-id: management-project-id # kpt-set: ${management-project-id} cnrm.cloud.google.com/ignore-clusterless: "true" spec: @@ -157,7 +157,7 @@ metadata: name: configconnectorcontext.core.cnrm.cloud.google.com namespace: networking annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.1 cnrm.cloud.google.com/ignore-clusterless: "true" spec: googleServiceAccount: networking-sa@management-project-id.iam.gserviceaccount.com # kpt-set: networking-sa@${management-project-id}.iam.gserviceaccount.com diff --git a/catalog/landing-zone/namespaces/policies.yaml b/catalog/landing-zone/namespaces/policies.yaml index ebcd4ed6..ff17f967 100644 --- a/catalog/landing-zone/namespaces/policies.yaml +++ b/catalog/landing-zone/namespaces/policies.yaml @@ -17,7 +17,7 @@ metadata: name: policies-sa namespace: config-control # kpt-set: ${management-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.1 cnrm.cloud.google.com/project-id: management-project-id # kpt-set: ${management-project-id} cnrm.cloud.google.com/ignore-clusterless: "true" spec: @@ -29,7 +29,7 @@ metadata: name: policies-sa-orgpolicyadmin-permissions namespace: config-control # kpt-set: ${management-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.1 cnrm.cloud.google.com/project-id: management-project-id # kpt-set: ${management-project-id} cnrm.cloud.google.com/ignore-clusterless: "true" spec: @@ -46,7 +46,7 @@ metadata: name: policies-sa-workload-identity-binding namespace: config-control # kpt-set: ${management-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.1 cnrm.cloud.google.com/project-id: management-project-id # kpt-set: ${management-project-id} cnrm.cloud.google.com/ignore-clusterless: "true" spec: @@ -73,7 +73,7 @@ metadata: name: configconnectorcontext.core.cnrm.cloud.google.com namespace: policies annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.1 cnrm.cloud.google.com/ignore-clusterless: "true" spec: googleServiceAccount: policies-sa@management-project-id.iam.gserviceaccount.com # kpt-set: policies-sa@${management-project-id}.iam.gserviceaccount.com diff --git a/catalog/landing-zone/namespaces/projects.yaml b/catalog/landing-zone/namespaces/projects.yaml index 49ec8fe6..1a6493ed 100644 --- a/catalog/landing-zone/namespaces/projects.yaml +++ b/catalog/landing-zone/namespaces/projects.yaml @@ -17,7 +17,7 @@ metadata: name: projects-sa namespace: config-control # kpt-set: ${management-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.1 cnrm.cloud.google.com/project-id: management-project-id # kpt-set: ${management-project-id} cnrm.cloud.google.com/ignore-clusterless: "true" spec: @@ -29,7 +29,7 @@ metadata: name: projects-sa-projectiamadmin-permissions namespace: config-control # kpt-set: ${management-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.1 cnrm.cloud.google.com/project-id: management-project-id # kpt-set: ${management-project-id} cnrm.cloud.google.com/ignore-clusterless: "true" spec: @@ -46,7 +46,7 @@ metadata: name: projects-sa-projectcreator-permissions namespace: config-control # kpt-set: ${management-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.1 cnrm.cloud.google.com/project-id: management-project-id # kpt-set: ${management-project-id} cnrm.cloud.google.com/ignore-clusterless: "true" spec: @@ -63,7 +63,7 @@ metadata: name: projects-sa-projectmover-permissions namespace: config-control # kpt-set: ${management-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.1 cnrm.cloud.google.com/project-id: management-project-id # kpt-set: ${management-project-id} cnrm.cloud.google.com/ignore-clusterless: "true" spec: @@ -80,7 +80,7 @@ metadata: name: projects-sa-projectdeleter-permissions namespace: config-control # kpt-set: ${management-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.1 cnrm.cloud.google.com/project-id: management-project-id # kpt-set: ${management-project-id} cnrm.cloud.google.com/ignore-clusterless: "true" spec: @@ -97,7 +97,7 @@ metadata: name: projects-sa-billinguser-permissions namespace: config-control # kpt-set: ${management-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.1 cnrm.cloud.google.com/project-id: management-project-id # kpt-set: ${management-project-id} cnrm.cloud.google.com/ignore-clusterless: "true" spec: @@ -114,7 +114,7 @@ metadata: name: projects-sa-serviceusageadmin-permissions namespace: config-control # kpt-set: ${management-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.1 cnrm.cloud.google.com/project-id: management-project-id # kpt-set: ${management-project-id} cnrm.cloud.google.com/ignore-clusterless: "true" spec: @@ -131,7 +131,7 @@ metadata: name: projects-sa-workload-identity-binding namespace: config-control # kpt-set: ${management-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.1 cnrm.cloud.google.com/project-id: management-project-id # kpt-set: ${management-project-id} cnrm.cloud.google.com/ignore-clusterless: "true" spec: diff --git a/catalog/landing-zone/policies/disable-guest-attributes.yaml b/catalog/landing-zone/policies/disable-guest-attributes.yaml index bc7c2d6f..e03f3144 100644 --- a/catalog/landing-zone/policies/disable-guest-attributes.yaml +++ b/catalog/landing-zone/policies/disable-guest-attributes.yaml @@ -17,7 +17,7 @@ metadata: name: disable-guest-attributes namespace: policies annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.1 spec: booleanPolicy: enforced: true diff --git a/catalog/landing-zone/policies/disable-iam-grants-default-sa.yaml b/catalog/landing-zone/policies/disable-iam-grants-default-sa.yaml index 6a2c5999..e2af8457 100644 --- a/catalog/landing-zone/policies/disable-iam-grants-default-sa.yaml +++ b/catalog/landing-zone/policies/disable-iam-grants-default-sa.yaml @@ -17,7 +17,7 @@ metadata: name: disable-iam-grants-default-sa namespace: policies annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.1 spec: booleanPolicy: enforced: true diff --git a/catalog/landing-zone/policies/disable-nested-virtualization.yaml b/catalog/landing-zone/policies/disable-nested-virtualization.yaml index d3b4d6c5..8bea6f27 100644 --- a/catalog/landing-zone/policies/disable-nested-virtualization.yaml +++ b/catalog/landing-zone/policies/disable-nested-virtualization.yaml @@ -17,7 +17,7 @@ metadata: name: disable-nested-virtualization namespace: policies annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.1 spec: booleanPolicy: enforced: true diff --git a/catalog/landing-zone/policies/disable-sa-key-creation.yaml b/catalog/landing-zone/policies/disable-sa-key-creation.yaml index 1e34ed1f..ea38d3b8 100644 --- a/catalog/landing-zone/policies/disable-sa-key-creation.yaml +++ b/catalog/landing-zone/policies/disable-sa-key-creation.yaml @@ -17,7 +17,7 @@ metadata: name: disable-sa-key-creation namespace: policies annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.1 spec: booleanPolicy: enforced: true diff --git a/catalog/landing-zone/policies/disable-serial-port.yaml b/catalog/landing-zone/policies/disable-serial-port.yaml index c298d49c..a37be2e5 100644 --- a/catalog/landing-zone/policies/disable-serial-port.yaml +++ b/catalog/landing-zone/policies/disable-serial-port.yaml @@ -17,7 +17,7 @@ metadata: name: disable-serial-port namespace: policies annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.1 spec: booleanPolicy: enforced: true diff --git a/catalog/landing-zone/policies/disable-vm-external-ip.yaml b/catalog/landing-zone/policies/disable-vm-external-ip.yaml index f772f7d8..bab5c4dd 100644 --- a/catalog/landing-zone/policies/disable-vm-external-ip.yaml +++ b/catalog/landing-zone/policies/disable-vm-external-ip.yaml @@ -17,7 +17,7 @@ metadata: name: disable-vm-external-ip namespace: policies annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.1 spec: constraint: "constraints/compute.vmExternalIpAccess" listPolicy: diff --git a/catalog/landing-zone/policies/enforce-uniform-bucket-lvl-access.yaml b/catalog/landing-zone/policies/enforce-uniform-bucket-lvl-access.yaml index 6c7bc42c..d088e33c 100644 --- a/catalog/landing-zone/policies/enforce-uniform-bucket-lvl-access.yaml +++ b/catalog/landing-zone/policies/enforce-uniform-bucket-lvl-access.yaml @@ -17,7 +17,7 @@ metadata: name: enforce-uniform-bucket-lvl-access namespace: policies annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.1 spec: booleanPolicy: enforced: true diff --git a/catalog/landing-zone/policies/restrict-cloud-sql-public-ip.yaml b/catalog/landing-zone/policies/restrict-cloud-sql-public-ip.yaml index 49bd947d..29f99a11 100644 --- a/catalog/landing-zone/policies/restrict-cloud-sql-public-ip.yaml +++ b/catalog/landing-zone/policies/restrict-cloud-sql-public-ip.yaml @@ -17,7 +17,7 @@ metadata: name: restrict-cloud-sql-public-ip namespace: policies annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.1 spec: booleanPolicy: enforced: true diff --git a/catalog/landing-zone/policies/restrict-lien-removal.yaml b/catalog/landing-zone/policies/restrict-lien-removal.yaml index 0444a45e..9a0848ee 100644 --- a/catalog/landing-zone/policies/restrict-lien-removal.yaml +++ b/catalog/landing-zone/policies/restrict-lien-removal.yaml @@ -17,7 +17,7 @@ metadata: name: restrict-lien-removal namespace: policies annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.1 spec: booleanPolicy: enforced: true diff --git a/catalog/landing-zone/policies/skip-default-network.yaml b/catalog/landing-zone/policies/skip-default-network.yaml index f2b92d57..c902592b 100644 --- a/catalog/landing-zone/policies/skip-default-network.yaml +++ b/catalog/landing-zone/policies/skip-default-network.yaml @@ -17,7 +17,7 @@ metadata: name: skip-default-network namespace: policies annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone/v0.5.1 spec: booleanPolicy: enforced: true diff --git a/catalog/landing-zone/services.yaml b/catalog/landing-zone/services.yaml index d9f3d27c..13096caf 100644 --- a/catalog/landing-zone/services.yaml +++ b/catalog/landing-zone/services.yaml @@ -17,7 +17,7 @@ metadata: name: management-project-id # kpt-set: ${management-project-id} namespace: config-control # kpt-set: ${management-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone-lite/v0.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone-lite/v0.5.1 cnrm.cloud.google.com/deletion-policy: "abandon" config.kubernetes.io/local-config: true spec: diff --git a/catalog/log-export/CHANGELOG.md b/catalog/log-export/CHANGELOG.md index ff50e06e..2024ef4b 100644 --- a/catalog/log-export/CHANGELOG.md +++ b/catalog/log-export/CHANGELOG.md @@ -1,5 +1,25 @@ # Changelog +## [0.5.0](https://github.com/GoogleCloudPlatform/blueprints/compare/log-export-blueprint-v0.4.0...log-export-blueprint-v0.5.0) (2022-05-24) + + +### ⚠ BREAKING CHANGES + +* replace bucket policy in storage log export with uniform bucket level access + +### Features + +* add one year retention policy to log export buckets ([#181](https://github.com/GoogleCloudPlatform/blueprints/issues/181)) ([c1ddf5e](https://github.com/GoogleCloudPlatform/blueprints/commit/c1ddf5efcc0cdb6b80b734c32f60501f55c703a4)) + + +### Bug Fixes + +* add local-config annotations to kptfiles and functionConfigs ([#176](https://github.com/GoogleCloudPlatform/blueprints/issues/176)) ([0d005f0](https://github.com/GoogleCloudPlatform/blueprints/commit/0d005f0174d95d3aca1691e67deffa573c3e7db7)) +* add missing project-ids to log-export resources ([#186](https://github.com/GoogleCloudPlatform/blueprints/issues/186)) ([4faea47](https://github.com/GoogleCloudPlatform/blueprints/commit/4faea47cefc8d4a7c966fde76de0a4e6b6260d2d)) +* add project-id anno to log-export resources ([#182](https://github.com/GoogleCloudPlatform/blueprints/issues/182)) ([15a753b](https://github.com/GoogleCloudPlatform/blueprints/commit/15a753b9bcc961d7310428ee96c61190454144e3)) +* add setters for retention period in log bucket ([#185](https://github.com/GoogleCloudPlatform/blueprints/issues/185)) ([15a7eb0](https://github.com/GoogleCloudPlatform/blueprints/commit/15a7eb050cf9b5cb7d6dd88b815a3fc112bd80aa)) +* replace bucket policy in storage log export with uniform bucket level access ([2b288c2](https://github.com/GoogleCloudPlatform/blueprints/commit/2b288c2c1ce534dcdd221b98da690102eaf0e8c2)) + ## [0.4.0](https://www.github.com/GoogleCloudPlatform/blueprints/compare/log-export-blueprint-v0.3.0...log-export-blueprint-v0.4.0) (2021-09-14) diff --git a/catalog/log-export/folder/bigquery-export/export.yaml b/catalog/log-export/folder/bigquery-export/export.yaml index 9810045a..bcf9ea45 100644 --- a/catalog/log-export/folder/bigquery-export/export.yaml +++ b/catalog/log-export/folder/bigquery-export/export.yaml @@ -18,7 +18,7 @@ metadata: name: my-project-id-bigquery # kpt-set: ${project-id}-bigquery namespace: projects annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.5.0 cnrm.cloud.google.com/deletion-policy: abandon cnrm.cloud.google.com/disable-dependent-services: "false" cnrm.cloud.google.com/project-id: my-project-id # kpt-set: ${project-id} @@ -32,7 +32,7 @@ metadata: name: my.folder.k8s.name-bqsink # kpt-set: ${folder-k8s-name}-bqsink namespace: my-namespace # kpt-set: ${namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.5.0 spec: destination: bigQueryDatasetRef: @@ -49,7 +49,7 @@ metadata: name: bqlogexportdataset namespace: my-namespace # kpt-set: ${namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.5.0 cnrm.cloud.google.com/delete-contents-on-destroy: "false" # kpt-set: ${delete-contents-on-destroy} cnrm.cloud.google.com/project-id: my-project-id # kpt-set: ${project-id} spec: diff --git a/catalog/log-export/folder/bigquery-export/iam.yaml b/catalog/log-export/folder/bigquery-export/iam.yaml index f513f76a..48dd1826 100644 --- a/catalog/log-export/folder/bigquery-export/iam.yaml +++ b/catalog/log-export/folder/bigquery-export/iam.yaml @@ -18,7 +18,7 @@ metadata: name: bq-project-iam-policy namespace: my-namespace # kpt-set: ${namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.5.0 spec: memberFrom: logSinkRef: diff --git a/catalog/log-export/folder/pubsub-export/export.yaml b/catalog/log-export/folder/pubsub-export/export.yaml index e24f6a65..6b5b5ee2 100644 --- a/catalog/log-export/folder/pubsub-export/export.yaml +++ b/catalog/log-export/folder/pubsub-export/export.yaml @@ -18,7 +18,7 @@ metadata: name: my-project-id-pubsub # kpt-set: ${project-id}-pubsub namespace: projects annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.5.0 cnrm.cloud.google.com/deletion-policy: "abandon" cnrm.cloud.google.com/disable-dependent-services: "false" cnrm.cloud.google.com/project-id: my-project-id # kpt-set: ${project-id} @@ -32,7 +32,7 @@ metadata: name: my.folder.k8s.name-pubsubsink # kpt-set: ${folder-k8s-name}-pubsubsink namespace: my-namespace # kpt-set: ${namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.5.0 spec: destination: pubSubTopicRef: @@ -49,7 +49,7 @@ metadata: name: pubsub-logexport-dataset # kpt-set: ${topic-name} namespace: my-namespace # kpt-set: ${namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.5.0 cnrm.cloud.google.com/project-id: my-project-id # kpt-set: ${project-id} # TODO(jcwc): Add support for creating subscribers (either a new blueprint or kpt fn) diff --git a/catalog/log-export/folder/pubsub-export/iam.yaml b/catalog/log-export/folder/pubsub-export/iam.yaml index 814a32a1..acd5418e 100644 --- a/catalog/log-export/folder/pubsub-export/iam.yaml +++ b/catalog/log-export/folder/pubsub-export/iam.yaml @@ -18,7 +18,7 @@ metadata: name: pubsub-iam-policy namespace: my-namespace # kpt-set: ${namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.5.0 spec: memberFrom: logSinkRef: diff --git a/catalog/log-export/folder/storage-export/export.yaml b/catalog/log-export/folder/storage-export/export.yaml index ebbcc1e3..6d5a8bb9 100644 --- a/catalog/log-export/folder/storage-export/export.yaml +++ b/catalog/log-export/folder/storage-export/export.yaml @@ -18,7 +18,7 @@ metadata: name: my-project-id-storage # kpt-set: ${project-id}-storage namespace: projects annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.5.0 cnrm.cloud.google.com/deletion-policy: "abandon" cnrm.cloud.google.com/disable-dependent-services: "false" cnrm.cloud.google.com/project-id: my-project-id # kpt-set: ${project-id} @@ -32,7 +32,7 @@ metadata: name: my.folder.k8s.name-storagesink # kpt-set: ${folder-k8s-name}-storagesink namespace: my-namespace # kpt-set: ${namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.5.0 spec: destination: storageBucketRef: diff --git a/catalog/log-export/folder/storage-export/iam.yaml b/catalog/log-export/folder/storage-export/iam.yaml index c4c40172..2d22622d 100644 --- a/catalog/log-export/folder/storage-export/iam.yaml +++ b/catalog/log-export/folder/storage-export/iam.yaml @@ -18,7 +18,7 @@ metadata: name: storage-project-iam-policy namespace: my-namespace # kpt-set: ${namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.5.0 spec: memberFrom: logSinkRef: diff --git a/catalog/log-export/org/bigquery-export/export.yaml b/catalog/log-export/org/bigquery-export/export.yaml index 43600b60..e50c1896 100644 --- a/catalog/log-export/org/bigquery-export/export.yaml +++ b/catalog/log-export/org/bigquery-export/export.yaml @@ -18,7 +18,7 @@ metadata: name: my-project-id-bigquery # kpt-set: ${project-id}-bigquery namespace: projects annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.5.0 cnrm.cloud.google.com/deletion-policy: "abandon" cnrm.cloud.google.com/disable-dependent-services: "false" cnrm.cloud.google.com/project-id: my-project-id # kpt-set: ${project-id} @@ -32,7 +32,7 @@ metadata: name: 123456789012-bqsink # kpt-set: ${org-id}-bqsink namespace: logging # kpt-set: ${namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.5.0 spec: destination: bigQueryDatasetRef: @@ -51,7 +51,7 @@ metadata: annotations: cnrm.cloud.google.com/delete-contents-on-destroy: "false" # kpt-set: ${delete-contents-on-destroy} cnrm.cloud.google.com/project-id: my-project-id # kpt-set: ${project-id} - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.5.0 spec: defaultTableExpirationMs: 3600000 # kpt-set: ${default-table-expiration-ms} description: "BigQuery audit logs for folder" # kpt-set: ${dataset-description} diff --git a/catalog/log-export/org/bigquery-export/iam.yaml b/catalog/log-export/org/bigquery-export/iam.yaml index 85dd582c..df1be8ff 100644 --- a/catalog/log-export/org/bigquery-export/iam.yaml +++ b/catalog/log-export/org/bigquery-export/iam.yaml @@ -18,7 +18,7 @@ metadata: name: bq-project-iam-policy namespace: logging # kpt-set: ${namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.5.0 spec: memberFrom: logSinkRef: @@ -35,7 +35,7 @@ metadata: name: logging-sa-iam-permissions namespace: config-control # kpt-set: ${management-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.5.0 spec: resourceRef: apiVersion: resourcemanager.cnrm.cloud.google.com/v1beta1 diff --git a/catalog/log-export/org/pubsub-export/export.yaml b/catalog/log-export/org/pubsub-export/export.yaml index 2aeca2a7..e07a3c44 100644 --- a/catalog/log-export/org/pubsub-export/export.yaml +++ b/catalog/log-export/org/pubsub-export/export.yaml @@ -18,7 +18,7 @@ metadata: name: my-project-id-pubsub # kpt-set: ${project-id}-pubsub namespace: projects annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.5.0 cnrm.cloud.google.com/deletion-policy: "abandon" cnrm.cloud.google.com/disable-dependent-services: "false" cnrm.cloud.google.com/project-id: my-project-id # kpt-set: ${project-id} @@ -32,7 +32,7 @@ metadata: name: 123456789012-pubsubsink # kpt-set: ${org-id}-pubsubsink namespace: my-namespace # kpt-set: ${namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.5.0 spec: destination: pubSubTopicRef: @@ -49,7 +49,7 @@ metadata: name: pubsub-logexport-dataset # kpt-set: ${topic-name} namespace: my-namespace # kpt-set: ${namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.5.0 cnrm.cloud.google.com/project-id: my-project-id # kpt-set: ${project-id} # TODO(jcwc): Add support for creating subscribers (either a new blueprint or kpt fn) diff --git a/catalog/log-export/org/pubsub-export/iam.yaml b/catalog/log-export/org/pubsub-export/iam.yaml index f650e60a..88034308 100644 --- a/catalog/log-export/org/pubsub-export/iam.yaml +++ b/catalog/log-export/org/pubsub-export/iam.yaml @@ -18,7 +18,7 @@ metadata: name: pubsub-iam-policy namespace: my-namespace # kpt-set: ${namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.5.0 spec: memberFrom: logSinkRef: diff --git a/catalog/log-export/org/storage-export/export.yaml b/catalog/log-export/org/storage-export/export.yaml index 71f0cd2e..e8ff0696 100644 --- a/catalog/log-export/org/storage-export/export.yaml +++ b/catalog/log-export/org/storage-export/export.yaml @@ -18,7 +18,7 @@ metadata: name: my-project-id-storage # kpt-set: ${project-id}-storage namespace: projects annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.5.0 cnrm.cloud.google.com/deletion-policy: "abandon" cnrm.cloud.google.com/disable-dependent-services: "false" cnrm.cloud.google.com/project-id: my-project-id # kpt-set: ${project-id} @@ -32,7 +32,7 @@ metadata: name: 123456789012-storagesink # kpt-set: ${org-id}-storagesink namespace: my-namespace # kpt-set: ${namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.5.0 spec: destination: storageBucketRef: @@ -50,7 +50,7 @@ metadata: namespace: my-namespace # kpt-set: ${namespace} annotations: cnrm.cloud.google.com/force-destroy: "true" - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.5.0 cnrm.cloud.google.com/project-id: my-project-id # kpt-set: ${project-id} spec: uniformBucketLevelAccess: true # kpt-set: ${uniform-bucket-level-access} diff --git a/catalog/log-export/org/storage-export/iam.yaml b/catalog/log-export/org/storage-export/iam.yaml index 7a09b41a..8cc36d46 100644 --- a/catalog/log-export/org/storage-export/iam.yaml +++ b/catalog/log-export/org/storage-export/iam.yaml @@ -18,7 +18,7 @@ metadata: name: storage-project-iam-policy namespace: my-namespace # kpt-set: ${namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.5.0 spec: memberFrom: logSinkRef: diff --git a/catalog/networking/CHANGELOG.md b/catalog/networking/CHANGELOG.md index 70754ed4..5fbb7c9d 100644 --- a/catalog/networking/CHANGELOG.md +++ b/catalog/networking/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +### [0.4.1](https://github.com/GoogleCloudPlatform/blueprints/compare/networking-blueprint-v0.4.0...networking-blueprint-v0.4.1) (2022-05-24) + + +### Bug Fixes + +* add local-config annotations to kptfiles and functionConfigs ([#176](https://github.com/GoogleCloudPlatform/blueprints/issues/176)) ([0d005f0](https://github.com/GoogleCloudPlatform/blueprints/commit/0d005f0174d95d3aca1691e67deffa573c3e7db7)) +* set separate project & networking namespaces for svpc service project ([#171](https://github.com/GoogleCloudPlatform/blueprints/issues/171)) ([7badf07](https://github.com/GoogleCloudPlatform/blueprints/commit/7badf07d06ee3d9fcf856ca8aaf9bb2787ead8b6)) + ## [0.4.0](https://www.github.com/GoogleCloudPlatform/blueprints/compare/networking-blueprint-v0.3.0...networking-blueprint-v0.4.0) (2021-09-14) diff --git a/catalog/networking/dns/managedzone-forwarding/dns.yaml b/catalog/networking/dns/managedzone-forwarding/dns.yaml index 7de8e576..a8e1f1b1 100644 --- a/catalog/networking/dns/managedzone-forwarding/dns.yaml +++ b/catalog/networking/dns/managedzone-forwarding/dns.yaml @@ -17,7 +17,7 @@ metadata: name: dnsmanagedzone-sample # kpt-set: ${managed-zone-name} namespace: networking # kpt-set: ${namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.4.1 cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} spec: dnsName: "example.com." # kpt-set: ${domain} diff --git a/catalog/networking/dns/managedzone-forwarding/services.yaml b/catalog/networking/dns/managedzone-forwarding/services.yaml index 2fe60bd6..5abb1707 100644 --- a/catalog/networking/dns/managedzone-forwarding/services.yaml +++ b/catalog/networking/dns/managedzone-forwarding/services.yaml @@ -17,7 +17,7 @@ metadata: name: project-id-dns # kpt-set: ${project-id}-dns namespace: projects annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.1 cnrm.cloud.google.com/disable-on-destroy: "false" cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} spec: diff --git a/catalog/networking/dns/managedzone-peering/dns.yaml b/catalog/networking/dns/managedzone-peering/dns.yaml index 852908cc..33c46dfc 100644 --- a/catalog/networking/dns/managedzone-peering/dns.yaml +++ b/catalog/networking/dns/managedzone-peering/dns.yaml @@ -17,7 +17,7 @@ metadata: name: dnsmanagedzone-sample # kpt-set: ${managed-zone-name} namespace: networking # kpt-set: ${namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.1 cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} spec: dnsName: "example.com." # kpt-set: ${domain} diff --git a/catalog/networking/dns/managedzone-peering/services.yaml b/catalog/networking/dns/managedzone-peering/services.yaml index 2fe60bd6..5abb1707 100644 --- a/catalog/networking/dns/managedzone-peering/services.yaml +++ b/catalog/networking/dns/managedzone-peering/services.yaml @@ -17,7 +17,7 @@ metadata: name: project-id-dns # kpt-set: ${project-id}-dns namespace: projects annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.1 cnrm.cloud.google.com/disable-on-destroy: "false" cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} spec: diff --git a/catalog/networking/dns/managedzone-private/dns.yaml b/catalog/networking/dns/managedzone-private/dns.yaml index b72749f6..6bb16a76 100644 --- a/catalog/networking/dns/managedzone-private/dns.yaml +++ b/catalog/networking/dns/managedzone-private/dns.yaml @@ -17,7 +17,7 @@ metadata: name: dnsmanagedzone-sample # kpt-set: ${managed-zone-name} namespace: networking # kpt-set: ${namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.1 cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} spec: dnsName: "example.com." # kpt-set: ${domain} diff --git a/catalog/networking/dns/managedzone-private/services.yaml b/catalog/networking/dns/managedzone-private/services.yaml index 2fe60bd6..5abb1707 100644 --- a/catalog/networking/dns/managedzone-private/services.yaml +++ b/catalog/networking/dns/managedzone-private/services.yaml @@ -17,7 +17,7 @@ metadata: name: project-id-dns # kpt-set: ${project-id}-dns namespace: projects annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.1 cnrm.cloud.google.com/disable-on-destroy: "false" cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} spec: diff --git a/catalog/networking/dns/policy/policy.yaml b/catalog/networking/dns/policy/policy.yaml index 5a1c0d88..2ca397e9 100644 --- a/catalog/networking/dns/policy/policy.yaml +++ b/catalog/networking/dns/policy/policy.yaml @@ -17,7 +17,7 @@ metadata: name: default-dns-policy # kpt-set: ${dns-policy-name} namespace: networking # kpt-set: ${namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.1 cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} spec: enableInboundForwarding: true diff --git a/catalog/networking/dns/recordset/recordset.yaml b/catalog/networking/dns/recordset/recordset.yaml index 81620332..23708760 100644 --- a/catalog/networking/dns/recordset/recordset.yaml +++ b/catalog/networking/dns/recordset/recordset.yaml @@ -17,7 +17,7 @@ metadata: name: dnsrecordset-sample-a # kpt-set: ${record-set-name} namespace: networking # kpt-set: ${namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.1 cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} spec: name: "www.example.com." # kpt-set: ${name}${domain} diff --git a/catalog/networking/firewall/common-rules/egress/allow-google-apis.yaml b/catalog/networking/firewall/common-rules/egress/allow-google-apis.yaml index f36de131..28cc2933 100644 --- a/catalog/networking/firewall/common-rules/egress/allow-google-apis.yaml +++ b/catalog/networking/firewall/common-rules/egress/allow-google-apis.yaml @@ -17,7 +17,7 @@ metadata: name: network-name-fw-allow-google-apis # kpt-set: ${network-name}-fw-allow-google-apis namespace: firewalls-namespace # kpt-set: ${firewalls-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.1 cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} spec: priority: 65534 diff --git a/catalog/networking/firewall/common-rules/egress/allow-windows-kms.yaml b/catalog/networking/firewall/common-rules/egress/allow-windows-kms.yaml index 45d39768..88d13a07 100644 --- a/catalog/networking/firewall/common-rules/egress/allow-windows-kms.yaml +++ b/catalog/networking/firewall/common-rules/egress/allow-windows-kms.yaml @@ -17,7 +17,7 @@ metadata: name: network-name-fw-allow-windows-kms # kpt-set: ${network-name}-fw-allow-windows-kms namespace: firewalls-namespace # kpt-set: ${firewalls-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.1 cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} spec: priority: 100 diff --git a/catalog/networking/firewall/common-rules/egress/deny-all.yaml b/catalog/networking/firewall/common-rules/egress/deny-all.yaml index 6a7f68a4..64a5c4cd 100644 --- a/catalog/networking/firewall/common-rules/egress/deny-all.yaml +++ b/catalog/networking/firewall/common-rules/egress/deny-all.yaml @@ -17,7 +17,7 @@ metadata: name: network-name-fw-deny-all-egress # kpt-set: ${network-name}-fw-deny-all-egress namespace: firewalls-namespace # kpt-set: ${firewalls-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.1 cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} spec: priority: 65535 diff --git a/catalog/networking/firewall/common-rules/ingress/allow-gcp-lb.yaml b/catalog/networking/firewall/common-rules/ingress/allow-gcp-lb.yaml index c3f8445d..cf0ae281 100644 --- a/catalog/networking/firewall/common-rules/ingress/allow-gcp-lb.yaml +++ b/catalog/networking/firewall/common-rules/ingress/allow-gcp-lb.yaml @@ -17,7 +17,7 @@ metadata: name: network-name-fw-allow-gcp-lb # kpt-set: ${network-name}-fw-allow-gcp-lb namespace: firewalls-namespace # kpt-set: ${firewalls-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.1 cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} spec: priority: 10000 # kpt-set: ${priority} diff --git a/catalog/networking/firewall/common-rules/ingress/allow-iap-rdp.yaml b/catalog/networking/firewall/common-rules/ingress/allow-iap-rdp.yaml index b41cac4e..bb909c84 100644 --- a/catalog/networking/firewall/common-rules/ingress/allow-iap-rdp.yaml +++ b/catalog/networking/firewall/common-rules/ingress/allow-iap-rdp.yaml @@ -17,7 +17,7 @@ metadata: name: network-name-fw-allow-iap-rdp # kpt-set: ${network-name}-fw-allow-iap-rdp namespace: firewalls-namespace # kpt-set: ${firewalls-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.1 cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} spec: priority: 10000 # kpt-set: ${priority} diff --git a/catalog/networking/firewall/common-rules/ingress/allow-iap-ssh.yaml b/catalog/networking/firewall/common-rules/ingress/allow-iap-ssh.yaml index 26bcf5f1..29daf477 100644 --- a/catalog/networking/firewall/common-rules/ingress/allow-iap-ssh.yaml +++ b/catalog/networking/firewall/common-rules/ingress/allow-iap-ssh.yaml @@ -17,7 +17,7 @@ metadata: name: network-name-fw-allow-iap-ssh # kpt-set: ${network-name}-fw-allow-iap-ssh namespace: firewalls-namespace # kpt-set: ${firewalls-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.1 cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} spec: priority: 10000 # kpt-set: ${priority} diff --git a/catalog/networking/firewall/common-rules/ingress/allow-internal-common.yaml b/catalog/networking/firewall/common-rules/ingress/allow-internal-common.yaml index f516aeff..812ca64a 100644 --- a/catalog/networking/firewall/common-rules/ingress/allow-internal-common.yaml +++ b/catalog/networking/firewall/common-rules/ingress/allow-internal-common.yaml @@ -17,7 +17,7 @@ metadata: name: network-name-fw-allow-internal-common # kpt-set: ${network-name}-fw-allow-internal-common namespace: firewalls-namespace # kpt-set: ${firewalls-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.1 cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} spec: priority: 10000 # kpt-set: ${priority} diff --git a/catalog/networking/network/subnet/nat.yaml b/catalog/networking/network/subnet/nat.yaml index fddf2f9e..dedc1c71 100644 --- a/catalog/networking/network/subnet/nat.yaml +++ b/catalog/networking/network/subnet/nat.yaml @@ -18,7 +18,7 @@ metadata: namespace: networking # kpt-set: ${namespace} annotations: cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.1 spec: natIpAllocateOption: AUTO_ONLY region: us-central1 # kpt-set: ${region} @@ -33,7 +33,7 @@ metadata: namespace: networking # kpt-set: ${namespace} annotations: cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.1 spec: description: example router description networkRef: diff --git a/catalog/networking/network/subnet/subnet.yaml b/catalog/networking/network/subnet/subnet.yaml index 57171a4c..c7489196 100644 --- a/catalog/networking/network/subnet/subnet.yaml +++ b/catalog/networking/network/subnet/subnet.yaml @@ -18,7 +18,7 @@ metadata: namespace: networking # kpt-set: ${namespace} annotations: cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.1 spec: description: Subnetwork ipCidrRange: 10.2.0.0/16 # kpt-set: ${ip-cidr-range} diff --git a/catalog/networking/network/vpc/services.yaml b/catalog/networking/network/vpc/services.yaml index 64cb0abe..0ea98e45 100644 --- a/catalog/networking/network/vpc/services.yaml +++ b/catalog/networking/network/vpc/services.yaml @@ -17,7 +17,7 @@ metadata: name: project-id-compute # kpt-set: ${project-id}-compute namespace: projects annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.1 cnrm.cloud.google.com/disable-on-destroy: "false" cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} spec: diff --git a/catalog/networking/network/vpc/vpc.yaml b/catalog/networking/network/vpc/vpc.yaml index 00022e4c..49a58ed8 100644 --- a/catalog/networking/network/vpc/vpc.yaml +++ b/catalog/networking/network/vpc/vpc.yaml @@ -17,7 +17,7 @@ metadata: name: network-name # kpt-set: ${network-name} namespace: networking # kpt-set: ${namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.1 cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} spec: autoCreateSubnetworks: false diff --git a/catalog/networking/network/vpn.yaml b/catalog/networking/network/vpn.yaml index 90d61c9b..b925e29e 100644 --- a/catalog/networking/network/vpn.yaml +++ b/catalog/networking/network/vpn.yaml @@ -18,7 +18,7 @@ metadata: namespace: networking # kpt-set: ${namespace} annotations: cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.1 spec: description: "Compute HA VPN Gateway" networkRef: @@ -32,7 +32,7 @@ metadata: namespace: networking # kpt-set: ${namespace} annotations: cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.1 spec: redundancyType: "TWO_IPS_REDUNDANCY" interface: @@ -48,7 +48,7 @@ metadata: namespace: networking # kpt-set: ${namespace} annotations: cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.1 spec: peerExternalGatewayInterface: 0 peerExternalGatewayRef: @@ -72,7 +72,7 @@ metadata: namespace: networking # kpt-set: ${namespace} annotations: cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.1 spec: peerExternalGatewayInterface: 1 peerExternalGatewayRef: diff --git a/catalog/networking/peering/peering.yaml b/catalog/networking/peering/peering.yaml index 7878f74d..4f784533 100644 --- a/catalog/networking/peering/peering.yaml +++ b/catalog/networking/peering/peering.yaml @@ -17,7 +17,7 @@ metadata: name: local-network-to-peer-network # kpt-set: ${local-network}-to-${peer-network} namespace: namespace # kpt-set: ${namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.1 spec: exportCustomRoutes: false exportSubnetRoutesWithPublicIp: true @@ -36,7 +36,7 @@ metadata: name: peer-network-to-local-network # kpt-set: ${peer-network}-to-${local-network} namespace: namespace # kpt-set: ${namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.1 spec: exportCustomRoutes: false exportSubnetRoutesWithPublicIp: true diff --git a/catalog/networking/routes/routes-igw/route.yaml b/catalog/networking/routes/routes-igw/route.yaml index 02a26b21..7254e8c7 100644 --- a/catalog/networking/routes/routes-igw/route.yaml +++ b/catalog/networking/routes/routes-igw/route.yaml @@ -18,7 +18,7 @@ metadata: namespace: networking # kpt-set: ${namespace} annotations: cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.1 spec: priority: 1000 destRange: 0.0.0.0/0 # kpt-set: ${destination-range} diff --git a/catalog/networking/shared-vpc/sharedVPC.yaml b/catalog/networking/shared-vpc/sharedVPC.yaml index ebed21fd..8aab7d56 100644 --- a/catalog/networking/shared-vpc/sharedVPC.yaml +++ b/catalog/networking/shared-vpc/sharedVPC.yaml @@ -18,4 +18,4 @@ metadata: namespace: networking # kpt-set: ${namespace} annotations: cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.1 diff --git a/catalog/networking/svpc-service-project/serviceproject.yaml b/catalog/networking/svpc-service-project/serviceproject.yaml index 9e60d145..538a1b14 100644 --- a/catalog/networking/svpc-service-project/serviceproject.yaml +++ b/catalog/networking/svpc-service-project/serviceproject.yaml @@ -18,7 +18,7 @@ metadata: namespace: networking # kpt-set: ${networking-namespace} annotations: cnrm.cloud.google.com/project-id: host-project # kpt-set: ${host-project-id} - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.1 spec: projectRef: name: project-id # kpt-set: ${project-id} diff --git a/catalog/networking/vpc-service-controls/access-policy/policy.yaml b/catalog/networking/vpc-service-controls/access-policy/policy.yaml index 5991144b..e2ca31ce 100644 --- a/catalog/networking/vpc-service-controls/access-policy/policy.yaml +++ b/catalog/networking/vpc-service-controls/access-policy/policy.yaml @@ -17,7 +17,7 @@ metadata: name: org-access-policy # kpt-set: ${access-policy-name} namespace: networking # kpt-set: ${namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.1 cnrm.cloud.google.com/organization-id: example-org # kpt-set: ${org-id} spec: title: org-access-policy Policy # kpt-set: ${access-policy-name} Policy diff --git a/catalog/networking/vpc-service-controls/perimeter/access-level.yaml b/catalog/networking/vpc-service-controls/perimeter/access-level.yaml index 4c0de0d6..bf44d60a 100644 --- a/catalog/networking/vpc-service-controls/perimeter/access-level.yaml +++ b/catalog/networking/vpc-service-controls/perimeter/access-level.yaml @@ -17,7 +17,7 @@ metadata: name: alregionperimeter # kpt-set: al${perimeter-name}${suffix} namespace: networking # kpt-set: ${namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.1 cnrm.cloud.google.com/organization-id: example-org # kpt-set: ${org-id} spec: accessPolicyRef: diff --git a/catalog/networking/vpc-service-controls/perimeter/perimeter.yaml b/catalog/networking/vpc-service-controls/perimeter/perimeter.yaml index 4ea67792..8294f729 100644 --- a/catalog/networking/vpc-service-controls/perimeter/perimeter.yaml +++ b/catalog/networking/vpc-service-controls/perimeter/perimeter.yaml @@ -17,7 +17,7 @@ metadata: name: spcregionperimeter # kpt-set: sp${perimeter-name}${suffix} namespace: networking # kpt-set: ${namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:networking/v0.4.1 spec: status: resources: diff --git a/catalog/project/CHANGELOG.md b/catalog/project/CHANGELOG.md index 2b17fcfc..632f3c2d 100644 --- a/catalog/project/CHANGELOG.md +++ b/catalog/project/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +### [0.4.3](https://github.com/GoogleCloudPlatform/blueprints/compare/project-blueprint-v0.4.2...project-blueprint-v0.4.3) (2022-05-24) + + +### Bug Fixes + +* Add 'ignore-clusterless' annotations to resources that are irrelevant to clusterless actuation mode (when a GKE cluster is not involved) ([#164](https://github.com/GoogleCloudPlatform/blueprints/issues/164)) ([84fa763](https://github.com/GoogleCloudPlatform/blueprints/commit/84fa76359253eca234ab5664a97c62dc88b1a860)) +* Add ignore-clusterless to project blueprint resources that are unnecessary in clusterless workflow. ([#173](https://github.com/GoogleCloudPlatform/blueprints/issues/173)) ([3c2dda6](https://github.com/GoogleCloudPlatform/blueprints/commit/3c2dda6e6ba2c7929b2cb5e4c71c9584eb62654c)) +* add local-config annotations to kptfiles and functionConfigs ([#176](https://github.com/GoogleCloudPlatform/blueprints/issues/176)) ([0d005f0](https://github.com/GoogleCloudPlatform/blueprints/commit/0d005f0174d95d3aca1691e67deffa573c3e7db7)) + ### [0.4.2](https://github.com/GoogleCloudPlatform/blueprints/compare/project-blueprint-v0.4.1...project-blueprint-v0.4.2) (2022-02-02) diff --git a/catalog/project/kcc-namespace/kcc-project-owner.yaml b/catalog/project/kcc-namespace/kcc-project-owner.yaml index 9ea7d953..08b37d47 100644 --- a/catalog/project/kcc-namespace/kcc-project-owner.yaml +++ b/catalog/project/kcc-namespace/kcc-project-owner.yaml @@ -18,7 +18,7 @@ metadata: name: kcc-project-id-owners-permissions # kpt-set: kcc-${project-id}-owners-permissions namespace: projects # kpt-set: ${projects-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/kcc-namespace/v0.4.2 + cnrm.cloud.google.com/blueprint: cnrm/kcc-namespace/v0.4.3 cnrm.cloud.google.com/project-id: management-project-id # kpt-set: ${management-project-id} cnrm.cloud.google.com/ignore-clusterless: "true" spec: diff --git a/catalog/project/kcc-namespace/kcc.yaml b/catalog/project/kcc-namespace/kcc.yaml index 662b3b6c..f72ad66a 100644 --- a/catalog/project/kcc-namespace/kcc.yaml +++ b/catalog/project/kcc-namespace/kcc.yaml @@ -18,7 +18,7 @@ metadata: name: configconnectorcontext.core.cnrm.cloud.google.com namespace: project-id # kpt-set: ${project-id} annotations: - cnrm.cloud.google.com/blueprint: cnrm/kcc-namespace/v0.4.2 + cnrm.cloud.google.com/blueprint: cnrm/kcc-namespace/v0.4.3 spec: googleServiceAccount: kcc-project-id@management-project-id.iam.gserviceaccount.com # kpt-set: kcc-${project-id}@${management-project-id}.iam.gserviceaccount.com --- @@ -29,7 +29,7 @@ metadata: name: kcc-project-id # kpt-set: kcc-${project-id} namespace: config-control # kpt-set: ${management-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/kcc-namespace/v0.4.2 + cnrm.cloud.google.com/blueprint: cnrm/kcc-namespace/v0.4.3 cnrm.cloud.google.com/project-id: management-project-id # kpt-set: ${management-project-id} cnrm.cloud.google.com/ignore-clusterless: "true" spec: @@ -42,7 +42,7 @@ metadata: name: project-id-sa-workload-identity-binding # kpt-set: ${project-id}-sa-workload-identity-binding namespace: config-control # kpt-set: ${management-namespace} annotations: - cnrm.cloud.google.com/blueprint: cnrm/kcc-namespace/v0.4.2 + cnrm.cloud.google.com/blueprint: cnrm/kcc-namespace/v0.4.3 cnrm.cloud.google.com/ignore-clusterless: "true" spec: resourceRef: diff --git a/catalog/project/project.yaml b/catalog/project/project.yaml index ff97f56d..e150a70f 100644 --- a/catalog/project/project.yaml +++ b/catalog/project/project.yaml @@ -18,7 +18,7 @@ metadata: namespace: projects # kpt-set: ${projects-namespace} annotations: cnrm.cloud.google.com/auto-create-network: "false" - cnrm.cloud.google.com/blueprint: cnrm/landing-zone:project/v0.4.2 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:project/v0.4.3 spec: name: project-id # kpt-set: ${project-id} billingAccountRef: diff --git a/catalog/redis-bucket/CHANGELOG.md b/catalog/redis-bucket/CHANGELOG.md index f9f51bf8..1e50461f 100644 --- a/catalog/redis-bucket/CHANGELOG.md +++ b/catalog/redis-bucket/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [0.3.3](https://github.com/GoogleCloudPlatform/blueprints/compare/redis-bucket-blueprint-v0.3.2...redis-bucket-blueprint-v0.3.3) (2022-05-24) + + +### Bug Fixes + +* add local-config annotations to kptfiles and functionConfigs ([#176](https://github.com/GoogleCloudPlatform/blueprints/issues/176)) ([0d005f0](https://github.com/GoogleCloudPlatform/blueprints/commit/0d005f0174d95d3aca1691e67deffa573c3e7db7)) + ### [0.3.2](https://github.com/GoogleCloudPlatform/blueprints/compare/redis-bucket-blueprint-v0.3.1...redis-bucket-blueprint-v0.3.2) (2022-02-02) diff --git a/catalog/spanner/CHANGELOG.md b/catalog/spanner/CHANGELOG.md new file mode 100644 index 00000000..195a24a9 --- /dev/null +++ b/catalog/spanner/CHANGELOG.md @@ -0,0 +1,8 @@ +# Changelog + +### [0.3.1](https://github.com/GoogleCloudPlatform/blueprints/compare/spanner-blueprint-v0.3.0...spanner-blueprint-v0.3.1) (2022-05-24) + + +### Bug Fixes + +* add local-config annotations to kptfiles and functionConfigs ([#176](https://github.com/GoogleCloudPlatform/blueprints/issues/176)) ([0d005f0](https://github.com/GoogleCloudPlatform/blueprints/commit/0d005f0174d95d3aca1691e67deffa573c3e7db7)) diff --git a/catalog/sql/auth-proxy/CHANGELOG.md b/catalog/sql/auth-proxy/CHANGELOG.md new file mode 100644 index 00000000..cba4824d --- /dev/null +++ b/catalog/sql/auth-proxy/CHANGELOG.md @@ -0,0 +1,8 @@ +# Changelog + +## [0.1.0](https://github.com/GoogleCloudPlatform/blueprints/compare/cloud-sql-auth-proxy-blueprint-v0.0.1...cloud-sql-auth-proxy-blueprint-v0.1.0) (2022-05-24) + + +### Features + +* add blueprint for cloud sql auth proxy ([#184](https://github.com/GoogleCloudPlatform/blueprints/issues/184)) ([921696c](https://github.com/GoogleCloudPlatform/blueprints/commit/921696c22422f698d923ba9e80dd6fec75f1faa6))