diff --git a/charts/incubator/docspell/Chart.yaml b/charts/incubator/docspell/Chart.yaml index 7f064dc292c..5a2e34bff13 100644 --- a/charts/incubator/docspell/Chart.yaml +++ b/charts/incubator/docspell/Chart.yaml @@ -28,7 +28,7 @@ sources: - https://github.com/eikek/docspell - https://docspell.org/docs/install/docker/ - https://docspell.org/docs/configure/defaults/ -version: 3.0.11 +version: 3.0.12 annotations: truecharts.org/catagories: | - productivity diff --git a/charts/incubator/docspell/templates/_secret.tpl b/charts/incubator/docspell/templates/_secret.tpl index 55677c54ee3..eec9a8f48bb 100644 --- a/charts/incubator/docspell/templates/_secret.tpl +++ b/charts/incubator/docspell/templates/_secret.tpl @@ -13,14 +13,14 @@ {{- $server_secret := "" }} {{- with (lookup "v1" "Secret" .Release.Namespace $storeSecretName) }} -{{- $server_secret = (index .data "server_secret") }} +{{- $server_secret = (index .data "server_secret") | b64dec }} {{- else }} {{/* Real content must be also b64 encoded */}} {{- $server_secret = (printf "b64:%v" (randAlphaNum 32 | b64enc)) | b64enc }} {{- end }} {{- $new_invite_password := "" }} {{- with (lookup "v1" "Secret" .Release.Namespace $storeSecretName) }} -{{- $new_invite_password = (index .data "new_invite_password") }} +{{- $new_invite_password = (index .data "new_invite_password") | b64dec }} {{- else }} {{- $new_invite_password = randAlphaNum 32 | b64enc }} {{- end }} @@ -35,8 +35,8 @@ metadata: labels: {{- include "tc.common.labels" . | nindent 4 }} data: - server_secret: {{ $server_secret }} - new_invite_password: {{ $new_invite_password }} + server_secret: {{ $server_secret | b64enc }} + new_invite_password: {{ $new_invite_password | b64enc }} --- apiVersion: v1 kind: Secret diff --git a/charts/incubator/euterpe/Chart.yaml b/charts/incubator/euterpe/Chart.yaml index 6b222fa23af..916fd25ea3f 100644 --- a/charts/incubator/euterpe/Chart.yaml +++ b/charts/incubator/euterpe/Chart.yaml @@ -25,7 +25,7 @@ sources: - https://github.com/ironsmile/euterpe - https://hub.docker.com/r/ironsmile/euterpe type: application -version: 3.0.1 +version: 3.0.2 annotations: truecharts.org/catagories: | - Productivity diff --git a/charts/incubator/euterpe/templates/_secret.tpl b/charts/incubator/euterpe/templates/_secret.tpl index 1cc8f2cc8e0..ba0ea9005db 100644 --- a/charts/incubator/euterpe/templates/_secret.tpl +++ b/charts/incubator/euterpe/templates/_secret.tpl @@ -6,7 +6,7 @@ {{- $secretKey := "" }} {{- with (lookup "v1" "Secret" .Release.Namespace $secretStorageName) }} - {{- $secretKey = (index .data "secret") }} + {{- $secretKey = (index .data "secret") | b64dec }} {{- else }} {{- $secretKey = randAlphaNum 32 | b64enc }} {{- end }} @@ -32,7 +32,7 @@ stringData: {{- with .Values.euterpe.authentication.password }} "password": {{ . | quote }}, {{- end }} - "secret": {{ $secretKey | b64dec | quote }} + "secret": {{ $secretKey | quote }} }, {{- $libraries := .Values.euterpe.libraries -}} @@ -74,5 +74,5 @@ metadata: {{- include "tc.common.labels" . | nindent 4 }} data: {{/* Store secretKey to reuse */}} - secret: {{ $secretKey }} + secret: {{ $secretKey | b64enc }} {{- end }} diff --git a/charts/incubator/netbox/Chart.yaml b/charts/incubator/netbox/Chart.yaml index ec614a34689..c7e7a29b690 100644 --- a/charts/incubator/netbox/Chart.yaml +++ b/charts/incubator/netbox/Chart.yaml @@ -27,7 +27,7 @@ name: netbox sources: - https://github.com/truecharts/charts/tree/master/charts/incubator/netbox - https://github.com/netbox-community/netbox-docker -version: 3.0.10 +version: 3.0.11 annotations: truecharts.org/catagories: | - network diff --git a/charts/incubator/netbox/templates/_secret.tpl b/charts/incubator/netbox/templates/_secret.tpl index 12b2c97f506..24ac78334ad 100644 --- a/charts/incubator/netbox/templates/_secret.tpl +++ b/charts/incubator/netbox/templates/_secret.tpl @@ -5,7 +5,7 @@ {{- $secret_key := "" }} {{- with (lookup "v1" "Secret" .Release.Namespace $secretName) }} - {{- $secret_key = (index .data "secret_key") }} + {{- $secret_key = (index .data "secret_key") | b64dec }} {{- else }} {{- $secret_key = randAlphaNum 64 | b64enc }} {{- end }} @@ -20,7 +20,7 @@ metadata: labels: {{- include "tc.common.labels" . | nindent 4 }} data: - secret_key: {{ $secret_key }} + secret_key: {{ $secret_key | b64enc }} stringData: config.py: | ALLOWED_HOSTS = [ @@ -57,7 +57,7 @@ stringData: } } - SECRET_KEY = '{{ $secret_key | b64dec }}' + SECRET_KEY = '{{ $secret_key }}' {{- with .Values.netbox.admins }} ADMINS = [