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
This commit is contained in:
Kjeld Schouten-Lebbing
2022-03-03 15:04:31 +01:00
committed by GitHub
parent 4bde534ce8
commit 4c5c3e5197
270 changed files with 592 additions and 70 deletions
+2
View File
@@ -256,6 +256,8 @@ questions:
# Include{persistenceList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -806,6 +806,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -240,6 +240,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
@@ -186,6 +186,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
@@ -240,6 +240,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -226,6 +226,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -94,6 +94,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
@@ -239,6 +239,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+1 -1
View File
@@ -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
@@ -414,6 +414,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+1 -1
View File
@@ -4,7 +4,7 @@ image:
pullPolicy: Always
env:
UID: "{{ .Values.env.PUID }}"
UID: "{{ .Values.security.PUID }}"
GID: "{{ .Values.podSecurityContext.fsGroup }}"
EULA: "TRUE"
VERSION: "LATEST"
@@ -712,6 +712,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+1 -1
View File
@@ -31,7 +31,7 @@ podSecurityContext:
runAsGroup: 0
env:
UID: "{{ .Values.env.PUID }}"
UID: "{{ .Values.security.PUID }}"
EULA: "TRUE"
VERSION: "LATEST"
TYPE: "VANILLA"
+2
View File
@@ -250,6 +250,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
@@ -394,6 +394,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -593,6 +593,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
@@ -401,6 +401,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -251,6 +251,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -250,6 +250,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
-1
View File
@@ -4,7 +4,6 @@ image:
tag: latest@sha256:cc770caa2f11b2e1b89129e17ebbbbb2533bd3e7c93303e52a072e1b3e471f70
env:
UMASK_SET: "{{ .Values.env.UMASK }}"
INTPORT: "{{ .Values.service.main.ports.main.targetPort }}"
securityContext:
+2
View File
@@ -376,6 +376,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -433,6 +433,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
@@ -598,6 +598,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -251,6 +251,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -419,6 +419,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
@@ -363,6 +363,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -442,6 +442,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+1 -1
View File
@@ -15,4 +15,4 @@ maintainers:
name: common
sources: null
type: library
version: 8.17.3
version: 9.0.0
@@ -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 }}
+8
View File
@@ -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: []
@@ -431,6 +431,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
@@ -393,6 +393,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -252,6 +252,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
@@ -153,6 +153,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -322,6 +322,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
@@ -193,6 +193,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -275,6 +275,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -319,6 +319,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -250,6 +250,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -964,6 +964,8 @@ questions:
# Include{ingressExpert}
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -389,6 +389,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -243,6 +243,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -250,6 +250,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -268,6 +268,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -250,6 +250,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
@@ -250,6 +250,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -256,6 +256,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -249,6 +249,8 @@ questions:
# Include{ingressExpert}
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -325,6 +325,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -363,6 +363,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -206,6 +206,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -249,6 +249,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -256,6 +256,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
@@ -254,6 +254,8 @@ questions:
# Include{ingressExpert}
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -250,6 +250,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -244,6 +244,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -376,6 +376,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -250,6 +250,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -250,6 +250,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -139,6 +139,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -402,6 +402,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+1 -1
View File
@@ -24,7 +24,7 @@ env:
DECONZ_WEB_PORT: "{{ .Values.service.main.ports.main.port }}"
DECONZ_WS_PORT: "{{ .Values.service.websocket.ports.websocket.port }}"
DECONZ_VNC_PORT: "{{ .Values.service.vnc.ports.vnc.port }}"
DECONZ_UID: "{{ .Values.env.PUID }}"
DECONZ_UID: "{{ .Values.security.PUID }}"
DECONZ_GID: "{{ .Values.podSecurityContext.fsGroup }}"
service:
+2
View File
@@ -372,6 +372,8 @@ questions:
# Include{ingressExpert}
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+1 -1
View File
@@ -30,7 +30,7 @@ secret:
ADMIN-KEY: ""
env:
USER_ID: "{{ .Values.env.PUID }}"
USER_ID: "{{ .Values.security.PUID }}"
# Path to custom models (needs to be on documentation)
MODELSTORE-DETECTION: "{{ .Values.persistence.modelstore.mountPath }}"
# High|Medium|Low
+2
View File
@@ -367,6 +367,8 @@ questions:
# Include{ingressExpert}
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -250,6 +250,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -250,6 +250,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -249,6 +249,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -250,6 +250,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -375,6 +375,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
@@ -249,6 +249,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -389,6 +389,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+1 -1
View File
@@ -10,7 +10,7 @@ image:
# @default -- See below
env:
# -- Set the container timezone
DJANGO_TIME_ZONE: "{{ .Values.env.TZ }}"
DJANGO_TIME_ZONE: "{{ .Values.security.TZ }}"
DJANGO_DATABASE_ENGINE: "django.db.backends.postgresql"
DJANGO_DATABASE_NAME: "{{ .Values.postgresql.postgresqlDatabase }}"
DJANGO_DATABASE_USER: "{{ .Values.postgresql.postgresqlUsername }}"
+2
View File
@@ -156,6 +156,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -244,6 +244,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -244,6 +244,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -250,6 +250,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -370,6 +370,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -250,6 +250,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -288,6 +288,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -432,6 +432,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -249,6 +249,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -256,6 +256,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
@@ -443,6 +443,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -250,6 +250,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
@@ -243,6 +243,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -262,6 +262,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -250,6 +250,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -274,6 +274,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
@@ -310,6 +310,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -193,6 +193,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -274,6 +274,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -249,6 +249,8 @@ questions:
# Include{ingressExpert}
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -263,6 +263,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -243,6 +243,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+4
View File
@@ -453,6 +453,10 @@ questions:
# Include{ingressList}
# Include{security}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -392,6 +392,8 @@ questions:
# Include{ingressExpert}
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -262,6 +262,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -243,6 +243,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"
+2
View File
@@ -456,6 +456,8 @@ questions:
# Include{ingressList}
# Include{security}
- variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions"

Some files were not shown because too many files have changed in this diff Show More