DevFW-CICD/argocd-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix issue

Browse source 
Signed-off-by: Joe Lee <lj_2005@163.com>
This commit is contained in:
Joe Lee 2023-05-08 16:13:06 +08:00
parent 24e4a04a0e
commit 859db71e3d
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
charts/argocd-apps/templates/applications.yaml
View file

@ -54,11 +54,13 @@ spec:
{{- if kindIs "string" .template }} {{- if kindIs "string" .template }}
{{- $template := .template -}} {{- $template := .template -}}
{{- range .apps }} {{- range .apps }}
---
{{ tpl $template (set . "Template" $.Template) }} {{ tpl $template (set . "Template" $.Template) }}
{{- end }} {{- end }}
{{- else }} {{- else }}
{{- $template := .template | toYaml -}} {{- $template := .template | toYaml -}}
{{- range .apps }} {{- range .apps }}
---
{{ tpl $template (set . "Template" $.Template) }} {{ tpl $template (set . "Template" $.Template) }}
{{- end }} {{- end }}
{{- end }} {{- end }}

2
charts/argocd-apps/templates/applicationsets.yaml
View file

@ -82,11 +82,13 @@ spec:
{{- if kindIs "string" .template }} {{- if kindIs "string" .template }}
{{- $template := .template -}} {{- $template := .template -}}
{{- range .appSets }} {{- range .appSets }}
---
{{ tpl $template (set . "Template" $.Template) }} {{ tpl $template (set . "Template" $.Template) }}
{{- end }} {{- end }}
{{- else }} {{- else }}
{{- $template := .template | toYaml -}} {{- $template := .template | toYaml -}}
{{- range .appSets }} {{- range .appSets }}
---
{{ tpl $template (set . "Template" $.Template) }} {{ tpl $template (set . "Template" $.Template) }}
{{- end }} {{- end }}
{{- end }} {{- end }}

3
charts/argocd-apps/templates/projects.yaml
View file

@ -68,16 +68,17 @@ spec:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
{{- end }} {{- end }}
---
{{- range .Values.projectTemplates }} {{- range .Values.projectTemplates }}
{{- if kindIs "string" .template }} {{- if kindIs "string" .template }}
{{- $template := .template -}} {{- $template := .template -}}
{{- range .projects }} {{- range .projects }}
---
{{ tpl $template (set . "Template" $.Template) }} {{ tpl $template (set . "Template" $.Template) }}
{{- end }} {{- end }}
{{- else }} {{- else }}
{{- $template := .template | toYaml -}} {{- $template := .template | toYaml -}}
{{- range .projects }} {{- range .projects }}
---
{{ tpl $template (set . "Template" $.Template) }} {{ tpl $template (set . "Template" $.Template) }}
{{- end }} {{- end }}
{{- end }} {{- end }}