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

fix other charts issues

Browse source
This commit is contained in:
Ilia Medvedev 2023-11-15 23:10:15 +02:00
parent 0b0940e6a2
commit 8925cc87bc
2 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
charts/argo-workflows/templates/controller/workflow-controller-config-map.yaml
View file

@ -177,8 +177,6 @@ data:
{{- with .Values.controller.retentionPolicy }} {{- with .Values.controller.retentionPolicy }}
retentionPolicy: {{- toYaml . | nindent 6 }} retentionPolicy: {{- toYaml . | nindent 6 }}
{{- end }} {{- end }}
<<<<<<< HEAD
=======
{{- with .Values.emissary.images }} {{- with .Values.emissary.images }}
images: {{- toYaml . | nindent 6 }} images: {{- toYaml . | nindent 6 }}
{{- end }} {{- end }}
@ -193,4 +191,3 @@ data:
{{- with .Values.controller.podGCDeleteDelayDuration }} {{- with .Values.controller.podGCDeleteDelayDuration }}
podGCDeleteDelayDuration: {{ . }} podGCDeleteDelayDuration: {{ . }}
{{- end }} {{- end }}
>>>>>>> argo-cd-5.27.1

2
charts/argo-workflows/templates/server/server-cluster-roles.yaml
View file

@ -31,8 +31,6 @@ rules:
- list - list
- watch - watch
- delete - delete
<<<<<<< HEAD
=======
- apiGroups: - apiGroups:
- "" - ""
resources: resources: