Makes common correctly process TZ, UMASK and lists of environment variables (#160)

.test/charts/common-test_spec.rb

@@ -46,6 +46,8 @@ class Test < ChartTest
         jq('.spec.template.spec.containers[0].env[0].value', resource('Deployment')).must_equal "568"
         jq('.spec.template.spec.containers[0].env[1].name', resource('Deployment')).must_equal 'PGID'
         jq('.spec.template.spec.containers[0].env[1].value', resource('Deployment')).must_equal "568"
+        jq('.spec.template.spec.containers[0].env[2].name', resource('Deployment')).must_equal 'UMASK'
+        jq('.spec.template.spec.containers[0].env[2].value', resource('Deployment')).must_equal "002"
       end
 
       it 'set "static" environment variables' do
@@ -59,8 +61,10 @@ class Test < ChartTest
         jq('.spec.template.spec.containers[0].env[0].value', resource('Deployment')).must_equal "568"
         jq('.spec.template.spec.containers[0].env[1].name', resource('Deployment')).must_equal 'PGID'
         jq('.spec.template.spec.containers[0].env[1].value', resource('Deployment')).must_equal "568"
-        jq('.spec.template.spec.containers[0].env[2].name', resource('Deployment')).must_equal values[:env].keys[0].to_s
+        jq('.spec.template.spec.containers[0].env[2].name', resource('Deployment')).must_equal 'UMASK'
-        jq('.spec.template.spec.containers[0].env[2].value', resource('Deployment')).must_equal values[:env].values[0].to_s
+        jq('.spec.template.spec.containers[0].env[2].value', resource('Deployment')).must_equal "002"
+        jq('.spec.template.spec.containers[0].env[3].name', resource('Deployment')).must_equal values[:env].keys[0].to_s
+        jq('.spec.template.spec.containers[0].env[3].value', resource('Deployment')).must_equal values[:env].values[0].to_s
       end
 
       it 'set "valueFrom" environment variables' do
@@ -78,8 +82,10 @@ class Test < ChartTest
         jq('.spec.template.spec.containers[0].env[0].value', resource('Deployment')).must_equal "568"
         jq('.spec.template.spec.containers[0].env[1].name', resource('Deployment')).must_equal 'PGID'
         jq('.spec.template.spec.containers[0].env[1].value', resource('Deployment')).must_equal "568"
-        jq('.spec.template.spec.containers[0].env[2].name', resource('Deployment')).must_equal values[:envValueFrom].keys[0].to_s
+        jq('.spec.template.spec.containers[0].env[2].name', resource('Deployment')).must_equal 'UMASK'
-        jq('.spec.template.spec.containers[0].env[2].valueFrom | keys[0]', resource('Deployment')).must_equal values[:envValueFrom].values[0].keys[0].to_s
+        jq('.spec.template.spec.containers[0].env[2].value', resource('Deployment')).must_equal "002"
+        jq('.spec.template.spec.containers[0].env[3].name', resource('Deployment')).must_equal values[:envValueFrom].keys[0].to_s
+        jq('.spec.template.spec.containers[0].env[3].valueFrom | keys[0]', resource('Deployment')).must_equal values[:envValueFrom].values[0].keys[0].to_s
       end
 
       it 'set "static" and "Dynamic/Tpl" environment variables' do
@@ -96,10 +102,12 @@ class Test < ChartTest
         jq('.spec.template.spec.containers[0].env[0].value', resource('Deployment')).must_equal "568"
         jq('.spec.template.spec.containers[0].env[1].name', resource('Deployment')).must_equal 'PGID'
         jq('.spec.template.spec.containers[0].env[1].value', resource('Deployment')).must_equal "568"
-        jq('.spec.template.spec.containers[0].env[2].name', resource('Deployment')).must_equal values[:env].keys[0].to_s
+        jq('.spec.template.spec.containers[0].env[2].name', resource('Deployment')).must_equal 'UMASK'
-        jq('.spec.template.spec.containers[0].env[2].value', resource('Deployment')).must_equal values[:env].values[0].to_s
+        jq('.spec.template.spec.containers[0].env[2].value', resource('Deployment')).must_equal "002"
-        jq('.spec.template.spec.containers[0].env[3].name', resource('Deployment')).must_equal values[:envTpl].keys[0].to_s
+        jq('.spec.template.spec.containers[0].env[3].name', resource('Deployment')).must_equal values[:env].keys[0].to_s
-        jq('.spec.template.spec.containers[0].env[3].value', resource('Deployment')).must_equal 'common-test-admin'
+        jq('.spec.template.spec.containers[0].env[3].value', resource('Deployment')).must_equal values[:env].values[0].to_s
+        jq('.spec.template.spec.containers[0].env[4].name', resource('Deployment')).must_equal values[:envTpl].keys[0].to_s
+        jq('.spec.template.spec.containers[0].env[4].value', resource('Deployment')).must_equal 'common-test-admin'
       end
       
       it 'set "Dynamic/Tpl" environment variables' do
@@ -113,8 +121,10 @@ class Test < ChartTest
         jq('.spec.template.spec.containers[0].env[0].value', resource('Deployment')).must_equal "568"
         jq('.spec.template.spec.containers[0].env[1].name', resource('Deployment')).must_equal 'PGID'
         jq('.spec.template.spec.containers[0].env[1].value', resource('Deployment')).must_equal "568"
-        jq('.spec.template.spec.containers[0].env[2].name', resource('Deployment')).must_equal values[:envTpl].keys[0].to_s
+        jq('.spec.template.spec.containers[0].env[2].name', resource('Deployment')).must_equal 'UMASK'
-        jq('.spec.template.spec.containers[0].env[2].value', resource('Deployment')).must_equal 'common-test-admin'
+        jq('.spec.template.spec.containers[0].env[2].value', resource('Deployment')).must_equal "002"
+        jq('.spec.template.spec.containers[0].env[3].name', resource('Deployment')).must_equal values[:envTpl].keys[0].to_s
+        jq('.spec.template.spec.containers[0].env[3].value', resource('Deployment')).must_equal 'common-test-admin'
       end
     end
 

library/common/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: common
 description: Function library for TrueCharts
 type: library
-version: 1.2.0
+version: 1.3.0
 
 kubeVersion: ">=1.16.0-0"
 # upstream_version: 3.0.1

library/common/templates/lib/controller/_container.tpl

@@ -20,7 +20,13 @@ The main container included in the controller.
       value: {{ .Values.PUID | quote }}
     - name: PGID
       value: {{ .Values.PGID | quote }}
-  {{- if or .Values.env .Values.envTpl .Values.envValueFrom .Values.envVariable }}
+    - name: UMASK
+      value: {{ .Values.UMASK | quote }}
+  {{- if .Values.timezone }}
+    - name: TZ
+      value: {{ .Values.timezone | quote }}
+  {{- end }}
+  {{- if or .Values.env .Values.envTpl .Values.envValueFrom .Values.envVariable .Values.environmentVariables }}
   {{- range $envVariable := .Values.environmentVariables }}
   {{- if and $envVariable.name $envVariable.value }}
     - name: {{ $envVariable.name }}

library/common/values.yaml

@@ -453,6 +453,7 @@ addons:
 
 PUID: 568
 PGID: 568
+UMASK: "002"
 
 fixMountPermissions: true
 # appAdditionalServicesEnabled: false