diff --git a/CHANGELOG.md b/CHANGELOG.md index fae96e3..f7a02b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ - Added `nodeSelector` fields for every resource type for better fine-grain tuning of where resources end up. +# 6.2.4 + +- Fixed an issue where redis secrets specified in values or the helm CLI wouldn't be used by the db-prepare job on install. + +# 6.2.3 + +- Updated the Mastodon version to v4.3.7 + # 6.2.2 - `app.kubernetes.io/version` shortens any potential digest hash to 7 characters to avoid hitting the 63 character label limit. diff --git a/Chart.yaml b/Chart.yaml index 044fac1..33382cf 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -20,7 +20,7 @@ version: 6.3.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: "v4.3.6" +appVersion: "v4.3.7" dependencies: - name: elasticsearch diff --git a/templates/_db-migrate.tpl b/templates/_db-migrate.tpl index 12972f3..95d9f4b 100644 --- a/templates/_db-migrate.tpl +++ b/templates/_db-migrate.tpl @@ -102,7 +102,11 @@ spec: - name: "REDIS_PASSWORD" valueFrom: secretKeyRef: + {{- if and (.prepare) (not .Values.redis.enabled) (not .Values.redis.auth.existingSecret) (not .Values.redis.existingSecret) (.Values.redis.auth.password) }} + name: {{ template "mastodon.redis.secretName" . }}-pre-install + {{- else }} name: {{ template "mastodon.redis.secretName" . }} + {{- end }} key: redis-password {{- if .preDeploy }} - name: "SKIP_POST_DEPLOYMENT_MIGRATIONS" diff --git a/templates/secret-redis-preinstall.yaml b/templates/secret-redis-preinstall.yaml new file mode 100644 index 0000000..074e035 --- /dev/null +++ b/templates/secret-redis-preinstall.yaml @@ -0,0 +1,19 @@ +{{- if not .Values.redis.enabled }} +{{- if and (not .Values.redis.auth.existingSecret) (not .Values.redis.existingSecret) }} +{{- if .Values.redis.auth.password }} +apiVersion: v1 +kind: Secret +metadata: + name: {{ include "mastodon.redis.secretName" . }}-pre-install + labels: + {{- include "mastodon.labels" . | nindent 4 }} + annotations: + helm.sh/hook: pre-install + helm.sh/hook-weight: "-5" + "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded +type: Opaque +data: + redis-password: "{{ .Values.redis.auth.password | b64enc }}" +{{- end }} +{{- end }} +{{- end }}