From eadc2499207d52777b43ce1de3479a076a5bf7c0 Mon Sep 17 00:00:00 2001 From: Robert Castley Date: Sat, 12 Oct 2024 17:06:27 +0100 Subject: [PATCH] release/v1.2.2 --- iac/tf-anthos-gke/terraform.tfvars | 2 +- kubernetes-manifests/accounts-db.yaml | 4 +- kubernetes-manifests/balance-reader.yaml | 22 ++--- kubernetes-manifests/contacts.yaml | 22 ++--- kubernetes-manifests/frontend.yaml | 86 +++---------------- kubernetes-manifests/ledger-db.yaml | 4 +- kubernetes-manifests/ledger-writer.yaml | 22 ++--- kubernetes-manifests/transaction-history.yaml | 22 ++--- kubernetes-manifests/userservice.yaml | 22 ++--- 9 files changed, 70 insertions(+), 136 deletions(-) diff --git a/iac/tf-anthos-gke/terraform.tfvars b/iac/tf-anthos-gke/terraform.tfvars index c7ac7016f..2697da9ee 100644 --- a/iac/tf-anthos-gke/terraform.tfvars +++ b/iac/tf-anthos-gke/terraform.tfvars @@ -18,6 +18,6 @@ region = "us-central1" zone = "us-central1-b" cluster_name = "anthos-sample-cluster1" sync_repo = "https://github.com/GoogleCloudPlatform/bank-of-anthos" -sync_branch = "release/v1.2.1" +sync_branch = "release/v1.2.2" sync_rev = "" policy_dir = "/kubernetes-manifests" diff --git a/kubernetes-manifests/accounts-db.yaml b/kubernetes-manifests/accounts-db.yaml index 52332e9c0..e2b7b0ffd 100644 --- a/kubernetes-manifests/accounts-db.yaml +++ b/kubernetes-manifests/accounts-db.yaml @@ -9,8 +9,8 @@ metadata: labels: app: accounts-db application: bank-of-splunk - environment: production + cluster: staging team: accounts tier: db name: accounts-db-config - namespace: bank-of-anthos-production + namespace: bank-of-anthos-staging diff --git a/kubernetes-manifests/balance-reader.yaml b/kubernetes-manifests/balance-reader.yaml index c41e9c47a..b27bd3970 100644 --- a/kubernetes-manifests/balance-reader.yaml +++ b/kubernetes-manifests/balance-reader.yaml @@ -24,22 +24,22 @@ metadata: labels: app: ledger-db application: bank-of-splunk - environment: production + cluster: staging team: ledger tier: db name: ledger-db-config - namespace: bank-of-anthos-production + namespace: bank-of-anthos-staging --- apiVersion: v1 kind: Service metadata: labels: application: bank-of-splunk - environment: production + cluster: staging team: ledger tier: backend name: balancereader - namespace: bank-of-anthos-production + namespace: bank-of-anthos-staging spec: ports: - name: http @@ -48,7 +48,7 @@ spec: selector: app: balancereader application: bank-of-splunk - environment: production + cluster: staging team: ledger tier: backend type: ClusterIP @@ -58,17 +58,17 @@ kind: Deployment metadata: labels: application: bank-of-splunk - environment: production + cluster: staging team: ledger tier: backend name: balancereader - namespace: bank-of-anthos-production + namespace: bank-of-anthos-staging spec: selector: matchLabels: app: balancereader application: bank-of-splunk - environment: production + cluster: staging team: ledger tier: backend template: @@ -77,14 +77,14 @@ spec: labels: app: balancereader application: bank-of-splunk - environment: production + cluster: staging team: ledger tier: backend spec: containers: - env: - name: VERSION - value: v1.2.1 + value: v1.2.2 - name: PORT value: "8080" - name: ENABLE_TRACING @@ -108,7 +108,7 @@ spec: name: environment-config - configMapRef: name: ledger-db-config - image: ghcr.io/splunk/bank-of-splunk/balancereader:v1.2.1@sha256:928b892a9bbe3db70e68542a7e8b72796a35870c07f4e87b287c29576ddbba30 + image: ghcr.io/splunk/bank-of-splunk/balancereader:v1.2.2@sha256:928b892a9bbe3db70e68542a7e8b72796a35870c07f4e87b287c29576ddbba30 livenessProbe: httpGet: path: /healthy diff --git a/kubernetes-manifests/contacts.yaml b/kubernetes-manifests/contacts.yaml index 3e2ac4cc6..2a65b9e2e 100644 --- a/kubernetes-manifests/contacts.yaml +++ b/kubernetes-manifests/contacts.yaml @@ -22,22 +22,22 @@ metadata: labels: app: accounts-db application: bank-of-splunk - environment: production + cluster: staging team: accounts tier: db name: accounts-db-config - namespace: bank-of-anthos-production + namespace: bank-of-anthos-staging --- apiVersion: v1 kind: Service metadata: labels: application: bank-of-splunk - environment: production + cluster: staging team: accounts tier: backend name: contacts - namespace: bank-of-anthos-production + namespace: bank-of-anthos-staging spec: ports: - name: http @@ -46,7 +46,7 @@ spec: selector: app: contacts application: bank-of-splunk - environment: production + cluster: staging team: accounts tier: backend type: ClusterIP @@ -56,17 +56,17 @@ kind: Deployment metadata: labels: application: bank-of-splunk - environment: production + cluster: staging team: accounts tier: backend name: contacts - namespace: bank-of-anthos-production + namespace: bank-of-anthos-staging spec: selector: matchLabels: app: contacts application: bank-of-splunk - environment: production + cluster: staging team: accounts tier: backend template: @@ -75,14 +75,14 @@ spec: labels: app: contacts application: bank-of-splunk - environment: production + cluster: staging team: accounts tier: backend spec: containers: - env: - name: VERSION - value: v1.2.1 + value: v1.2.2 - name: PORT value: "8080" - name: ENABLE_TRACING @@ -102,7 +102,7 @@ spec: name: environment-config - configMapRef: name: accounts-db-config - image: ghcr.io/splunk/bank-of-splunk/contacts:v1.2.1@sha256:bfe6d8970e967130c972779b47bef1999afc3d698cc80c56cade5a52dcc0aa64 + image: ghcr.io/splunk/bank-of-splunk/contacts:v1.2.2@sha256:bfe6d8970e967130c972779b47bef1999afc3d698cc80c56cade5a52dcc0aa64 name: contacts readinessProbe: httpGet: diff --git a/kubernetes-manifests/frontend.yaml b/kubernetes-manifests/frontend.yaml index 87ca4c7f5..10cc6fd77 100644 --- a/kubernetes-manifests/frontend.yaml +++ b/kubernetes-manifests/frontend.yaml @@ -14,16 +14,13 @@ apiVersion: v1 kind: Service metadata: - annotations: - cloud.google.com/backend-config: '{"default": "frontend-backend-config"}' - cloud.google.com/neg: '{"ingress": true}' labels: application: bank-of-splunk - environment: production + cluster: staging team: frontend tier: web name: frontend - namespace: bank-of-anthos-production + namespace: bank-of-anthos-staging spec: ports: - name: http @@ -32,27 +29,27 @@ spec: selector: app: frontend application: bank-of-splunk - environment: production + cluster: staging team: frontend tier: web - type: ClusterIP + type: LoadBalancer --- apiVersion: apps/v1 kind: Deployment metadata: labels: application: bank-of-splunk - environment: production + cluster: staging team: frontend tier: web name: frontend - namespace: bank-of-anthos-production + namespace: bank-of-anthos-staging spec: selector: matchLabels: app: frontend application: bank-of-splunk - environment: production + cluster: staging team: frontend tier: web template: @@ -61,14 +58,14 @@ spec: labels: app: frontend application: bank-of-splunk - environment: production + cluster: staging team: frontend tier: web spec: containers: - env: - name: VERSION - value: v1.2.1 + value: v1.2.2 - name: PORT value: "8080" - name: ENABLE_TRACING @@ -146,7 +143,7 @@ spec: name: environment-config - configMapRef: name: service-api-config - image: ghcr.io/splunk/bank-of-splunk/frontend:v1.2.1@sha256:b3cd2828e76ba3197e51d198cfceb09c61f387ffdb9ebace33a5410898cc2bbe + image: ghcr.io/splunk/bank-of-splunk/frontend:v1.2.2@sha256:b3cd2828e76ba3197e51d198cfceb09c61f387ffdb9ebace33a5410898cc2bbe livenessProbe: httpGet: path: /ready @@ -198,66 +195,3 @@ spec: - key: jwtRS256.key.pub path: publickey secretName: jwt-key ---- -apiVersion: cloud.google.com/v1 -kind: BackendConfig -metadata: - labels: - environment: production - name: frontend-backend-config - namespace: bank-of-anthos-production -spec: - securityPolicy: - name: bank-of-anthos-security-policy ---- -apiVersion: networking.gke.io/v1 -kind: ManagedCertificate -metadata: - labels: - environment: production - name: bank-of-anthos-cert - namespace: bank-of-anthos-production -spec: - domains: - - cymbal-bank.fsi.cymbal.dev ---- -apiVersion: networking.gke.io/v1beta1 -kind: FrontendConfig -metadata: - labels: - environment: production - name: frontend-frontend-config - namespace: bank-of-anthos-production -spec: - redirectToHttps: - enabled: true - responseCodeName: MOVED_PERMANENTLY_DEFAULT - sslPolicy: bank-of-anthos-ssl-policy ---- -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - annotations: - kubernetes.io/ingress.global-static-ip-name: bank-of-anthos-ip - networking.gke.io/managed-certificates: bank-of-anthos-cert - networking.gke.io/v1beta1.FrontendConfig: frontend-frontend-config - labels: - environment: production - name: frontend-ingress - namespace: bank-of-anthos-production -spec: - defaultBackend: - service: - name: frontend - port: - number: 80 - rules: - - http: - paths: - - backend: - service: - name: frontend - port: - number: 80 - path: /* - pathType: ImplementationSpecific diff --git a/kubernetes-manifests/ledger-db.yaml b/kubernetes-manifests/ledger-db.yaml index 7747b4ba7..955ee9cdc 100644 --- a/kubernetes-manifests/ledger-db.yaml +++ b/kubernetes-manifests/ledger-db.yaml @@ -11,8 +11,8 @@ metadata: labels: app: ledger-db application: bank-of-splunk - environment: production + cluster: staging team: ledger tier: db name: ledger-db-config - namespace: bank-of-anthos-production + namespace: bank-of-anthos-staging diff --git a/kubernetes-manifests/ledger-writer.yaml b/kubernetes-manifests/ledger-writer.yaml index 9526cf8b6..1566f076f 100644 --- a/kubernetes-manifests/ledger-writer.yaml +++ b/kubernetes-manifests/ledger-writer.yaml @@ -24,22 +24,22 @@ metadata: labels: app: ledger-db application: bank-of-splunk - environment: production + cluster: staging team: ledger tier: db name: ledger-db-config - namespace: bank-of-anthos-production + namespace: bank-of-anthos-staging --- apiVersion: v1 kind: Service metadata: labels: application: bank-of-splunk - environment: production + cluster: staging team: ledger tier: backend name: ledgerwriter - namespace: bank-of-anthos-production + namespace: bank-of-anthos-staging spec: ports: - name: http @@ -48,7 +48,7 @@ spec: selector: app: ledgerwriter application: bank-of-splunk - environment: production + cluster: staging team: ledger tier: backend type: ClusterIP @@ -58,17 +58,17 @@ kind: Deployment metadata: labels: application: bank-of-splunk - environment: production + cluster: staging team: ledger tier: backend name: ledgerwriter - namespace: bank-of-anthos-production + namespace: bank-of-anthos-staging spec: selector: matchLabels: app: ledgerwriter application: bank-of-splunk - environment: production + cluster: staging team: ledger tier: backend template: @@ -77,14 +77,14 @@ spec: labels: app: ledgerwriter application: bank-of-splunk - environment: production + cluster: staging team: ledger tier: backend spec: containers: - env: - name: VERSION - value: v1.2.1 + value: v1.2.2 - name: PORT value: "8080" - name: ENABLE_TRACING @@ -106,7 +106,7 @@ spec: name: service-api-config - configMapRef: name: ledger-db-config - image: ghcr.io/splunk/bank-of-splunk/ledgerwriter:v1.2.1@sha256:a257d61f349d13e26d1f2e556d5ff83792d388f97f7402854ce426eceac18e4c + image: ghcr.io/splunk/bank-of-splunk/ledgerwriter:v1.2.2@sha256:a257d61f349d13e26d1f2e556d5ff83792d388f97f7402854ce426eceac18e4c name: ledgerwriter readinessProbe: httpGet: diff --git a/kubernetes-manifests/transaction-history.yaml b/kubernetes-manifests/transaction-history.yaml index c0a8bc894..f3c6323ff 100644 --- a/kubernetes-manifests/transaction-history.yaml +++ b/kubernetes-manifests/transaction-history.yaml @@ -24,22 +24,22 @@ metadata: labels: app: ledger-db application: bank-of-splunk - environment: production + cluster: staging team: ledger tier: db name: ledger-db-config - namespace: bank-of-anthos-production + namespace: bank-of-anthos-staging --- apiVersion: v1 kind: Service metadata: labels: application: bank-of-splunk - environment: production + cluster: staging team: ledger tier: backend name: transactionhistory - namespace: bank-of-anthos-production + namespace: bank-of-anthos-staging spec: ports: - name: http @@ -48,7 +48,7 @@ spec: selector: app: transactionhistory application: bank-of-splunk - environment: production + cluster: staging team: ledger tier: backend type: ClusterIP @@ -58,17 +58,17 @@ kind: Deployment metadata: labels: application: bank-of-splunk - environment: production + cluster: staging team: ledger tier: backend name: transactionhistory - namespace: bank-of-anthos-production + namespace: bank-of-anthos-staging spec: selector: matchLabels: app: transactionhistory application: bank-of-splunk - environment: production + cluster: staging team: ledger tier: backend template: @@ -77,14 +77,14 @@ spec: labels: app: transactionhistory application: bank-of-splunk - environment: production + cluster: staging team: ledger tier: backend spec: containers: - env: - name: VERSION - value: v1.2.1 + value: v1.2.2 - name: PORT value: "8080" - name: ENABLE_TRACING @@ -112,7 +112,7 @@ spec: name: environment-config - configMapRef: name: ledger-db-config - image: ghcr.io/splunk/bank-of-splunk/transactionhistory:v1.2.1@sha256:d0fbbb9fe6f3589c0372301ad159975af5cb309891f135444cca49092e66aaa6 + image: ghcr.io/splunk/bank-of-splunk/transactionhistory:v1.2.2@sha256:d0fbbb9fe6f3589c0372301ad159975af5cb309891f135444cca49092e66aaa6 livenessProbe: httpGet: path: /healthy diff --git a/kubernetes-manifests/userservice.yaml b/kubernetes-manifests/userservice.yaml index 55f69f0fa..34e86843a 100644 --- a/kubernetes-manifests/userservice.yaml +++ b/kubernetes-manifests/userservice.yaml @@ -22,22 +22,22 @@ metadata: labels: app: accounts-db application: bank-of-splunk - environment: production + cluster: staging team: accounts tier: db name: accounts-db-config - namespace: bank-of-anthos-production + namespace: bank-of-anthos-staging --- apiVersion: v1 kind: Service metadata: labels: application: bank-of-splunk - environment: production + cluster: staging team: accounts tier: backend name: userservice - namespace: bank-of-anthos-production + namespace: bank-of-anthos-staging spec: ports: - name: http @@ -46,7 +46,7 @@ spec: selector: app: userservice application: bank-of-splunk - environment: production + cluster: staging team: accounts tier: backend type: ClusterIP @@ -56,17 +56,17 @@ kind: Deployment metadata: labels: application: bank-of-splunk - environment: production + cluster: staging team: accounts tier: backend name: userservice - namespace: bank-of-anthos-production + namespace: bank-of-anthos-staging spec: selector: matchLabels: app: userservice application: bank-of-splunk - environment: production + cluster: staging team: accounts tier: backend template: @@ -75,14 +75,14 @@ spec: labels: app: userservice application: bank-of-splunk - environment: production + cluster: staging team: accounts tier: backend spec: containers: - env: - name: VERSION - value: v1.2.1 + value: v1.2.2 - name: PORT value: "8080" - name: ENABLE_TRACING @@ -106,7 +106,7 @@ spec: name: environment-config - configMapRef: name: accounts-db-config - image: ghcr.io/splunk/bank-of-splunk/userservice:v1.2.1@sha256:f39d0b4e1cf6b4843e521020d58fa89d4ef7f55743b5035c258db6354c53ee70 + image: ghcr.io/splunk/bank-of-splunk/userservice:v1.2.2@sha256:f39d0b4e1cf6b4843e521020d58fa89d4ef7f55743b5035c258db6354c53ee70 name: userservice ports: - containerPort: 8080