From d61abf58dba3627357c2f0cc75377f5d9a3a4f3c Mon Sep 17 00:00:00 2001 From: jenkins Date: Sat, 25 Jul 2026 04:03:49 -0300 Subject: [PATCH] chore(cassandra): deploy owner alias hotfix --- services/cassandra/backend-deployment.yaml | 6 +++--- services/cassandra/configmap.yaml | 1 + services/cassandra/frontend-deployment.yaml | 2 +- services/cassandra/retention-cronjob.yaml | 2 +- services/veles/ingress.yaml | 1 + services/veles/kustomization.yaml | 1 + services/veles/redirect-middleware.yaml | 11 +++++++++++ 7 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 services/veles/redirect-middleware.yaml diff --git a/services/cassandra/backend-deployment.yaml b/services/cassandra/backend-deployment.yaml index c0339570f..d0d6fa7fc 100644 --- a/services/cassandra/backend-deployment.yaml +++ b/services/cassandra/backend-deployment.yaml @@ -22,7 +22,7 @@ spec: labels: app: cassandra-backend annotations: - cassandra.bstein.dev/redeploy: "2026-07-25-0.7.67-builder-spine" + cassandra.bstein.dev/redeploy: "2026-07-25-0.7.68-owner-alias" vault.hashicorp.com/agent-inject: "true" vault.hashicorp.com/agent-init-first: "true" vault.hashicorp.com/agent-pre-populate-only: "true" @@ -63,7 +63,7 @@ spec: type: RuntimeDefault initContainers: - name: database-init - image: registry.bstein.dev/cassandra/cassandra-backend:0.7.67 # {"$imagepolicy": "cassandra:cassandra-backend"} + image: registry.bstein.dev/cassandra/cassandra-backend:0.7.68 # {"$imagepolicy": "cassandra:cassandra-backend"} imagePullPolicy: Always command: ["/bin/sh", "-c"] args: @@ -85,7 +85,7 @@ spec: memory: 512Mi containers: - name: backend - image: registry.bstein.dev/cassandra/cassandra-backend:0.7.67 # {"$imagepolicy": "cassandra:cassandra-backend"} + image: registry.bstein.dev/cassandra/cassandra-backend:0.7.68 # {"$imagepolicy": "cassandra:cassandra-backend"} imagePullPolicy: Always command: ["/bin/sh", "-c"] args: diff --git a/services/cassandra/configmap.yaml b/services/cassandra/configmap.yaml index b456b3b6a..c4da75520 100644 --- a/services/cassandra/configmap.yaml +++ b/services/cassandra/configmap.yaml @@ -18,6 +18,7 @@ data: CASSANDRA_OIDC_REQUIRED_GROUPS: alpha,cassandra-tester,admin CASSANDRA_OIDC_ADMIN_GROUPS: admin CASSANDRA_NAMESPACE: cassandra + CASSANDRA_OWNER_USER_ID_ALIASES: veles-dev=d357688e-e3e4-4f18-9491-a4ed5622deb6 CASSANDRA_SIM_IMAGE: registry.bstein.dev/cassandra/cassandra-sim-worker:0.7.67 # {"$imagepolicy": "cassandra:cassandra-sim-worker"} CASSANDRA_SIM_WORKER_VERSION: "0.7.67" CASSANDRA_GENERATOR_WORKER_VERSION: "0.7.67" diff --git a/services/cassandra/frontend-deployment.yaml b/services/cassandra/frontend-deployment.yaml index cc5a87758..13092eb63 100644 --- a/services/cassandra/frontend-deployment.yaml +++ b/services/cassandra/frontend-deployment.yaml @@ -48,7 +48,7 @@ spec: type: RuntimeDefault containers: - name: frontend - image: registry.bstein.dev/cassandra/cassandra-frontend:0.7.67 # {"$imagepolicy": "cassandra:cassandra-frontend"} + image: registry.bstein.dev/cassandra/cassandra-frontend:0.7.68 # {"$imagepolicy": "cassandra:cassandra-frontend"} imagePullPolicy: Always ports: - name: http diff --git a/services/cassandra/retention-cronjob.yaml b/services/cassandra/retention-cronjob.yaml index 1bfbd8048..19fd9cc60 100644 --- a/services/cassandra/retention-cronjob.yaml +++ b/services/cassandra/retention-cronjob.yaml @@ -38,7 +38,7 @@ spec: type: RuntimeDefault containers: - name: retention - image: registry.bstein.dev/cassandra/cassandra-backend:0.7.67 # {"$imagepolicy": "cassandra:cassandra-backend"} + image: registry.bstein.dev/cassandra/cassandra-backend:0.7.68 # {"$imagepolicy": "cassandra:cassandra-backend"} imagePullPolicy: IfNotPresent command: ["cassandra-hygiene"] args: ["--prune-artifacts"] diff --git a/services/veles/ingress.yaml b/services/veles/ingress.yaml index ae2597f79..2cfa2ab66 100644 --- a/services/veles/ingress.yaml +++ b/services/veles/ingress.yaml @@ -7,6 +7,7 @@ metadata: annotations: cert-manager.io/cluster-issuer: letsencrypt traefik.ingress.kubernetes.io/router.entrypoints: websecure + traefik.ingress.kubernetes.io/router.middlewares: veles-veles-to-cassandra-redirect@kubernetescrd traefik.ingress.kubernetes.io/router.tls: "true" spec: ingressClassName: traefik diff --git a/services/veles/kustomization.yaml b/services/veles/kustomization.yaml index 8aacbd184..f1af10dce 100644 --- a/services/veles/kustomization.yaml +++ b/services/veles/kustomization.yaml @@ -20,6 +20,7 @@ resources: - frontend-deployment.yaml - retention-cronjob.yaml - image.yaml + - redirect-middleware.yaml - ingress.yaml - bootstrap-jobs/veles-secrets-ensure-job.yaml - migration-jobs/cassandra-artifact-export.yaml diff --git a/services/veles/redirect-middleware.yaml b/services/veles/redirect-middleware.yaml new file mode 100644 index 000000000..454ff0e40 --- /dev/null +++ b/services/veles/redirect-middleware.yaml @@ -0,0 +1,11 @@ +# services/veles/redirect-middleware.yaml +apiVersion: traefik.io/v1alpha1 +kind: Middleware +metadata: + name: veles-to-cassandra-redirect + namespace: veles +spec: + redirectRegex: + regex: ^https?://veles\.bstein\.dev(.*) + replacement: https://cassandra.bstein.dev${1} + permanent: true