diff --git a/iac/tf-anthos-gke/terraform.tfvars b/iac/tf-anthos-gke/terraform.tfvars index fdb2fa731..ea6ae928a 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.0.1" +sync_branch = "release/v1.0.2" sync_rev = "" policy_dir = "/kubernetes-manifests" diff --git a/kubernetes-manifests/accounts-db.yaml b/kubernetes-manifests/accounts-db.yaml index a7a1197b6..e38af53e7 100644 --- a/kubernetes-manifests/accounts-db.yaml +++ b/kubernetes-manifests/accounts-db.yaml @@ -73,7 +73,7 @@ spec: name: accounts-db-config - configMapRef: name: demo-data-config - image: ghcr.io/splunk/bank-of-splunk/accounts-db:v1.0.1@sha256:6c99392ef0085fdedfe9dbbe1f92076ea1390e6bc5bd845fa534591bfae9ff3f + image: ghcr.io/splunk/bank-of-splunk/accounts-db:v1.0.2@sha256:b188aeca2a295cba3754640aeab5ed2978fed34c38cb6bd224077e09fef18265 name: accounts-db ports: - containerPort: 5432 diff --git a/kubernetes-manifests/balance-reader.yaml b/kubernetes-manifests/balance-reader.yaml index 087f8c53f..58d3e022b 100644 --- a/kubernetes-manifests/balance-reader.yaml +++ b/kubernetes-manifests/balance-reader.yaml @@ -87,7 +87,7 @@ spec: name: ledger-db-config - configMapRef: name: demo-data-config - image: ghcr.io/splunk/bank-of-splunk/ledger-db:v1.0.1@sha256:c2a280a258343179c237e487b53ad317f68e59a16ec7f2a6bf49c7e9bdc8e24f + image: ghcr.io/splunk/bank-of-splunk/ledger-db:v1.0.2@sha256:fd67e773a523a88128a02c1109175905e62f1eb66730dde712f72c3fc0b695fb name: postgres ports: - containerPort: 5432 @@ -204,7 +204,7 @@ spec: containers: - env: - name: VERSION - value: v1.0.1 + value: v1.0.2 - name: PORT value: "8080" - name: ENABLE_TRACING @@ -228,7 +228,7 @@ spec: name: environment-config - configMapRef: name: ledger-db-config - image: ghcr.io/splunk/bank-of-splunk/balancereader:v1.0.1@sha256:4eee1982a23711c6b9b0ababf34fea5663d2b43e4c75d1ec668c604e71609566 + image: ghcr.io/splunk/bank-of-splunk/balancereader:v1.0.2@sha256:3405c38a669c804c2f6499fb7488da4005c4ba71394d5b10ac3f9cba4314750f livenessProbe: httpGet: path: /healthy diff --git a/kubernetes-manifests/contacts.yaml b/kubernetes-manifests/contacts.yaml index d747edac0..a89455640 100644 --- a/kubernetes-manifests/contacts.yaml +++ b/kubernetes-manifests/contacts.yaml @@ -86,7 +86,7 @@ spec: name: accounts-db-config - configMapRef: name: demo-data-config - image: ghcr.io/splunk/bank-of-splunk/accounts-db:v1.0.1@sha256:6c99392ef0085fdedfe9dbbe1f92076ea1390e6bc5bd845fa534591bfae9ff3f + image: ghcr.io/splunk/bank-of-splunk/accounts-db:v1.0.2@sha256:b188aeca2a295cba3754640aeab5ed2978fed34c38cb6bd224077e09fef18265 name: accounts-db ports: - containerPort: 5432 @@ -203,19 +203,27 @@ spec: containers: - env: - name: VERSION - value: v1.0.1 + value: v1.0.2 - name: PORT value: "8080" - name: ENABLE_TRACING value: "false" - name: LOG_LEVEL value: info + - name: SPLUNK_OTEL_AGENT + valueFrom: + fieldRef: + fieldPath: status.hostIP + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(SPLUNK_OTEL_AGENT):4317 + - name: OTEL_SERVICE_NAME + value: contacts envFrom: - configMapRef: name: environment-config - configMapRef: name: accounts-db-config - image: ghcr.io/splunk/bank-of-splunk/contacts:v1.0.1@sha256:54207e2c935f25d0fa5094677785ad345bc868264cbfa2b9b60a688668298242 + image: ghcr.io/splunk/bank-of-splunk/contacts:v1.0.2@sha256:5487b8ddadb2f8f49f439ec941083bb63bc8caef7039e9f4f3ae8222c815f95b name: contacts readinessProbe: httpGet: diff --git a/kubernetes-manifests/frontend.yaml b/kubernetes-manifests/frontend.yaml index f32adb63f..dd7216adc 100644 --- a/kubernetes-manifests/frontend.yaml +++ b/kubernetes-manifests/frontend.yaml @@ -63,7 +63,7 @@ spec: containers: - env: - name: VERSION - value: v1.0.1 + value: v1.0.2 - name: PORT value: "8080" - name: ENABLE_TRACING @@ -74,8 +74,40 @@ spec: value: info - name: BANK_NAME value: Bank of Splunk + - name: INSTANCE + valueFrom: + fieldRef: + fieldPath: spec.nodeName - name: CLUSTER_NAME value: $(INSTANCE)-k3s-cluster + - name: RUM_REALM + valueFrom: + secretKeyRef: + key: realm + name: workshop-secret + - name: RUM_AUTH + valueFrom: + secretKeyRef: + key: rum_token + name: workshop-secret + - name: RUM_APP_NAME + valueFrom: + secretKeyRef: + key: app + name: workshop-secret + - name: RUM_ENVIRONMENT + valueFrom: + secretKeyRef: + key: env + name: workshop-secret + - name: SPLUNK_OTEL_AGENT + valueFrom: + fieldRef: + fieldPath: status.hostIP + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(SPLUNK_OTEL_AGENT):4317 + - name: OTEL_SERVICE_NAME + value: frontend - name: DEFAULT_USERNAME valueFrom: configMapKeyRef: @@ -98,34 +130,12 @@ spec: key: DEMO_OAUTH_REDIRECT_URI name: oauth-config optional: true - - name: RUM_REALM - valueFrom: - secretKeyRef: - name: workshop-secret - key: realm - - name: RUM_AUTH - valueFrom: - secretKeyRef: - name: workshop-secret - key: rum_token - - name: RUM_APP_NAME - valueFrom: - secretKeyRef: - name: workshop-secret - key: app - - name: RUM_ENVIRONMENT - valueFrom: - secretKeyRef: - name: workshop-secret - key: env envFrom: - configMapRef: name: environment-config - configMapRef: name: service-api-config - #image: ghcr.io/splunk/bank-of-splunk/frontend:v1.0.1@sha256:6beefbec8b51422fd292af48f810e3d17e88eb90d75339b5adc3dd4f12beda36 - image: localhost:9999/bof/fe-test:v1 - imagePullPolicy: Always + image: ghcr.io/splunk/bank-of-splunk/frontend:v1.0.2@sha256:a74ac3444f49f57a794371b43097447fdf2bdd59884d3385f895318a4dca7f7b livenessProbe: httpGet: path: /ready diff --git a/kubernetes-manifests/ledger-db.yaml b/kubernetes-manifests/ledger-db.yaml index 648723e0d..f78554cc6 100644 --- a/kubernetes-manifests/ledger-db.yaml +++ b/kubernetes-manifests/ledger-db.yaml @@ -74,7 +74,7 @@ spec: name: ledger-db-config - configMapRef: name: demo-data-config - image: ghcr.io/splunk/bank-of-splunk/ledger-db:v1.0.1@sha256:c2a280a258343179c237e487b53ad317f68e59a16ec7f2a6bf49c7e9bdc8e24f + image: ghcr.io/splunk/bank-of-splunk/ledger-db:v1.0.2@sha256:fd67e773a523a88128a02c1109175905e62f1eb66730dde712f72c3fc0b695fb name: postgres ports: - containerPort: 5432 diff --git a/kubernetes-manifests/ledger-writer.yaml b/kubernetes-manifests/ledger-writer.yaml index 7ce9027f8..f341815a9 100644 --- a/kubernetes-manifests/ledger-writer.yaml +++ b/kubernetes-manifests/ledger-writer.yaml @@ -87,7 +87,7 @@ spec: name: ledger-db-config - configMapRef: name: demo-data-config - image: ghcr.io/splunk/bank-of-splunk/ledger-db:v1.0.1@sha256:c2a280a258343179c237e487b53ad317f68e59a16ec7f2a6bf49c7e9bdc8e24f + image: ghcr.io/splunk/bank-of-splunk/ledger-db:v1.0.2@sha256:fd67e773a523a88128a02c1109175905e62f1eb66730dde712f72c3fc0b695fb name: postgres ports: - containerPort: 5432 @@ -204,7 +204,7 @@ spec: containers: - env: - name: VERSION - value: v1.0.1 + value: v1.0.2 - name: PORT value: "8080" - name: ENABLE_TRACING @@ -226,7 +226,7 @@ spec: name: service-api-config - configMapRef: name: ledger-db-config - image: ghcr.io/splunk/bank-of-splunk/ledgerwriter:v1.0.1@sha256:440e1c516cd1a77a3c9344d362ae5075cbf289931a5b303f2095587b1af8a883 + image: ghcr.io/splunk/bank-of-splunk/ledgerwriter:v1.0.2@sha256:26222addac3fa54d6169b4a3468af5012c827160cafa1d94642cf75e639c31bf name: ledgerwriter readinessProbe: httpGet: diff --git a/kubernetes-manifests/loadgenerator.yaml b/kubernetes-manifests/loadgenerator.yaml index e97e22ac0..2c197bfb8 100644 --- a/kubernetes-manifests/loadgenerator.yaml +++ b/kubernetes-manifests/loadgenerator.yaml @@ -45,7 +45,7 @@ spec: value: "5" - name: LOG_LEVEL value: error - image: ghcr.io/splunk/bank-of-splunk/loadgenerator:v1.0.1@sha256:c1742fe2c6a14a20ae636d09d840605aeaf3e3edd0c4ab172fb53027b556d035 + image: ghcr.io/splunk/bank-of-splunk/loadgenerator:v1.0.2@sha256:a413755d178fbefb6537dee65a0ae922f32b2683b168be57ec7cd269756e770a name: loadgenerator resources: limits: diff --git a/kubernetes-manifests/transaction-history.yaml b/kubernetes-manifests/transaction-history.yaml index cbbcc0259..e02b6e324 100644 --- a/kubernetes-manifests/transaction-history.yaml +++ b/kubernetes-manifests/transaction-history.yaml @@ -87,7 +87,7 @@ spec: name: ledger-db-config - configMapRef: name: demo-data-config - image: ghcr.io/splunk/bank-of-splunk/ledger-db:v1.0.1@sha256:c2a280a258343179c237e487b53ad317f68e59a16ec7f2a6bf49c7e9bdc8e24f + image: ghcr.io/splunk/bank-of-splunk/ledger-db:v1.0.2@sha256:fd67e773a523a88128a02c1109175905e62f1eb66730dde712f72c3fc0b695fb name: postgres ports: - containerPort: 5432 @@ -204,7 +204,7 @@ spec: containers: - env: - name: VERSION - value: v1.0.1 + value: v1.0.2 - name: PORT value: "8080" - name: ENABLE_TRACING @@ -232,7 +232,7 @@ spec: name: environment-config - configMapRef: name: ledger-db-config - image: ghcr.io/splunk/bank-of-splunk/transactionhistory:v1.0.1@sha256:973c439eacab411e6ebe514b0047200531468244d2cdee5504d8c873f8a7010b + image: ghcr.io/splunk/bank-of-splunk/transactionhistory:v1.0.2@sha256:46e3e2bdc036a5b409d2e5b94246fd59fa34830282b86e985a2d64d35ef54006 livenessProbe: httpGet: path: /healthy diff --git a/kubernetes-manifests/userservice.yaml b/kubernetes-manifests/userservice.yaml index cbc09b86c..7d939ff03 100644 --- a/kubernetes-manifests/userservice.yaml +++ b/kubernetes-manifests/userservice.yaml @@ -86,7 +86,7 @@ spec: name: accounts-db-config - configMapRef: name: demo-data-config - image: ghcr.io/splunk/bank-of-splunk/accounts-db:v1.0.1@sha256:6c99392ef0085fdedfe9dbbe1f92076ea1390e6bc5bd845fa534591bfae9ff3f + image: ghcr.io/splunk/bank-of-splunk/accounts-db:v1.0.2@sha256:b188aeca2a295cba3754640aeab5ed2978fed34c38cb6bd224077e09fef18265 name: accounts-db ports: - containerPort: 5432 @@ -203,7 +203,7 @@ spec: containers: - env: - name: VERSION - value: v1.0.1 + value: v1.0.2 - name: PORT value: "8080" - name: ENABLE_TRACING @@ -214,12 +214,20 @@ spec: value: /tmp/.ssh/privatekey - name: LOG_LEVEL value: info + - name: SPLUNK_OTEL_AGENT + valueFrom: + fieldRef: + fieldPath: status.hostIP + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(SPLUNK_OTEL_AGENT):4317 + - name: OTEL_SERVICE_NAME + value: userservice envFrom: - configMapRef: name: environment-config - configMapRef: name: accounts-db-config - image: ghcr.io/splunk/bank-of-splunk/userservice:v1.0.1@sha256:c480cab188cb0af7a2f0658df46a67a525e87f92aed48de793d1cbc97ae111a5 + image: ghcr.io/splunk/bank-of-splunk/userservice:v1.0.2@sha256:ec77426bbd9a54a25e9100660e36b25f9b71afab0218f4bdc87ea970d2ff299c name: userservice ports: - containerPort: 8080