Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cleanup: add drift region tags #611

Merged
merged 10 commits into from
Feb 15, 2022
6 changes: 6 additions & 0 deletions dev-kubernetes-manifests/accounts-db.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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]
4 changes: 4 additions & 0 deletions dev-kubernetes-manifests/balance-reader.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand All @@ -106,3 +109,4 @@ spec:
- name: http
port: 8080
targetPort: 8080
# [END gke_dev_kubernetes_manifests_balance_reader_service_balancereader]
6 changes: 6 additions & 0 deletions dev-kubernetes-manifests/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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]
4 changes: 4 additions & 0 deletions dev-kubernetes-manifests/contacts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand All @@ -84,3 +87,4 @@ spec:
- name: http
port: 8080
targetPort: 8080
# [END gke_dev_kubernetes_manifests_contacts_service_contacts]
4 changes: 4 additions & 0 deletions dev-kubernetes-manifests/frontend.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand All @@ -108,3 +111,4 @@ spec:
- name: http
port: 80
targetPort: 8080
# [END gke_dev_kubernetes_manifests_frontend_service_frontend]
6 changes: 6 additions & 0 deletions dev-kubernetes-manifests/ledger-db.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -81,3 +86,4 @@ spec:
- name: tcp
port: 5432
targetPort: 5432
# [END gke_dev_kubernetes_manifests_ledger_db_service_ledger_db]
4 changes: 4 additions & 0 deletions dev-kubernetes-manifests/ledger-writer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand All @@ -95,3 +98,4 @@ spec:
- name: http
port: 8080
targetPort: 8080
# [END gke_dev_kubernetes_manifests_ledger_writer_service_ledgerwriter]
3 changes: 3 additions & 0 deletions dev-kubernetes-manifests/loadgenerator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -47,3 +49,4 @@ spec:
limits:
cpu: 500m
memory: 1Gi
# [END gke_dev_kubernetes_manifests_loadgenerator_deployment_loadgenerator]
4 changes: 4 additions & 0 deletions dev-kubernetes-manifests/transaction-history.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand All @@ -111,3 +114,4 @@ spec:
- name: http
port: 8080
targetPort: 8080
# [END gke_dev_kubernetes_manifests_transaction_history_service_transactionhistory]
6 changes: 4 additions & 2 deletions dev-kubernetes-manifests/userservice.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand All @@ -94,3 +95,4 @@ spec:
- name: http
port: 8080
targetPort: 8080
# [END gke_dev_kubernetes_manifests_userservice_service_userservice]
6 changes: 4 additions & 2 deletions extras/asm-multicluster/cluster-setup.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#!/bin/bash
# Copyright 2021 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -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
Expand Down Expand Up @@ -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]
18 changes: 17 additions & 1 deletion extras/asm-multicluster/services-all.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -118,4 +134,4 @@ spec:
- name: http
port: 8080
targetPort: 8080

# [END servicemesh_asm_multicluster_services_all_service_userservice]
7 changes: 6 additions & 1 deletion extras/cloudsql-multicluster/multicluster-ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -35,4 +39,5 @@ spec:
spec:
backend:
serviceName: frontend-mcs
servicePort: 8080
servicePort: 8080
# [END gke_cloudsql_multicluster_multicluster_ingress_multiclusteringress_frontend_global_ingress]
Loading