Merge branch 'GoogleCloudPlatform:main' into main

obriensystems · Nov 23, 2023 · c2592bb · c2592bb
2 parents e86ec4f + f0a3b41
commit c2592bb
Show file tree

Hide file tree

Showing 25 changed files with 484 additions and 201 deletions.
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,12 +1,12 @@
 {
   "solutions/client-landing-zone": "0.5.2",
   "solutions/client-project-setup": "0.4.5",
-  "solutions/client-setup": "0.7.0",
-  "solutions/core-landing-zone": "0.5.0",
+  "solutions/client-setup": "0.7.1",
+  "solutions/core-landing-zone": "0.6.1",
   "solutions/experimentation/admin-folder": "0.1.0",
-  "solutions/experimentation/client-landing-zone": "0.1.1",
+  "solutions/experimentation/client-landing-zone": "0.1.2",
   "solutions/experimentation/client-project": "0.1.1",
-  "solutions/experimentation/core-landing-zone": "0.2.0",
+  "solutions/experimentation/core-landing-zone": "0.3.1",
   "solutions/gatekeeper-policies": "0.2.1",
   "solutions/gke/configconnector/gke-admin-proxy": "0.1.2",
   "solutions/gke/configconnector/gke-cluster-autopilot": "0.2.4",

diff --git a/docs/landing-zone-v2/README.md b/docs/landing-zone-v2/README.md
@@ -258,7 +258,7 @@ The following instructions in this section 1 for the boostrap of the Config Cont
 1. Enable the required services to provision the config controller instance.
 
     ```shell
-    gcloud services enable krmapihosting.googleapis.com container.googleapis.com cloudresourcemanager.googleapis.com cloudbilling.googleapis.com serviceusage.googleapis.com servicedirectory.googleapis.com dns.googleapis.com
+    gcloud services enable anthos.googleapis.com krmapihosting.googleapis.com container.googleapis.com cloudresourcemanager.googleapis.com cloudbilling.googleapis.com serviceusage.googleapis.com servicedirectory.googleapis.com dns.googleapis.com
     ```
 
 1. Create the required network resources. Config Controller provisions a managed Private GKE instance and still requires some core networking resource to work.

diff --git a/solutions/client-setup/CHANGELOG.md b/solutions/client-setup/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.7.1](https://github.com/GoogleCloudPlatform/pubsec-declarative-toolkit/compare/solutions/client-setup/0.7.0...solutions/client-setup/0.7.1) (2023-11-23)
+
+
+### Bug Fixes
+
+* revert client-folder name to original value  ([#712](https://github.com/GoogleCloudPlatform/pubsec-declarative-toolkit/issues/712)) ([5636b01](https://github.com/GoogleCloudPlatform/pubsec-declarative-toolkit/commit/5636b010b50ba7baf0bb540794ac036601cb32ce))
+
 ## [0.7.0](https://github.com/GoogleCloudPlatform/pubsec-declarative-toolkit/compare/solutions/client-setup/0.6.2...solutions/client-setup/0.7.0) (2023-11-16)
 
 

diff --git a/solutions/client-setup/README.md b/solutions/client-setup/README.md
@@ -18,7 +18,6 @@ Package to setup a client's namespaces, folder, management project and root sync
 | client-management-project-id | client-management-project-12345 | str  |   111 |
 | client-name                  | client1                         | str  |   149 |
 | dns-project-id               | dns-project-12345               | str  |     1 |
-| environment                  | env                             | str  |     1 |
 | management-namespace         | config-control                  | str  |    27 |
 | management-project-id        | management-project-12345        | str  |     6 |
 | management-project-number    |                      0000000000 | str  |     1 |

diff --git a/solutions/client-setup/folder.yaml b/solutions/client-setup/folder.yaml
@@ -18,6 +18,6 @@ metadata:
   name: clients.client-name # kpt-set: clients.${client-name}
   namespace: hierarchy
 spec:
-  displayName: client-name # kpt-set: ${client-name}-${environment}
+  displayName: client-name # kpt-set: ${client-name}
   folderRef:
     name: clients
diff --git a/solutions/client-setup/setters.yaml b/solutions/client-setup/setters.yaml
@@ -42,10 +42,6 @@ data:
   # customization: required
   org-id: "0000000000"
   #
-  # The environment (dev, preprod, prod), used in the client folder display name
-  # customization: required
-  environment: env
-  #
   ##########################
   # Management Project
   ##########################

diff --git a/solutions/core-landing-zone/CHANGELOG.md b/solutions/core-landing-zone/CHANGELOG.md
@@ -1,5 +1,25 @@
 # Changelog
 
+## [0.6.1](https://github.com/GoogleCloudPlatform/pubsec-declarative-toolkit/compare/solutions/core-landing-zone/0.6.0...solutions/core-landing-zone/0.6.1) (2023-11-23)
+
+
+### Bug Fixes
+
+* added anthos api to config controller creation ([#704](https://github.com/GoogleCloudPlatform/pubsec-declarative-toolkit/issues/704)) ([bc7c62e](https://github.com/GoogleCloudPlatform/pubsec-declarative-toolkit/commit/bc7c62e266648aa9c47880508166990add36a84f))
+* update stale org sink refs ([#718](https://github.com/GoogleCloudPlatform/pubsec-declarative-toolkit/issues/718)) ([94eea50](https://github.com/GoogleCloudPlatform/pubsec-declarative-toolkit/commit/94eea504ba4ba4d4a63b9665ce61837f2d1a59c2))
+
+## [0.6.0](https://github.com/GoogleCloudPlatform/pubsec-declarative-toolkit/compare/solutions/core-landing-zone/0.5.0...solutions/core-landing-zone/0.6.0) (2023-11-23)
+
+
+### Features
+
+* add monitoring resources ([#714](https://github.com/GoogleCloudPlatform/pubsec-declarative-toolkit/issues/714)) ([14964df](https://github.com/GoogleCloudPlatform/pubsec-declarative-toolkit/commit/14964df143cfde7b4de1640c8f6ec4113bf9d39f))
+
+
+### Bug Fixes
+
+* rename org sinks add security log bucket ([#707](https://github.com/GoogleCloudPlatform/pubsec-declarative-toolkit/issues/707)) ([e82ae77](https://github.com/GoogleCloudPlatform/pubsec-declarative-toolkit/commit/e82ae774e40a3625e06bb649ee4091a4f547f7f3))
+
 ## [0.5.0](https://github.com/GoogleCloudPlatform/pubsec-declarative-toolkit/compare/solutions/core-landing-zone/0.4.0...solutions/core-landing-zone/0.5.0) (2023-11-16)