use extraXXX model

Author: jjlgao

charts/retool/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: retool
 description: A Helm chart for Kubernetes
 type: application
-version: 6.3.1
+version: 6.3.2
 maintainers:
   - name: Retool Engineering
     email: [email protected]

charts/retool/templates/deployment_backend.yaml

@@ -325,12 +325,11 @@ spec:
 {{ toYaml .Values.tolerations | indent 8 }}
 {{- if .Values.securityContext.enabled }}
       securityContext:
-{{- if .Values.securityContext.values }}
-{{ toYaml .Values.securityContext.values | indent 8 }}
-{{- else }}
         runAsUser: {{ .Values.securityContext.runAsUser }}
         fsGroup: {{ .Values.securityContext.fsGroup }}
         allowPrivilegeEscalation: {{ .Values.securityContext.allowPrivilegeEscalation }}
+{{- if .Values.securityContext.extraSecurityContext }}
+{{ toYaml .Values.securityContext.extraSecurityContext | indent 8 }}
 {{- end }}
 {{- end }}
       volumes:

charts/retool/templates/deployment_jobs.yaml

@@ -239,12 +239,11 @@ spec:
 {{ toYaml .Values.tolerations | indent 8 }}
 {{- if .Values.securityContext.enabled }}
       securityContext:
-{{- if .Values.securityContext.values }}
-{{ toYaml .Values.securityContext.values | indent 8 }}
-{{- else }}
         runAsUser: {{ .Values.securityContext.runAsUser }}
         fsGroup: {{ .Values.securityContext.fsGroup }}
         allowPrivilegeEscalation: {{ .Values.securityContext.allowPrivilegeEscalation }}
+{{- if .Values.securityContext.extraSecurityContext }}
+{{ toYaml .Values.securityContext.extraSecurityContext | indent 8 }}
 {{- end }}
 {{- end }}
       volumes:

charts/retool/templates/deployment_multiplayer_ws.yaml

@@ -184,12 +184,11 @@ spec:
 {{ toYaml .Values.tolerations | indent 8 }}
 {{- if .Values.securityContext.enabled }}
       securityContext:
-{{- if .Values.securityContext.values }}
-{{ toYaml .Values.securityContext.values | indent 8 }}
-{{- else }}
         runAsUser: {{ .Values.securityContext.runAsUser }}
         fsGroup: {{ .Values.securityContext.fsGroup }}
         allowPrivilegeEscalation: {{ .Values.securityContext.allowPrivilegeEscalation }}
+{{- if .Values.securityContext.extraSecurityContext }}
+{{ toYaml .Values.securityContext.extraSecurityContext | indent 8 }}
 {{- end }}
 {{- end }}
       volumes:

charts/retool/templates/deployment_workflows.yaml

@@ -290,12 +290,11 @@ spec:
 {{ toYaml .Values.tolerations | indent 8 }}
 {{- if .Values.securityContext.enabled }}
       securityContext:
-{{- if .Values.securityContext.values }}
-{{ toYaml .Values.securityContext.values | indent 8 }}
-{{- else }}
         runAsUser: {{ .Values.securityContext.runAsUser }}
         fsGroup: {{ .Values.securityContext.fsGroup }}
         allowPrivilegeEscalation: {{ .Values.securityContext.allowPrivilegeEscalation }}
+{{- if .Values.securityContext.extraSecurityContext }}
+{{ toYaml .Values.securityContext.extraSecurityContext | indent 8 }}
 {{- end }}
 {{- end }}
       volumes:

charts/retool/templates/deployment_workflows_worker.yaml

@@ -302,12 +302,11 @@ spec:
 {{ toYaml .Values.tolerations | indent 8 }}
 {{- if .Values.securityContext.enabled }}
       securityContext:
-{{- if .Values.securityContext.values }}
-{{ toYaml .Values.securityContext.values | indent 8 }}
-{{- else }}
         runAsUser: {{ .Values.securityContext.runAsUser }}
         fsGroup: {{ .Values.securityContext.fsGroup }}
         allowPrivilegeEscalation: {{ .Values.securityContext.allowPrivilegeEscalation }}
+{{- if .Values.securityContext.extraSecurityContext }}
+{{ toYaml .Values.securityContext.extraSecurityContext | indent 8 }}
 {{- end }}
 {{- end }}
       volumes:

charts/retool/values.yaml

@@ -637,8 +637,7 @@ securityContext:
   runAsUser: 1000
   fsGroup: 2000
   # Use this section to define additional security context values not provided by default.
-  # Existing values above will be fully replaced by the values in this section.
-  values: {}
+  extraSecurityContext: {}
 
 extraConfigMapMounts: []
 

values.yaml

@@ -637,8 +637,7 @@ securityContext:
   runAsUser: 1000
   fsGroup: 2000
   # Use this section to define additional security context values not provided by default.
-  # Existing values above will be fully replaced by the values in this section.
-  values: {}
+  extraSecurityContext: {}
 
 extraConfigMapMounts: []