From 0d6d6d826b6587c29de4abdbdea3e1c83741ec8d Mon Sep 17 00:00:00 2001 From: ivan Date: Tue, 6 Oct 2026 22:40:10 +0500 Subject: [PATCH] uralkal: pm and message-hub accept flat kafka secret format KAFKA_SASL_MECHANISM is read from auth.sasl_mechanism when the nested auth map exists and from the top-level sasl_mechanism otherwise, so the pods start both before and after kafka/apps/pm switches to creds delivered from the kafka-topics terraform stack. --- apps/message-hub/uralkal/message-hub.yaml | 2 +- apps/pm/uralkal/backend.yaml | 2 +- apps/pm/uralkal/celery.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/message-hub/uralkal/message-hub.yaml b/apps/message-hub/uralkal/message-hub.yaml index 8087a85..06b7280 100644 --- a/apps/message-hub/uralkal/message-hub.yaml +++ b/apps/message-hub/uralkal/message-hub.yaml @@ -106,5 +106,5 @@ spec: {{- with secret "secrets/data/kafka/apps/pm" -}} KAFKA_USERNAME={{ index .Data.data "username" }} KAFKA_PASSWORD={{ index .Data.data "password" }} - KAFKA_SASL_MECHANISM={{ index .Data.data.auth "sasl_mechanism" }} + KAFKA_SASL_MECHANISM={{ if .Data.data.auth }}{{ index .Data.data.auth "sasl_mechanism" }}{{ else }}{{ index .Data.data "sasl_mechanism" }}{{ end }} {{- end -}} diff --git a/apps/pm/uralkal/backend.yaml b/apps/pm/uralkal/backend.yaml index 22c108f..837dd42 100644 --- a/apps/pm/uralkal/backend.yaml +++ b/apps/pm/uralkal/backend.yaml @@ -204,7 +204,7 @@ spec: vault.hashicorp.com/agent-inject-secret-pm-kafka: secrets/data/kafka/apps/pm vault.hashicorp.com/agent-inject-template-pm-kafka: |- {{- with secret "secrets/data/kafka/apps/pm" -}} - KAFKA_SASL_MECHANISM={{ index .Data.data.auth "sasl_mechanism" }} + KAFKA_SASL_MECHANISM={{ if .Data.data.auth }}{{ index .Data.data.auth "sasl_mechanism" }}{{ else }}{{ index .Data.data "sasl_mechanism" }}{{ end }} KAFKA_SASL_PLAIN_USERNAME={{ index .Data.data "username" }} KAFKA_SASL_PLAIN_PASSWORD={{ index .Data.data "password" }} {{- end -}} diff --git a/apps/pm/uralkal/celery.yaml b/apps/pm/uralkal/celery.yaml index 17df2cf..9e35c66 100644 --- a/apps/pm/uralkal/celery.yaml +++ b/apps/pm/uralkal/celery.yaml @@ -215,7 +215,7 @@ spec: vault.hashicorp.com/agent-inject-secret-pm-kafka: secrets/data/kafka/apps/pm vault.hashicorp.com/agent-inject-template-pm-kafka: |- {{- with secret "secrets/data/kafka/apps/pm" -}} - KAFKA_SASL_MECHANISM={{ index .Data.data.auth "sasl_mechanism" }} + KAFKA_SASL_MECHANISM={{ if .Data.data.auth }}{{ index .Data.data.auth "sasl_mechanism" }}{{ else }}{{ index .Data.data "sasl_mechanism" }}{{ end }} KAFKA_SASL_PLAIN_USERNAME={{ index .Data.data "username" }} KAFKA_SASL_PLAIN_PASSWORD={{ index .Data.data "password" }} {{- end -}}