Merge pull request #344 from redpanda-data/ae/fix/7

fix: remove static pointer to user files
redpanda-data · Feb 15, 2023 · 276201e · 276201e
2 parents a8d2a61 + 816a2af
commit 276201e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/charts/redpanda/Chart.yaml b/charts/redpanda/Chart.yaml
@@ -23,7 +23,7 @@ type: application
 # The chart version and the app version are not the same and will not track
 # together. The chart version is a semver representation of changes to this
 # chart.
-version: 2.10.0
+version: 2.10.1
 
 # The app version is the default version of Redpanda to install.
 appVersion: v22.3.12

diff --git a/charts/redpanda/templates/console/deployment.yaml b/charts/redpanda/templates/console/deployment.yaml
@@ -5,7 +5,7 @@
 {{ $command := list }}
 {{ if (include "sasl-enabled" . | fromJson).bool }}
   {{ $command = concat $command (list "sh" "-xc") }}
-  {{ $command = append $command (printf "set -e; IFS=: read -r KAFKA_SASL_USERNAME KAFKA_SASL_PASSWORD KAFKA_SASL_MECHANISM < /mnt/users/users.txt; KAFKA_SASL_MECHANISM=${KAFKA_SASL_MECHANISM:-%s}; export KAFKA_SASL_USERNAME KAFKA_SASL_PASSWORD KAFKA_SASL_MECHANISM; /app/console $@" ( include "sasl-mechanism" . )) }}
+  {{ $command = append $command (printf "set -e; IFS=: read -r KAFKA_SASL_USERNAME KAFKA_SASL_PASSWORD KAFKA_SASL_MECHANISM < $(find /mnt/users/* -print); KAFKA_SASL_MECHANISM=${KAFKA_SASL_MECHANISM:-%s}; export KAFKA_SASL_USERNAME KAFKA_SASL_PASSWORD KAFKA_SASL_MECHANISM; /app/console $@" ( include "sasl-mechanism" . )) }}
   {{ $command = append $command "--" }}
   {{ $extraVolumes = append $extraVolumes (dict
     "name" (printf "%s-users" (include "redpanda.fullname" .))

diff --git a/charts/redpanda/templates/secrets.yaml b/charts/redpanda/templates/secrets.yaml
@@ -65,7 +65,7 @@ stringData:
 
     {{- if and .Values.auth.sasl.enabled (not (empty .Values.auth.sasl.secretRef )) }}
     # Setup and export SASL bootstrap-user
-    IFS=":" read -r USER_NAME PASSWORD MECHANISM < /etc/secrets/users/users.txt
+    IFS=":" read -r USER_NAME PASSWORD MECHANISM < $(find /etc/secrets/users/* -print)
     MECHANISM=${MECHANISM:-{{- include "sasl-mechanism" . }}}
     rpk acl user create ${USER_NAME} --password=${PASSWORD} --mechanism ${MECHANISM} {{ template "rpk-flags-no-sasl" $ }} || true
     {{- end }}