Merge pull request #305 from changzhi1990/fix_nginx_wrong_indent

Fix wrong indent for Nginx deployment
delimitrou · Nov 29, 2023 · b20d2f8 · b20d2f8
2 parents 8369a69 + fd047b9
commit b20d2f8
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/socialNetwork/helm-chart/socialnetwork/templates/_baseNginxDeployment.tpl b/socialNetwork/helm-chart/socialnetwork/templates/_baseNginxDeployment.tpl
@@ -44,10 +44,10 @@ spec:
         {{- end }}
         {{- if .resources }}  
         resources:
-          {{ tpl .resources . | nindent 6 | trim }}
+          {{ tpl .resources $ | nindent 10 | trim }}
         {{- else if hasKey $.Values.global "resources" }}           
         resources:
-          {{ tpl $.Values.global.resources $ | nindent 6 | trim }}
+          {{ tpl $.Values.global.resources $ | nindent 10 | trim }}
         {{- end }}  
         {{- if $.Values.configMaps }}        
         volumeMounts: 
@@ -72,6 +72,13 @@ spec:
         command: 
         - {{ .command }}
         {{- end -}}
+        {{- if .resources }}
+        resources:
+          {{ tpl .resources $ | nindent 10 | trim }}
+        {{- else if hasKey $.Values.global "resources" }}
+        resources:
+          {{ tpl $.Values.global.resources $ | nindent 10 | trim }}
+        {{- end }}
         {{- if .env }}
         env:
         {{- range $e := .env}}