Merge pull request #95 from vania-pooh/master

Ability to pass environment variables to Moon pod containers (fixes #94)
aerokube · Jan 28, 2022 · 2707c8f · 2707c8f
2 parents 1c3fc54 + 689964c
commit 2707c8f
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 0 deletions.
diff --git a/moon/templates/deployment.yaml b/moon/templates/deployment.yaml
@@ -123,6 +123,13 @@ spec:
         {{- else }}
         - -disable-memory-limits
         {{- end }}
+        {{- if .Values.moon.env }}
+        env:
+        {{- range $key, $value := .Values.moon.env }}
+        - name: {{ $key }}
+          value: {{ $value | quote }}
+        {{- end }}
+        {{- end }}
         {{- if .Values.moon.enabled.resources }}
         {{- if .Values.moon.resources }}
         resources:
@@ -168,6 +175,13 @@ spec:
         {{- end }}
         {{- if .Values.moon.enabled.resources }}
         {{- if .Values.moon.api }}
+        {{- if .Values.moon.api.env }}
+        env:
+        {{- range $key, $value := .Values.moon.api.env }}
+        - name: {{ $key }}
+          value: {{ $value | quote }}
+        {{- end }}
+        {{- end }}
         {{- if .Values.moon.api.resources }}
         resources:
 {{ toYaml .Values.moon.api.resources | indent 10 }}
@@ -211,6 +225,13 @@ spec:
         {{- end }}
         {{- if .Values.moon.enabled.resources }}
         {{- if .Values.moon.ui }}
+        {{- if .Values.moon.ui.env }}
+        env:
+        {{- range $key, $value := .Values.moon.ui.env }}
+        - name: {{ $key }}
+          value: {{ $value | quote }}
+        {{- end }}
+        {{- end }}
         {{- if .Values.moon.ui.resources }}
         resources:
 {{ toYaml .Values.moon.ui.resources | indent 10 }}

diff --git a/moon/values.yaml b/moon/values.yaml
@@ -90,6 +90,11 @@ moon:
 #  ##
 #  replicas: 2
 
+#  ##
+#  ## Environment variables passed to moon container.
+#  ##
+#  env: {}
+
   ##
   ## Resources assigned to moon container.
   ##
@@ -139,6 +144,12 @@ moon:
       requests:
         cpu: "0.05"
         memory: 64Mi
+
+#    ##
+#    ## Environment variables passed to moon-api container.
+#    ##
+#    env: {}
+
 #    ##
 #    ## Override moon-api image
 #    ##
@@ -160,6 +171,11 @@ moon:
       requests:
         cpu: "0.05"
         memory: 64Mi
+#    ##
+#    ## Environment variables passed to moon-ui container.
+#    ##
+#    env: {}
+
 #    ##
 #    ## Override moon-ui image
 #    ##