diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 0c534414..190710b2 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -3,14 +3,14 @@ "catalog/anthos-cluster": "0.1.2", "catalog/bucket": "0.4.4", "catalog/empty": "0.3.1", - "catalog/gitops": "0.5.0", + "catalog/gitops": "0.6.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/log-export": "0.6.0", "catalog/networking": "0.4.1", "catalog/project": "0.4.3", "catalog/redis-bucket": "0.3.3", diff --git a/catalog/gitops/CHANGELOG.md b/catalog/gitops/CHANGELOG.md index 426e2f39..49ce1d47 100644 --- a/catalog/gitops/CHANGELOG.md +++ b/catalog/gitops/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.6.0](https://github.com/GoogleCloudPlatform/blueprints/compare/gitops-blueprint-v0.5.0...gitops-blueprint-v0.6.0) (2022-08-24) + + +### Features + +* add cluster-name validator, update README ([#199](https://github.com/GoogleCloudPlatform/blueprints/issues/199)) ([5e0966b](https://github.com/GoogleCloudPlatform/blueprints/commit/5e0966b91b8d40fd00e8c2bc43e6b49cf3185aa2)) + ## [0.5.0](https://github.com/GoogleCloudPlatform/blueprints/compare/gitops-blueprint-v0.4.2...gitops-blueprint-v0.5.0) (2022-05-24) diff --git a/catalog/gitops/cloudbuild-iam.yaml b/catalog/gitops/cloudbuild-iam.yaml index b521416c..8ef97c0c 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.5.0 + cnrm.cloud.google.com/blueprint: cnrm/gitops/v0.6.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.5.0 + cnrm.cloud.google.com/blueprint: cnrm/gitops/v0.6.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 3c5a815d..24b0d49e 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.5.0 + cnrm.cloud.google.com/blueprint: cnrm/gitops/configsync/v0.6.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.5.0 + cnrm.cloud.google.com/blueprint: cnrm/gitops/configsync/v0.6.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.5.0 + cnrm.cloud.google.com/blueprint: cnrm/gitops/configsync/v0.6.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 b9a837b1..041306a5 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.5.0 + cnrm.cloud.google.com/blueprint: cnrm/gitops/v0.6.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 8154e95a..af4420af 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.5.0 + cnrm.cloud.google.com/blueprint: cnrm/gitops/v0.6.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.5.0 + cnrm.cloud.google.com/blueprint: cnrm/gitops/v0.6.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 d7a94eb8..97310919 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.5.0 + cnrm.cloud.google.com/blueprint: cnrm/gitops/v0.6.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.5.0 + cnrm.cloud.google.com/blueprint: cnrm/gitops/v0.6.0 cnrm.cloud.google.com/project-id: project-id # kpt-set: ${project-id} diff --git a/catalog/log-export/CHANGELOG.md b/catalog/log-export/CHANGELOG.md index 2024ef4b..8951ce5a 100644 --- a/catalog/log-export/CHANGELOG.md +++ b/catalog/log-export/CHANGELOG.md @@ -1,5 +1,20 @@ # Changelog +## [0.6.0](https://github.com/GoogleCloudPlatform/blueprints/compare/log-export-blueprint-v0.5.0...log-export-blueprint-v0.6.0) (2022-08-24) + + +### Features + +* adds blueprints for log-export with sinks for Cloud Log Buckets ([6edd3f5](https://github.com/GoogleCloudPlatform/blueprints/commit/6edd3f5c40cbcb331aea575f0d159a5912d4285a)) + + +### Bug Fixes + +* adds depends-on annotation for log-export ([7696fa4](https://github.com/GoogleCloudPlatform/blueprints/commit/7696fa4a1b9df7692e21db01e520422436591b2e)) +* adds the iam policy resource for the sink for log-bucket ([1ac8e49](https://github.com/GoogleCloudPlatform/blueprints/commit/1ac8e4930c9da45e80c622d4cbd681ee0a7c364d)) +* org logbucket retention setter ([42a7d0d](https://github.com/GoogleCloudPlatform/blueprints/commit/42a7d0d39c4aded518b856b8315cbb0f6438f44d)) +* sets bucket-locked to false as default ([2725a8e](https://github.com/GoogleCloudPlatform/blueprints/commit/2725a8eca562a732c4616cfee65ec43220c965f7)) + ## [0.5.0](https://github.com/GoogleCloudPlatform/blueprints/compare/log-export-blueprint-v0.4.0...log-export-blueprint-v0.5.0) (2022-05-24) diff --git a/catalog/log-export/folder/bigquery-export/export.yaml b/catalog/log-export/folder/bigquery-export/export.yaml index bcf9ea45..a62f276a 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.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.6.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.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.6.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.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.6.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 48dd1826..63a03bea 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.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.6.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 6b5b5ee2..da765c47 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.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.6.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.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.6.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.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.6.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 acd5418e..62bb9c0f 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.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.6.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 6d5a8bb9..59222910 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.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.6.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.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.6.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 2d22622d..57011cbf 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.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.6.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 e50c1896..aacde83a 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.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.6.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.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.6.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.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.6.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 df1be8ff..47c934e0 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.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.6.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.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.6.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 e07a3c44..6f6ea2ce 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.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.6.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.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.6.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.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.6.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 88034308..cdb71f5e 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.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.6.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 e8ff0696..e5fc6bce 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.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.6.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.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.6.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.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.6.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 8cc36d46..bf229ef7 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.5.0 + cnrm.cloud.google.com/blueprint: cnrm/landing-zone:log-export/v0.6.0 spec: memberFrom: logSinkRef: