diff --git a/.circleci/values/hydra.yaml b/.circleci/values/hydra.yaml index 2b31f29db..e2402f8ba 100644 --- a/.circleci/values/hydra.yaml +++ b/.circleci/values/hydra.yaml @@ -1,6 +1,6 @@ image: repository: oryd/hydra - tag: v1.10.2-alpine + tag: v1.10.3-alpine pullPolicy: IfNotPresent ingress: @@ -23,7 +23,6 @@ hydra: - "foo bar 123 456 lorem 3" maester: enabled: false - # deployment: # extraVolumes: # - name: my-volume @@ -36,4 +35,4 @@ maester: # watcher: # enabled: true -# mountFile: /etc/secrets/my-secret/foo \ No newline at end of file +# mountFile: /etc/secrets/my-secret/foo diff --git a/helm/charts/hydra/templates/_helpers.tpl b/helm/charts/hydra/templates/_helpers.tpl index fefde825d..5ab2a3ffc 100644 --- a/helm/charts/hydra/templates/_helpers.tpl +++ b/helm/charts/hydra/templates/_helpers.tpl @@ -83,12 +83,16 @@ Generate the secrets.system value {{- define "hydra.secrets.system" -}} {{- if .Values.hydra.config.secrets.system -}} {{- if kindIs "slice" .Values.hydra.config.secrets.system -}} - {{- printf "'%s'" ( mustToRawJson .Values.hydra.config.secrets.system ) -}} + {{- if gt (len .Values.hydra.config.secrets.system) 1 -}} + "{{- join "\",\"" .Values.hydra.config.secrets.system -}}" + {{- else -}} + {{- join "" .Values.hydra.config.secrets.system -}} + {{- end -}} {{- else -}} - {{- fail "Expected .Values.hydra.config.secrets.system to be a list of strings" -}} + {{- fail "Expected hydra.config.secrets.system to be a list of strings" -}} {{- end -}} {{- else if .Values.demo -}} -'["a-very-insecure-secret-for-checking-out-the-demo"]' + a-very-insecure-secret-for-checking-out-the-demo {{- end -}} {{- end -}}