fix(Apps): BREAKING CHANGE Move some env-vars outside of env section (#…

…2010) * set TZ, PUID and UMASK differently * more fixes * this might be breaking so bump major * ensure PUID and UMASK references are updated * update test * fiz references
truecharts · Mar 3, 2022 · 4c5c3e5 · 4c5c3e5
1 parent 4bde534
commit 4c5c3e5
Show file tree

Hide file tree

Showing 270 changed files with 592 additions and 70 deletions.
diff --git a/charts/core/k8s-gateway/questions.yaml b/charts/core/k8s-gateway/questions.yaml
@@ -256,6 +256,8 @@ questions:
 
 # Include{persistenceList}
 
+# Include{security}
+
   - variable: advancedSecurity
     label: "Show Advanced Security Settings"
     group: "Security and Permissions"

diff --git a/charts/core/traefik/questions.yaml b/charts/core/traefik/questions.yaml
@@ -806,6 +806,8 @@ questions:
 
 # Include{ingressList}
 
+# Include{security}
+
   - variable: advancedSecurity
     label: "Show Advanced Security Settings"
     group: "Security and Permissions"

diff --git a/charts/dependency/mariadb/questions.yaml b/charts/dependency/mariadb/questions.yaml
@@ -240,6 +240,8 @@ questions:
 
 # Include{ingressList}
 
+# Include{security}
+
   - variable: advancedSecurity
     label: "Show Advanced Security Settings"
     group: "Security and Permissions"

diff --git a/charts/dependency/memcached/questions.yaml b/charts/dependency/memcached/questions.yaml
@@ -186,6 +186,8 @@ questions:
 
 # Include{ingressList}
 
+# Include{security}
+
   - variable: advancedSecurity
     label: "Show Advanced Security Settings"
     group: "Security and Permissions"

diff --git a/charts/dependency/postgresql/questions.yaml b/charts/dependency/postgresql/questions.yaml
@@ -240,6 +240,8 @@ questions:
 
 # Include{ingressList}
 
+# Include{security}
+
   - variable: advancedSecurity
     label: "Show Advanced Security Settings"
     group: "Security and Permissions"

diff --git a/charts/dependency/redis/questions.yaml b/charts/dependency/redis/questions.yaml
@@ -226,6 +226,8 @@ questions:
 
 # Include{ingressList}
 
+# Include{security}
+
   - variable: advancedSecurity
     label: "Show Advanced Security Settings"
     group: "Security and Permissions"

diff --git a/charts/dev/docker-compose/questions.yaml b/charts/dev/docker-compose/questions.yaml
@@ -94,6 +94,8 @@ questions:
 
 # Include{ingressList}
 
+# Include{security}
+
   - variable: advancedSecurity
     label: "Show Advanced Security Settings"
     group: "Security and Permissions"

diff --git a/charts/games/impostor-server/questions.yaml b/charts/games/impostor-server/questions.yaml
@@ -239,6 +239,8 @@ questions:
 
 # Include{ingressList}
 
+# Include{security}
+
   - variable: advancedSecurity
     label: "Show Advanced Security Settings"
     group: "Security and Permissions"

diff --git a/charts/games/impostor-server/values.yaml b/charts/games/impostor-server/values.yaml
@@ -9,7 +9,7 @@ nightlyImage:
   tag: vnightly@sha256:84b80cfecae507b18c9a6cd2aae1aa9c0c74722a926f541dded9053954f13cdf
 
 env:
-  USER_ID: "{{ .Values.env.PUID }}"
+  USER_ID: "{{ .Values.security.PUID }}"
   IMPOSTOR_Server__PublicIp: "127.0.0.1"
   IMPOSTOR_Server__ListenIp: "0.0.0.0"
   IMPOSTOR_AntiCheat__Enabled: true

diff --git a/charts/games/minecraft-bedrock/questions.yaml b/charts/games/minecraft-bedrock/questions.yaml
@@ -414,6 +414,8 @@ questions:
 
 # Include{ingressList}
 
+# Include{security}
+
   - variable: advancedSecurity
     label: "Show Advanced Security Settings"
     group: "Security and Permissions"

diff --git a/charts/games/minecraft-bedrock/values.yaml b/charts/games/minecraft-bedrock/values.yaml
@@ -4,7 +4,7 @@ image:
   pullPolicy: Always
 
 env:
-  UID: "{{ .Values.env.PUID }}"
+  UID: "{{ .Values.security.PUID }}"
   GID: "{{ .Values.podSecurityContext.fsGroup }}"
   EULA: "TRUE"
   VERSION: "LATEST"

diff --git a/charts/games/minecraft-java/questions.yaml b/charts/games/minecraft-java/questions.yaml
@@ -712,6 +712,8 @@ questions:
 
 # Include{ingressList}
 
+# Include{security}
+
   - variable: advancedSecurity
     label: "Show Advanced Security Settings"
     group: "Security and Permissions"

diff --git a/charts/games/minecraft-java/values.yaml b/charts/games/minecraft-java/values.yaml
@@ -31,7 +31,7 @@ podSecurityContext:
   runAsGroup: 0
 
 env:
-  UID: "{{ .Values.env.PUID }}"
+  UID: "{{ .Values.security.PUID }}"
   EULA: "TRUE"
   VERSION: "LATEST"
   TYPE: "VANILLA"

diff --git a/charts/games/minetest/questions.yaml b/charts/games/minetest/questions.yaml
@@ -250,6 +250,8 @@ questions:
 
 # Include{ingressList}
 
+# Include{security}
+
   - variable: advancedSecurity
     label: "Show Advanced Security Settings"
     group: "Security and Permissions"

diff --git a/charts/games/statisfactory/questions.yaml b/charts/games/statisfactory/questions.yaml
@@ -394,6 +394,8 @@ questions:
 
 # Include{ingressList}
 
+# Include{security}
+
   - variable: advancedSecurity
     label: "Show Advanced Security Settings"
     group: "Security and Permissions"

diff --git a/charts/games/valheim/questions.yaml b/charts/games/valheim/questions.yaml
@@ -593,6 +593,8 @@ questions:
 
 # Include{ingressList}
 
+# Include{security}
+
   - variable: advancedSecurity
     label: "Show Advanced Security Settings"
     group: "Security and Permissions"

diff --git a/charts/incubator/automatic-music-downloader/questions.yaml b/charts/incubator/automatic-music-downloader/questions.yaml
@@ -401,6 +401,8 @@ questions:
 
 
   # Include{ingressList}
+# Include{security}
+
   - variable: advancedSecurity
     label: "Show Advanced Security Settings"
     group: "Security and Permissions"

diff --git a/charts/incubator/budge/questions.yaml b/charts/incubator/budge/questions.yaml
@@ -251,6 +251,8 @@ questions:
 
 # Include{ingressList}
 
+# Include{security}
+
   - variable: advancedSecurity
     label: "Show Advanced Security Settings"
     group: "Security and Permissions"

diff --git a/charts/incubator/deemix/questions.yaml b/charts/incubator/deemix/questions.yaml
@@ -250,6 +250,8 @@ questions:
 # Include{ingressList}
 
 
+# Include{security}
+
   - variable: advancedSecurity
     label: "Show Advanced Security Settings"
     group: "Security and Permissions"

diff --git a/charts/incubator/deemix/values.yaml b/charts/incubator/deemix/values.yaml
@@ -4,7 +4,6 @@ image:
   tag: latest@sha256:cc770caa2f11b2e1b89129e17ebbbbb2533bd3e7c93303e52a072e1b3e471f70
 
 env:
-  UMASK_SET: "{{ .Values.env.UMASK }}"
   INTPORT: "{{ .Values.service.main.ports.main.targetPort }}"
 
 securityContext:

diff --git a/charts/incubator/frigate/questions.yaml b/charts/incubator/frigate/questions.yaml
@@ -376,6 +376,8 @@ questions:
 
 # Include{ingressList}
 
+# Include{security}
+
   - variable: advancedSecurity
     label: "Show Advanced Security Settings"
     group: "Security and Permissions"

diff --git a/charts/incubator/grist/questions.yaml b/charts/incubator/grist/questions.yaml
@@ -433,6 +433,8 @@ questions:
 
 # Include{ingressList}
 
+# Include{security}
+
   - variable: advancedSecurity
     label: "Show Advanced Security Settings"
     group: "Security and Permissions"

diff --git a/charts/incubator/omada-controller/questions.yaml b/charts/incubator/omada-controller/questions.yaml
@@ -598,6 +598,8 @@ questions:
 
 # Include{ingressList}
 
+# Include{security}
+
   - variable: advancedSecurity
     label: "Show Advanced Security Settings"
     group: "Security and Permissions"

diff --git a/charts/incubator/piwigo/questions.yaml b/charts/incubator/piwigo/questions.yaml
@@ -251,6 +251,8 @@ questions:
 
 # Include{ingressList}
 
+# Include{security}
+
   - variable: advancedSecurity
     label: "Show Advanced Security Settings"
     group: "Security and Permissions"

diff --git a/charts/incubator/spotweb/questions.yaml b/charts/incubator/spotweb/questions.yaml
@@ -419,6 +419,8 @@ questions:
 
 # Include{ingressList}
 
+# Include{security}
+
   - variable: advancedSecurity
     label: "Show Advanced Security Settings"
     group: "Security and Permissions"

diff --git a/charts/incubator/tdarr-node/questions.yaml b/charts/incubator/tdarr-node/questions.yaml
@@ -363,6 +363,8 @@ questions:
 
 # Include{ingressList}
 
+# Include{security}
+
   - variable: advancedSecurity
     label: "Show Advanced Security Settings"
     group: "Security and Permissions"

diff --git a/charts/incubator/tdarr/questions.yaml b/charts/incubator/tdarr/questions.yaml
@@ -442,6 +442,8 @@ questions:
 
 # Include{ingressList}
 
+# Include{security}
+
   - variable: advancedSecurity
     label: "Show Advanced Security Settings"
     group: "Security and Permissions"

diff --git a/charts/library/common/Chart.yaml b/charts/library/common/Chart.yaml
@@ -15,4 +15,4 @@ maintainers:
 name: common
 sources: null
 type: library
-version: 8.17.3
+version: 9.0.0
diff --git a/charts/library/common/templates/lib/controller/_container.tpl b/charts/library/common/templates/lib/controller/_container.tpl
@@ -46,10 +46,12 @@
   {{- end }}
 
   env:
-   {{- if not ( .Values.env.PUID ) }}
     - name: PUID
-      value: "568"
-   {{- end }}
+      value: {{ .Values.security.PUID | quote }}
+    - name: UMASK
+      value: {{ .Values.security.UMASK | quote }}
+    - name: UMASK_SET
+      value: {{ .Values.security.UMASK | quote }}
     - name: PGID
       value: {{ .Values.podSecurityContext.fsGroup | quote }}
     - name: GROUP_ID
@@ -64,10 +66,8 @@
     - name: NVIDIA_VISIBLE_DEVICES
       value: "void"
    {{- end }}
-   {{- if not ( .Values.env.TZ ) }}
     - name: TZ
-      value: "UTC"
-   {{- end }}
+      value: {{ .Values.TZ | quote }}
   {{- with .Values.env }}
     {{- range $k, $v := . }}
       {{- $name := $k }}

diff --git a/charts/library/common/values.yaml b/charts/library/common/values.yaml
@@ -133,6 +133,9 @@ args: []
 # Primarily for the SCALE GUI
 extraArgs: []
 
+# -- Set Container Timezone
+TZ: UTC
+
 # -- Set the primary portal for TrueNAS SCALE
 portal:
   # -- enable generation of the portal configmap
@@ -309,6 +312,11 @@ dnsConfig:
 # [[ref]](https://kubernetes.io/docs/concepts/services-networking/connect-applications-service/#accessing-the-service)
 enableServiceLinks: false
 
+# -- Set the Process User ID (PUID) env-var seperately
+security:
+  PUID: 568
+  UMASK: 002
+
 # -- Can be used to set securityContext.capabilities outside of the GUI on TrueNAS SCALE
 customCapabilities:
   drop: []

diff --git a/charts/stable/airdcpp-webclient/questions.yaml b/charts/stable/airdcpp-webclient/questions.yaml
@@ -431,6 +431,8 @@ questions:
 
 # Include{ingressList}
 
+# Include{security}
+
   - variable: advancedSecurity
     label: "Show Advanced Security Settings"
     group: "Security and Permissions"

diff --git a/charts/stable/airsonic-advanced/questions.yaml b/charts/stable/airsonic-advanced/questions.yaml
@@ -393,6 +393,8 @@ questions:
 
 # Include{ingressList}
 
+# Include{security}
+
   - variable: advancedSecurity
     label: "Show Advanced Security Settings"
     group: "Security and Permissions"

diff --git a/charts/stable/airsonic/questions.yaml b/charts/stable/airsonic/questions.yaml
@@ -252,6 +252,8 @@ questions:
 
 # Include{ingressList}
 
+# Include{security}
+
   - variable: advancedSecurity
     label: "Show Advanced Security Settings"
     group: "Security and Permissions"

diff --git a/charts/stable/amcrest2mqtt/questions.yaml b/charts/stable/amcrest2mqtt/questions.yaml
@@ -153,6 +153,8 @@ questions:
 
 # Include{ingressList}
 
+# Include{security}
+
   - variable: advancedSecurity
     label: "Show Advanced Security Settings"
     group: "Security and Permissions"

diff --git a/charts/stable/anonaddy/questions.yaml b/charts/stable/anonaddy/questions.yaml
@@ -322,6 +322,8 @@ questions:
 
 # Include{ingressList}
 
+# Include{security}
+
   - variable: advancedSecurity
     label: "Show Advanced Security Settings"
     group: "Security and Permissions"

diff --git a/charts/stable/apache-musicindex/questions.yaml b/charts/stable/apache-musicindex/questions.yaml
@@ -193,6 +193,8 @@ questions:
 
 # Include{ingressList}
 
+# Include{security}
+
   - variable: advancedSecurity
     label: "Show Advanced Security Settings"
     group: "Security and Permissions"

diff --git a/charts/stable/appdaemon/questions.yaml b/charts/stable/appdaemon/questions.yaml
@@ -275,6 +275,8 @@ questions:
 
 # Include{ingressList}
 
+# Include{security}
+
   - variable: advancedSecurity
     label: "Show Advanced Security Settings"
     group: "Security and Permissions"

diff --git a/charts/stable/aria2/questions.yaml b/charts/stable/aria2/questions.yaml
@@ -319,6 +319,8 @@ questions:
 
 # Include{ingressList}
 
+# Include{security}
+
   - variable: advancedSecurity
     label: "Show Advanced Security Settings"
     group: "Security and Permissions"

diff --git a/charts/stable/audacity/questions.yaml b/charts/stable/audacity/questions.yaml
@@ -250,6 +250,8 @@ questions:
 
 # Include{ingressList}
 
+# Include{security}
+
   - variable: advancedSecurity
     label: "Show Advanced Security Settings"
     group: "Security and Permissions"

diff --git a/charts/stable/authelia/questions.yaml b/charts/stable/authelia/questions.yaml
@@ -964,6 +964,8 @@ questions:
 # Include{ingressExpert}
 
 # Include{ingressList}
+# Include{security}
+
   - variable: advancedSecurity
     label: "Show Advanced Security Settings"
     group: "Security and Permissions"

diff --git a/charts/stable/babybuddy/questions.yaml b/charts/stable/babybuddy/questions.yaml
@@ -389,6 +389,8 @@ questions:
 
 # Include{ingressList}
 
+# Include{security}
+
   - variable: advancedSecurity
     label: "Show Advanced Security Settings"
     group: "Security and Permissions"