From f2ac150f2aa7fe3022766d45bb0bfd5b4d44c2ac Mon Sep 17 00:00:00 2001 From: zlovtnik Date: Sat, 8 Aug 2026 20:17:09 -0400 Subject: [PATCH] fix: finish dev workload recovery --- cyber-stack/base/java-coordinator/deployment.yaml | 2 +- cyber-stack/matrix/dev/app-stack/kustomization.yaml | 1 + cyber-stack/matrix/dev/data-plane/kustomization.yaml | 1 + cyber-stack/matrix/dev/patches/jaeger-storage.yaml | 12 ++++++++++++ .../matrix/dev/patches/keycloak-recovery.yaml | 10 ++++++++++ helm/ssl-proxy/charts/java-coordinator/values.yaml | 2 +- 6 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 cyber-stack/matrix/dev/patches/jaeger-storage.yaml create mode 100644 cyber-stack/matrix/dev/patches/keycloak-recovery.yaml diff --git a/cyber-stack/base/java-coordinator/deployment.yaml b/cyber-stack/base/java-coordinator/deployment.yaml index 8f2daabb..b8504408 100644 --- a/cyber-stack/base/java-coordinator/deployment.yaml +++ b/cyber-stack/base/java-coordinator/deployment.yaml @@ -292,7 +292,7 @@ spec: - name: TIDB_ENABLED value: "true" - name: TIDB_SCHEMA_MANIFEST_SHA256 - value: "9b3a4105fe026991a5f66f0a6748bd565e67a0c2c76b52cd5d6b05bd279d4f41" + value: "747ff8b2b8e3a0dc6ee1a1a51ed906eaca595b9916d5e466b1893b15649bdad1" - name: TIDB_HOST value: "ssl-proxy-tidb.$(POD_NAMESPACE).svc.cluster.local" - name: TIDB_PORT diff --git a/cyber-stack/matrix/dev/app-stack/kustomization.yaml b/cyber-stack/matrix/dev/app-stack/kustomization.yaml index 521edfed..7013d2f9 100644 --- a/cyber-stack/matrix/dev/app-stack/kustomization.yaml +++ b/cyber-stack/matrix/dev/app-stack/kustomization.yaml @@ -40,6 +40,7 @@ patches: - path: ../patches/identity-hostname.yaml - path: ../patches/proxy-replicas.yaml - path: ../patches/octopus-environment.yaml + - path: ../patches/keycloak-recovery.yaml configurations: - ../../../base/schema-migrator/kustomizeconfig.yaml vars: diff --git a/cyber-stack/matrix/dev/data-plane/kustomization.yaml b/cyber-stack/matrix/dev/data-plane/kustomization.yaml index 8cbd70a7..8ad01aa3 100644 --- a/cyber-stack/matrix/dev/data-plane/kustomization.yaml +++ b/cyber-stack/matrix/dev/data-plane/kustomization.yaml @@ -28,6 +28,7 @@ images: patches: - path: ../patches/tidb-replicas.yaml - path: ../patches/alloy-positions.yaml + - path: ../patches/jaeger-storage.yaml - target: kind: ConfigMap name: ssl-proxy-tidb-config diff --git a/cyber-stack/matrix/dev/patches/jaeger-storage.yaml b/cyber-stack/matrix/dev/patches/jaeger-storage.yaml new file mode 100644 index 00000000..3bfaf17f --- /dev/null +++ b/cyber-stack/matrix/dev/patches/jaeger-storage.yaml @@ -0,0 +1,12 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: ssl-proxy-telemetry-jaeger + namespace: ssl-proxy +spec: + template: + spec: + volumes: + - name: data + persistentVolumeClaim: null + emptyDir: {} diff --git a/cyber-stack/matrix/dev/patches/keycloak-recovery.yaml b/cyber-stack/matrix/dev/patches/keycloak-recovery.yaml new file mode 100644 index 00000000..bbb10eda --- /dev/null +++ b/cyber-stack/matrix/dev/patches/keycloak-recovery.yaml @@ -0,0 +1,10 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: ssl-proxy-schema-migrator-keycloak + namespace: ssl-proxy +spec: + template: + metadata: + annotations: + ssl-proxy.io/recovery-generation: "2026-08-08-1" diff --git a/helm/ssl-proxy/charts/java-coordinator/values.yaml b/helm/ssl-proxy/charts/java-coordinator/values.yaml index 2e24d492..eed8acd3 100644 --- a/helm/ssl-proxy/charts/java-coordinator/values.yaml +++ b/helm/ssl-proxy/charts/java-coordinator/values.yaml @@ -120,7 +120,7 @@ metrics: heartbeatLogIntervalMs: 15000 tidb: enabled: true - schemaManifestSHA256: "9b3a4105fe026991a5f66f0a6748bd565e67a0c2c76b52cd5d6b05bd279d4f41" + schemaManifestSHA256: "747ff8b2b8e3a0dc6ee1a1a51ed906eaca595b9916d5e466b1893b15649bdad1" poolSize: 20 healthcheckReserve: 2 connectionTimeoutMs: 5000