Deep copy before unsetting values (#310)

galaxyproject · Jul 19, 2021 · 8c2a61c · 8c2a61c
1 parent f556617
commit 8c2a61c
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/galaxy/templates/deployment-job.yaml b/galaxy/templates/deployment-job.yaml
@@ -53,7 +53,7 @@ spec:
         {{- range $each := $.Values.extraInitContainers -}}
         {{- if $each.applyToJob -}}
         {{- print "- " | nindent 8 -}}
-        {{- tpl ((unset (unset (unset $each "applyToJob") "applyToWeb") "applyToWorkflow") | toYaml | indent 10 | trim) $ -}}
+        {{- tpl ((unset (unset (unset ($each | deepCopy) "applyToJob") "applyToWeb") "applyToWorkflow") | toYaml | indent 10 | trim) $ -}}
         {{- end }}
         {{- end }}
         {{- end }}

diff --git a/galaxy/templates/deployment-nginx.yaml b/galaxy/templates/deployment-nginx.yaml
@@ -64,7 +64,7 @@ spec:
             {{- .Values.extraVolumeMounts | toYaml | nindent 12 }}
             {{- end }}
           resources:
-            {{- toYaml .Values.resources | nindent 12 }}
+            {{- toYaml .Values.nginx.resources | nindent 12 }}
           lifecycle:
             preStop:
               exec:

diff --git a/galaxy/templates/deployment-web.yaml b/galaxy/templates/deployment-web.yaml
@@ -50,7 +50,7 @@ spec:
         {{- range $each := .Values.extraInitContainers -}}
         {{- if $each.applyToWeb -}}
         {{- print "- " | nindent 8 -}}
-        {{- tpl ((unset (unset (unset $each "applyToJob") "applyToWeb") "applyToWorkflow") | toYaml | indent 10 | trim) $ -}}
+        {{- tpl ((unset (unset (unset ($each | deepCopy) "applyToJob") "applyToWeb") "applyToWorkflow") | toYaml | indent 10 | trim) $ -}}
         {{- end }}
         {{- end }}
         {{- end }}

diff --git a/galaxy/templates/deployment-workflow.yaml b/galaxy/templates/deployment-workflow.yaml
@@ -50,7 +50,7 @@ spec:
         {{- range $each := .Values.extraInitContainers -}}
         {{- if $each.applyToWorkflow -}}
         {{- print "- " | nindent 8 -}}
-        {{- tpl ((unset (unset (unset $each "applyToJob") "applyToWeb") "applyToWorkflow") | toYaml | indent 10 | trim) $ -}}
+        {{- tpl ((unset (unset (unset ($each | deepCopy) "applyToJob") "applyToWeb") "applyToWorkflow") | toYaml | indent 10 | trim) $ -}}
         {{- end }}
         {{- end }}
         {{- end }}

diff --git a/galaxy/values.yaml b/galaxy/values.yaml
@@ -628,3 +628,4 @@ nginx:
     pullPolicy: IfNotPresent
   conf:
     client_max_body_size: 100g
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -628,3 +628,4 @@ nginx:
		pullPolicy: IfNotPresent
		conf:
		client_max_body_size: 100g