From c4a19beff616e1aca5b21b154822680df17391cd Mon Sep 17 00:00:00 2001 From: Gabriel Santos Date: Mon, 5 Feb 2024 22:58:00 +0000 Subject: [PATCH] Fix errors with names and file paths Signed-off-by: Gabriel Santos --- charts/perses/Chart.yaml | 2 +- charts/perses/templates/config.yaml | 2 +- charts/perses/templates/secrets.yaml | 2 +- charts/perses/templates/statefulset.yaml | 8 +++++--- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/charts/perses/Chart.yaml b/charts/perses/Chart.yaml index 67e7fd3..57a4400 100644 --- a/charts/perses/Chart.yaml +++ b/charts/perses/Chart.yaml @@ -4,7 +4,7 @@ description: Perses helm chart icon: https://avatars.githubusercontent.com/u/77209215?s=200&v=4 type: application version: 0.3.0 -appVersion: "0.42.1" +appVersion: "0.43.0" sources: - https://github.com/perses/perses annotations: diff --git a/charts/perses/templates/config.yaml b/charts/perses/templates/config.yaml index 13a81b1..9b8b696 100644 --- a/charts/perses/templates/config.yaml +++ b/charts/perses/templates/config.yaml @@ -13,7 +13,7 @@ data: security: readonly: {{ .Values.config.security.readOnly }} {{- if .Values.config.security.encryptionKeyFile }} - encryption_key_file: {{ .Values.config.security.encryptionKeyFile }} + encryption_key_file: {{ printf "%s/key" (.Values.config.security.encryptionKeyFile | trimSuffix "/") }} {{- else }} encryption_key: {{ .Values.config.security.encryptionKey }} {{- end }} diff --git a/charts/perses/templates/secrets.yaml b/charts/perses/templates/secrets.yaml index 7032c55..523da8c 100644 --- a/charts/perses/templates/secrets.yaml +++ b/charts/perses/templates/secrets.yaml @@ -11,7 +11,7 @@ metadata: {{- end }} type: Opaque data: - encryption_key: {{ .Values.config.security.encryptionKey }} + key: {{ .Values.config.security.encryptionKey | b64enc }} {{- end }} --- diff --git a/charts/perses/templates/statefulset.yaml b/charts/perses/templates/statefulset.yaml index 750f510..bdb0ac5 100644 --- a/charts/perses/templates/statefulset.yaml +++ b/charts/perses/templates/statefulset.yaml @@ -51,7 +51,7 @@ spec: mountPath: /etc/perses/datasources {{- end }} {{- if .Values.config.security.encryptionKeyFile }} - - name: encryptionKey + - name: encryptionkey mountPath: {{ .Values.config.security.encryptionKeyFile }} readOnly: true {{- end }} @@ -104,8 +104,10 @@ spec: name: {{ include "perses.fullname" . }}-datasources {{- end }} {{- if .Values.config.security.encryptionKeyFile }} - - name: encryptionKey + - name: encryptionkey secret: secretName: {{ include "perses.fullname" . }}-encryption-key - items: encryption_key + items: + - key: key + path: "key" {{- end }}