Merge pull request #14 from MammatusPHP/fix-env-order-issue

[mammatus] Fix env order issue
MammatusPHP · Jun 17, 2024 · d124eee · d124eee
2 parents 63a79ca + 49872fe
commit d124eee
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git 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: [email protected]

diff --git 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: