fix: use the values managed file only if workload imageUpdateStrategy is set (#2806)

Co-authored-by: svcAPLBot <[email protected]>

Author: j-zimnowoda

charts/team-ns/templates/argocd/argocd-application-workload.yaml

@@ -1,6 +1,10 @@
 {{- $v := .Values }}
-
 {{- range $v.workloads }}
+{{- $workload := . }}
+{{- $includeManagedValuesFile := false }}
+{{- if and $workload.imageUpdateStrategy $workload.imageUpdateStrategy.type  }}
+{{- $includeManagedValuesFile = not (eq  $workload.imageUpdateStrategy.type  "disabled") }}
+{{- end }}
 ---
 apiVersion: argoproj.io/v1alpha1
 kind: Application
@@ -32,8 +36,10 @@ spec:
         {{- end }}
       {{- end }}
       valueFiles:
-      - $values/env/teams/{{ $v.teamId }}/workloadValues/{{ .name }}.yaml
-      - $values/env/teams/{{ $v.teamId }}/workloadValues/{{ .name }}.managed.yaml
+      - $values/env/teams/{{ $v.teamId }}/workloadValues/{{ $workload.name }}.yaml
+      {{- if $includeManagedValuesFile }}
+      - $values/env/teams/{{ $v.teamId }}/workloadValues/{{ $workload.name }}.managed.yaml
+      {{- end }}
   - repoURL: {{ $v.gitOps.workloadValuesRepoUrl | quote }}
     targetRevision: '{{ .revision }}'
     ref: values

tests/fixtures/env/teams/demo/workloads/wd3.yaml

@@ -4,8 +4,6 @@ metadata:
     labels:
         apl.io/teamId: demo
 spec:
-    imageUpdateStrategy:
-        type: disabled
     path: ./
     revision: main
     url: https://myrepo.local/mychart.git