From 49872fe2ca6b2cfe740163ad46bc28a51479f855 Mon Sep 17 00:00:00 2001 From: Cees-Jan Kiewiet Date: Mon, 17 Jun 2024 22:23:08 +0200 Subject: [PATCH] [mammatus] Fix env order issue --- charts/mammatus/Chart.yaml | 4 ++-- charts/mammatus/templates/_pod.yaml | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/charts/mammatus/Chart.yaml b/charts/mammatus/Chart.yaml index 8d576e2..703ecc0 100644 --- a/charts/mammatus/Chart.yaml +++ b/charts/mammatus/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: mammatus description: MammatusPHP Chart type: application -version: 0.0.9 -appVersion: 0.0.9 +version: 0.0.10 +appVersion: 0.0.10 maintainers: - name: WyriHaximus email: helm@ceesjankiewiet.nl diff --git a/charts/mammatus/templates/_pod.yaml b/charts/mammatus/templates/_pod.yaml index 99472b7..7faed08 100644 --- a/charts/mammatus/templates/_pod.yaml +++ b/charts/mammatus/templates/_pod.yaml @@ -42,16 +42,6 @@ envFrom: - configMapRef: name: env {{- end }} -{{- end -}} - -{{- define "mammatus.volumeMounts" -}} -{{ if .Values.volumes }} -volumeMounts: -{{- range $name, $options := .Values.volumes }} - - name: {{ $name }} - {{ $options.volumeMountOptions | toYaml }} -{{- end -}} -{{- end -}} env: - name: RELEASE_TAG value: {{ .Values.release }} @@ -65,6 +55,16 @@ env: fieldPath: "metadata.namespace" {{- end -}} +{{- define "mammatus.volumeMounts" -}} +{{ if .Values.volumes }} +volumeMounts: +{{- range $name, $options := .Values.volumes }} + - name: {{ $name }} + {{ $options.volumeMountOptions | toYaml }} +{{- end -}} +{{- end -}} +{{- end -}} + {{- define "mammatus.volumes" -}} {{ if .Values.volumes }} volumes: