3
0
mirror of https://github.com/mastodon/chart synced 2025-05-19 05:23:21 +00:00

Rename extraEnvironment to extraEnvFrom

This commit is contained in:
Tim Campbell 2024-02-16 08:46:58 +01:00
parent a9820afb07
commit 250ebf75e9
4 changed files with 7 additions and 7 deletions

View File

@ -84,9 +84,9 @@ spec:
name: {{ include "mastodon.fullname" $context }}-env name: {{ include "mastodon.fullname" $context }}-env
- secretRef: - secretRef:
name: {{ template "mastodon.secretName" $context }} name: {{ template "mastodon.secretName" $context }}
{{- if $context.Values.mastodon.extraEnvironment }} {{- if $context.Values.mastodon.extraEnvFrom }}
- configMapRef: - configMapRef:
name: {{ $context.Values.mastodon.extraEnvironment }} name: {{ $context.Values.mastodon.extraEnvFrom }}
{{- end}} {{- end}}
env: env:
- name: "DB_PASS" - name: "DB_PASS"

View File

@ -49,9 +49,9 @@ spec:
envFrom: envFrom:
- configMapRef: - configMapRef:
name: {{ include "mastodon.fullname" . }}-env name: {{ include "mastodon.fullname" . }}-env
{{- if .Values.mastodon.extraEnvironment }} {{- if .Values.mastodon.extraEnvFrom }}
- configMapRef: - configMapRef:
name: {{ .Values.mastodon.extraEnvironment }} name: {{ .Values.mastodon.extraEnvFrom }}
{{- end}} {{- end}}
env: env:
- name: "DB_PASS" - name: "DB_PASS"

View File

@ -65,9 +65,9 @@ spec:
name: {{ include "mastodon.fullname" . }}-env name: {{ include "mastodon.fullname" . }}-env
- secretRef: - secretRef:
name: {{ template "mastodon.secretName" . }} name: {{ template "mastodon.secretName" . }}
{{- if .Values.mastodon.extraEnvironment }} {{- if .Values.mastodon.extraEnvFrom }}
- configMapRef: - configMapRef:
name: {{ .Values.mastodon.extraEnvironment }} name: {{ .Values.mastodon.extraEnvFrom }}
{{- end}} {{- end}}
env: env:
- name: "DB_PASS" - name: "DB_PASS"

View File

@ -209,7 +209,7 @@ mastodon:
# Specify extra environment variables to be added to all Mastodon pods. # Specify extra environment variables to be added to all Mastodon pods.
# These can be used for configuration not included in this chart (including configuration for Mastodon varietals.) # These can be used for configuration not included in this chart (including configuration for Mastodon varietals.)
# The specified ConfigMap should contain the additional environment variables in key-value format. # The specified ConfigMap should contain the additional environment variables in key-value format.
# extraEnvironment: <config-map-name> # extraEnvFrom: <config-map-name>
ingress: ingress:
enabled: true enabled: true