fix(helm): tpl command fixes for args and commands in deployment. (#24)

bcgov · Nov 17, 2023 · b0b39f8 · b0b39f8
1 parent 1356e8f
commit b0b39f8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/charts/component/Chart.yaml b/charts/component/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.0.18
+version: 0.1.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/component/templates/deployment.yaml b/charts/component/templates/deployment.yaml
@@ -58,13 +58,13 @@ spec:
           {{- if .command }}
           command:
           {{- range .command }}
-            - "{{tpl . .}}"
+            - "{{tpl . $}}"
           {{- end }}
           {{- end}}
           {{- if .args }}
           args:
           {{- range .args }}
-            - "{{ . }}"
+            - "{{tpl . $}}"
           {{- end }}
           {{- end }}
           {{- if .envFrom }}
@@ -180,7 +180,7 @@ spec:
           {{- if .args }}
           args:
           {{- range .args }}
-            - "{{ . }}"
+            - "{{tpl . $}}"
           {{- end }}
           {{- end }}
           {{- if (contains "sha256:" .tag) }}

diff --git a/charts/component/templates/hpa.yaml b/charts/component/templates/hpa.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.autoscaling .Values.autoscaling.enabled }}
+{{- if and (.Values.global.autoscaling) (and .Values.autoscaling .Values.autoscaling.enabled) }}
 apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
@@ -35,3 +35,4 @@ spec:
           averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
     {{- end }}
 {{- end }}
+{{- end}}