diff --git a/charts/oada/Chart.yaml b/charts/oada/Chart.yaml index c656c39a..67d30767 100644 --- a/charts/oada/Chart.yaml +++ b/charts/oada/Chart.yaml @@ -8,7 +8,7 @@ maintainers: - name: awlayton email: alex@layton.in type: application -version: 1.2.3 +version: 1.2.4 appVersion: '3.4.1' annotations: artifacthub.io/recommendations: | diff --git a/charts/oada/templates/users.yaml b/charts/oada/templates/users.yaml index a55db709..7cb8a0cc 100644 --- a/charts/oada/templates/users.yaml +++ b/charts/oada/templates/users.yaml @@ -62,6 +62,19 @@ spec: envFrom: - configMapRef: name: {{ $.Chart.Name }}-configmap-{{ $.Release.Name }} + env: + - name: ARANGODB_USERNAME + valueFrom: + secretKeyRef: + name: {{ include "oada.arango.rootPassword" $ }} + key: username + optional: {{ $.Values.global.development }} + - name: ARANGODB_PASSWORD + valueFrom: + secretKeyRef: + name: {{ include "oada.arango.rootPassword" $ }} + key: password + optional: {{ $.Values.global.development }} image: oada/users:{{ $tag }} #imagePullPolicy: {{ $.Values.global.development | ternary "Always" "IfNotPresent" }} command: ["/usr/bin/dumb-init", "--rewrite", "15:2", "--", "/bin/sh"] @@ -77,6 +90,18 @@ spec: secretKeyRef: name: {{ $secretName }} key: token + - name: ARANGODB_USERNAME + valueFrom: + secretKeyRef: + name: {{ include "oada.arango.rootPassword" $ }} + key: username + optional: {{ $.Values.global.development }} + - name: ARANGODB_PASSWORD + valueFrom: + secretKeyRef: + name: {{ include "oada.arango.rootPassword" $ }} + key: password + optional: {{ $.Values.global.development }} image: oada/users:{{ $tag }} #imagePullPolicy: {{ $.Values.global.development | ternary "Always" "IfNotPresent" }} command: ["/usr/bin/dumb-init", "--rewrite", "15:2", "--", "/bin/sh"]