cleanup: add drift region tags (#611)

* Added region tags for gke and service mesh * servicemesh change to sh file * Added servicemesh to istio-manifests * Edited make-release.sh to remove region tags * Edit sed to replace dev with boa * .sh files start tag shift
GoogleCloudPlatform · Feb 15, 2022 · 8c3a5ae · 8c3a5ae
1 parent 539fccf
commit 8c3a5ae
Show file tree

Hide file tree

Showing 45 changed files with 198 additions and 28 deletions.
diff --git a/dev-kubernetes-manifests/accounts-db.yaml b/dev-kubernetes-manifests/accounts-db.yaml
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# [START gke_dev_kubernetes_manifests_accounts_db_statefulset_accounts_db]
 kind: StatefulSet
 apiVersion: apps/v1
 metadata:
@@ -60,7 +61,9 @@ spec:
       volumes:
       - name: postgresdb
         emptyDir: {}
+# [END gke_dev_kubernetes_manifests_accounts_db_statefulset_accounts_db]
 ---
+# [START gke_dev_kubernetes_manifests_accounts_db_service_accounts_db]
 apiVersion: v1
 kind: Service
 metadata:
@@ -77,7 +80,9 @@ spec:
   selector:
     app: accounts-db
     tier: db
+# [END gke_dev_kubernetes_manifests_accounts_db_service_accounts_db]
 ---
+# [START gke_dev_kubernetes_manifests_accounts_db_configmap_accounts_db_config]
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -89,3 +94,4 @@ data:
   POSTGRES_USER: accounts-admin
   POSTGRES_PASSWORD: accounts-pwd
   ACCOUNTS_DB_URI: postgresql://accounts-admin:accounts-pwd@accounts-db:5432/accounts-db
+# [END gke_dev_kubernetes_manifests_accounts_db_configmap_accounts_db_config]
diff --git a/dev-kubernetes-manifests/balance-reader.yaml b/dev-kubernetes-manifests/balance-reader.yaml
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# [START gke_dev_kubernetes_manifests_balance_reader_deployment_balancereader]
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -93,7 +94,9 @@ spec:
           items:
           - key: jwtRS256.key.pub
             path: publickey
+# [END gke_dev_kubernetes_manifests_balance_reader_deployment_balancereader]
 ---
+# [START gke_dev_kubernetes_manifests_balance_reader_service_balancereader]
 apiVersion: v1
 kind: Service
 metadata:
@@ -106,3 +109,4 @@ spec:
   - name: http
     port: 8080
     targetPort: 8080
+# [END gke_dev_kubernetes_manifests_balance_reader_service_balancereader]
diff --git a/dev-kubernetes-manifests/config.yaml b/dev-kubernetes-manifests/config.yaml
@@ -12,14 +12,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# [START gke_dev_kubernetes_manifests_config_configmap_environment_config]
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: environment-config
 data:
   LOCAL_ROUTING_NUM: "883745000"
   PUB_KEY_PATH: "/root/.ssh/publickey"
+# [END gke_dev_kubernetes_manifests_config_configmap_environment_config]
 ---
+# [START gke_dev_kubernetes_manifests_config_configmap_service_api_config]
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -30,7 +33,9 @@ data:
   HISTORY_API_ADDR: "transactionhistory:8080"
   CONTACTS_API_ADDR: "contacts:8080"
   USERSERVICE_API_ADDR: "userservice:8080"
+# [END gke_dev_kubernetes_manifests_config_configmap_service_api_config]
 ---
+# [START gke_dev_kubernetes_manifests_config_configmap_demo_data_config]
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -40,3 +45,4 @@ data:
   DEMO_LOGIN_USERNAME: "testuser"
   # All demo user accounts are hardcoded to use the login password 'password'
   DEMO_LOGIN_PASSWORD: "password"
+# [END gke_dev_kubernetes_manifests_config_configmap_demo_data_config]
diff --git a/dev-kubernetes-manifests/contacts.yaml b/dev-kubernetes-manifests/contacts.yaml
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# [START gke_dev_kubernetes_manifests_contacts_deployment_contacts]
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -71,7 +72,9 @@ spec:
           items:
           - key: jwtRS256.key.pub
             path: publickey
+# [END gke_dev_kubernetes_manifests_contacts_deployment_contacts]
 ---
+# [START gke_dev_kubernetes_manifests_contacts_service_contacts]
 apiVersion: v1
 kind: Service
 metadata:
@@ -84,3 +87,4 @@ spec:
   - name: http
     port: 8080
     targetPort: 8080
+# [END gke_dev_kubernetes_manifests_contacts_service_contacts]
diff --git a/dev-kubernetes-manifests/frontend.yaml b/dev-kubernetes-manifests/frontend.yaml
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# [START gke_dev_kubernetes_manifests_frontend_deployment_frontend]
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -95,7 +96,9 @@ spec:
           items:
           - key: jwtRS256.key.pub
             path: publickey
+# [END gke_dev_kubernetes_manifests_frontend_deployment_frontend]
 ---
+# [START gke_dev_kubernetes_manifests_frontend_service_frontend]
 apiVersion: v1
 kind: Service
 metadata:
@@ -108,3 +111,4 @@ spec:
   - name: http
     port: 80
     targetPort: 8080
+# [END gke_dev_kubernetes_manifests_frontend_service_frontend]
diff --git a/dev-kubernetes-manifests/ledger-db.yaml b/dev-kubernetes-manifests/ledger-db.yaml
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# [START gke_dev_kubernetes_manifests_ledger_db_statefulset_ledger_db]
 kind: StatefulSet
 apiVersion: apps/v1
 metadata:
@@ -54,7 +55,9 @@ spec:
       volumes:
         - name: postgresdb
           emptyDir: {}
+# [END gke_dev_kubernetes_manifests_ledger_db_statefulset_ledger_db]
 ---
+# [START gke_dev_kubernetes_manifests_ledger_db_configmap_ledger_db_config]
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -68,7 +71,9 @@ data:
   SPRING_DATASOURCE_URL: jdbc:postgresql://ledger-db:5432/postgresdb
   SPRING_DATASOURCE_USERNAME: admin # should match POSTGRES_USER
   SPRING_DATASOURCE_PASSWORD: password # should match POSTGRES_PASSWORD
+# [END gke_dev_kubernetes_manifests_ledger_db_configmap_ledger_db_config]
 ---
+# [START gke_dev_kubernetes_manifests_ledger_db_service_ledger_db]
 apiVersion: v1
 kind: Service
 metadata:
@@ -81,3 +86,4 @@ spec:
   - name: tcp
     port: 5432
     targetPort: 5432
+# [END gke_dev_kubernetes_manifests_ledger_db_service_ledger_db]
diff --git a/dev-kubernetes-manifests/ledger-writer.yaml b/dev-kubernetes-manifests/ledger-writer.yaml
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# [START gke_dev_kubernetes_manifests_ledger_writer_deployment_ledgerwriter]
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -82,7 +83,9 @@ spec:
           items:
           - key: jwtRS256.key.pub
             path: publickey
+# [END gke_dev_kubernetes_manifests_ledger_writer_deployment_ledgerwriter]
 ---
+# [START gke_dev_kubernetes_manifests_ledger_writer_service_ledgerwriter]
 apiVersion: v1
 kind: Service
 metadata:
@@ -95,3 +98,4 @@ spec:
   - name: http
     port: 8080
     targetPort: 8080
+# [END gke_dev_kubernetes_manifests_ledger_writer_service_ledgerwriter]
diff --git a/dev-kubernetes-manifests/loadgenerator.yaml b/dev-kubernetes-manifests/loadgenerator.yaml
@@ -11,6 +11,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
+# [START gke_dev_kubernetes_manifests_loadgenerator_deployment_loadgenerator]
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -47,3 +49,4 @@ spec:
           limits:
             cpu: 500m
             memory: 1Gi
+# [END gke_dev_kubernetes_manifests_loadgenerator_deployment_loadgenerator]
diff --git a/dev-kubernetes-manifests/transaction-history.yaml b/dev-kubernetes-manifests/transaction-history.yaml
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# [START gke_dev_kubernetes_manifests_transaction_history_deployment_transactionhistory]
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -98,7 +99,9 @@ spec:
           items:
           - key: jwtRS256.key.pub
             path: publickey
+# [END gke_dev_kubernetes_manifests_transaction_history_deployment_transactionhistory]
 ---
+# [START gke_dev_kubernetes_manifests_transaction_history_service_transactionhistory]
 apiVersion: v1
 kind: Service
 metadata:
@@ -111,3 +114,4 @@ spec:
   - name: http
     port: 8080
     targetPort: 8080
+# [END gke_dev_kubernetes_manifests_transaction_history_service_transactionhistory]
diff --git a/dev-kubernetes-manifests/userservice.yaml b/dev-kubernetes-manifests/userservice.yaml
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# [START gke_dev_kubernetes_manifests_userservice_deployment_userservice]
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -79,9 +80,9 @@ spec:
             path: privatekey
           - key: jwtRS256.key.pub
             path: publickey
-
-
+# [END gke_dev_kubernetes_manifests_userservice_deployment_userservice]
 ---
+# [START gke_dev_kubernetes_manifests_userservice_service_userservice]
 apiVersion: v1
 kind: Service
 metadata:
@@ -94,3 +95,4 @@ spec:
   - name: http
     port: 8080
     targetPort: 8080
+# [END gke_dev_kubernetes_manifests_userservice_service_userservice]
diff --git a/extras/asm-multicluster/cluster-setup.sh b/extras/asm-multicluster/cluster-setup.sh
@@ -1,3 +1,4 @@
+#!/bin/bash 
 # Copyright 2021 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-#!/bin/bash 
+# [START servicemesh_asm_multicluster_cluster_setup]
 
 # USES ASM 1.9 - SINGLE PROJECT - GOOGLE-MANAGED CONTROL PLANE 
 # https://cloud.google.com/service-mesh/docs/gke-install-multi-cluster 
@@ -164,4 +165,5 @@ gcloud projects add-iam-policy-binding ${PROJECT_ID} \
   --member "serviceAccount:${GSA_NAME}@${PROJECT_ID}.iam.gserviceaccount.com" \
   --role roles/monitoring.metricWriter
 
-echo "✅ Done setting up clusters."
+echo "✅ Done setting up clusters."
+# [END servicemesh_asm_multicluster_cluster_setup]
diff --git a/extras/asm-multicluster/services-all.yaml b/extras/asm-multicluster/services-all.yaml
@@ -11,6 +11,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
+# [START servicemesh_asm_multicluster_services_all_service_accounts_db]
 apiVersion: v1
 kind: Service
 metadata:
@@ -27,7 +29,9 @@ spec:
   selector:
     app: accounts-db
     tier: db
+# [END servicemesh_asm_multicluster_services_all_service_accounts_db]
 ---
+# [START servicemesh_asm_multicluster_services_all_service_balancereader]
 apiVersion: v1
 kind: Service
 metadata:
@@ -40,7 +44,9 @@ spec:
   - name: http
     port: 8080
     targetPort: 8080
+# [END servicemesh_asm_multicluster_services_all_service_balancereader]
 ---
+# [START servicemesh_asm_multicluster_services_all_service_contacts]
 apiVersion: v1
 kind: Service
 metadata:
@@ -53,7 +59,9 @@ spec:
   - name: http
     port: 8080
     targetPort: 8080
+# [END servicemesh_asm_multicluster_services_all_service_contacts]
 ---
+# [START servicemesh_asm_multicluster_services_all_service_frontend]
 apiVersion: v1
 kind: Service
 metadata:
@@ -66,7 +74,9 @@ spec:
   - name: http
     port: 80
     targetPort: 8080
+# [END servicemesh_asm_multicluster_services_all_service_frontend]
 ---
+# [START servicemesh_asm_multicluster_services_all_service_ledger_db]
 apiVersion: v1
 kind: Service
 metadata:
@@ -79,7 +89,9 @@ spec:
   - name: tcp
     port: 5432
     targetPort: 5432
+# [END servicemesh_asm_multicluster_services_all_service_ledger_db]
 ---
+# [START servicemesh_asm_multicluster_services_all_service_ledgerwriter]
 apiVersion: v1
 kind: Service
 metadata:
@@ -92,7 +104,9 @@ spec:
   - name: http
     port: 8080
     targetPort: 8080
+# [END servicemesh_asm_multicluster_services_all_service_ledgerwriter]
 ---
+# [START servicemesh_asm_multicluster_services_all_service_transactionhistory]
 apiVersion: v1
 kind: Service
 metadata:
@@ -105,7 +119,9 @@ spec:
   - name: http
     port: 8080
     targetPort: 8080
+# [END servicemesh_asm_multicluster_services_all_service_transactionhistory]
 ---
+# [START servicemesh_asm_multicluster_services_all_service_userservice]
 apiVersion: v1
 kind: Service
 metadata:
@@ -118,4 +134,4 @@ spec:
   - name: http
     port: 8080
     targetPort: 8080
-
+# [END servicemesh_asm_multicluster_services_all_service_userservice]
diff --git a/extras/cloudsql-multicluster/multicluster-ingress.yaml b/extras/cloudsql-multicluster/multicluster-ingress.yaml
@@ -11,6 +11,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
+# [START gke_cloudsql_multicluster_multicluster_ingress_multiclusterservice_frontend_mcs]
 apiVersion: networking.gke.io/v1
 kind: MultiClusterService
 metadata:
@@ -25,7 +27,9 @@ spec:
         protocol: TCP
         port: 8080
         targetPort: 8080
+# [END gke_cloudsql_multicluster_multicluster_ingress_multiclusterservice_frontend_mcs]
 ---
+# [START gke_cloudsql_multicluster_multicluster_ingress_multiclusteringress_frontend_global_ingress]
 apiVersion: networking.gke.io/v1
 kind: MultiClusterIngress
 metadata:
@@ -35,4 +39,5 @@ spec:
     spec:
       backend:
         serviceName: frontend-mcs
-        servicePort: 8080
+        servicePort: 8080
+# [END gke_cloudsql_multicluster_multicluster_ingress_multiclusteringress_frontend_global_ingress]