add support for extraEnv

.github/workflows/helm-publish-on-tag.yml

@@ -2,8 +2,8 @@ name: Helm publish on new tag
 
 on:
   push:
-    tags:
-      - '*'
+    branches:
+      - main
 
 jobs:
   chart-publish-on-tag:

mviewer/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.4.4
+version: 0.4.5
 
 # 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

mviewer/ci/all-optional-values.yaml

@@ -35,6 +35,8 @@ mviewer:
           command: ["/bin/sh", "-c", "echo"]
   extraVolumes: []
   extraVolumeMounts: []
+  extraEnv:
+    FOO: "BAR"
   persistence:
     mviewer_conf:
       annotations:
@@ -72,6 +74,8 @@ elasticsearch:
             - linux
   podAnnotations:
     myapp: mviewer
+  extraEnv:
+    FOO: "BAR"
   lifecycle:
     lifecycle:
       postStart:
@@ -108,6 +112,8 @@ mviewerstudio:
             - linux
   podAnnotations:
     myapp: mviewer
+  extraEnv:
+    FOO: "BAR"
   lifecycle:
     lifecycle:
       postStart:

mviewer/templates/elasticsearch-deployment.yaml

@@ -65,6 +65,9 @@ spec:
             value: "-Dlog4j2.formatMsgNoLookups=true -Dlog4j2.disable.jmx=true"
           - name: discovery.type
             value: "single-node"
+          {{- with $webapp.extraEnv }}
+            {{- toYaml . | nindent 10 }}
+          {{- end }}
         volumeMounts:
         - name: elasticsearch-data
           mountPath: /usr/share/elasticsearch/data

mviewer/templates/mviewer-deployment.yaml

@@ -44,6 +44,10 @@ spec:
       - name: mviewer
         image: "{{ $webapp.image.repository }}:{{ $webapp.image.tag }}"
         imagePullPolicy: {{ $webapp.image.imagePullPolicy }}
+        {{- with $webapp.extraEnv }}
+        env:
+          {{- toYaml . | nindent 10 }}
+        {{- end }}
         resources:
           {{- toYaml $webapp.resources | nindent 10 }}
         securityContext:

mviewer/templates/mviewerstudio-deployment.yaml

@@ -75,7 +75,6 @@ spec:
         - name: DEFAULT_ORG
           value: no_org
         {{- with $webapp.extraEnv }}
-        env:
           {{- toYaml . | nindent 10 }}
         {{- end }}
         resources:

mviewer/values.yaml

@@ -24,6 +24,7 @@ mviewer:
   lifecycle: {}
   extraVolumes: []
   extraVolumeMounts: []
+  extraEnv: {}
   persistence:
     mviewer_conf:
       annotations:
@@ -66,6 +67,7 @@ elasticsearch:
   tolerations: []
   affinity: {}
   podAnnotations: {}
+  extraEnv: {}
   persistence:
     es_data:
       # existingPV: es-data
@@ -135,6 +137,7 @@ mviewerstudio:
   lifecycle: {}
   extraVolumes: []
   extraVolumeMounts: []
+  extraEnv: {}
   persistence:
     mviewerstudio_conf:
       annotations: