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

fix(argo-cd): Merge duplicate initContainer entries introduced in 3.29.0 (#1058)

Browse source 
* fix(repo-server): merge initContainer to one section

Signed-off-by: Alex Babel <alexander.babel@icloud.com>

* chore(argo-cd): bump version to 3.29.1

Signed-off-by: Alex Babel <alexander.babel@icloud.com>

* Merge master into fix/repo-server-init-container

Signed-off-by: Alex Babel <alexander.babel@icloud.com>

* fix(argo-cd): add enableCopyutilInitContainer option

Signed-off-by: Alex Babel <alexander.babel@icloud.com>

* doc: update readme

Signed-off-by: Alex Babel <alexander.babel@icloud.com>
This commit is contained in:
Alex Babel 2021-12-17 19:39:07 +01:00 • committed by GitHub
parent eb8273ecce
commit 0dc0b845a3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

27
charts/argo-cd/templates/argocd-repo-server/deployment.yaml
View file

@ -34,17 +34,6 @@ spec:
{{- if .Values.global.securityContext }}
securityContext: {{- toYaml .Values.global.securityContext | nindent 8 }}
{{- end }}
initContainers:
- command:
- cp
- -n
- /usr/local/bin/argocd
- /var/run/argocd/argocd-cmp-server
image: {{ default .Values.global.image.repository .Values.repoServer.image.repository }}:{{ default (include "argo-cd.defaultTag" .) .Values.repoServer.image.tag }}
name: copyutil
volumeMounts:
- mountPath: /var/run/argocd
name: var-files
containers:
- name: {{ .Values.repoServer.name }}
image: {{ default .Values.global.image.repository .Values.repoServer.image.repository }}:{{ default (include "argo-cd.defaultTag" .) .Values.repoServer.image.tag }}
@ -194,10 +183,24 @@ spec:
name: var-files
- emptyDir: {}
name: plugins
{{- if .Values.repoServer.initContainers }}
{{- if or .Values.repoServer.initContainers .Values.repoServer.enableCopyutilInitContainer }}
initContainers:
{{- if .Values.repoServer.enableCopyutilInitContainer }}
- command:
- cp
- -n
- /usr/local/bin/argocd
- /var/run/argocd/argocd-cmp-server
image: {{ default .Values.global.image.repository .Values.repoServer.image.repository }}:{{ default (include "argo-cd.defaultTag" .) .Values.repoServer.image.tag }}
name: copyutil
volumeMounts:
- mountPath: /var/run/argocd
name: var-files
{{- end }}
{{- if .Values.repoServer.initContainers }}
{{- toYaml .Values.repoServer.initContainers | nindent 6 }}
{{- end }}
{{- end }}
{{- if .Values.repoServer.priorityClassName }}
priorityClassName: {{ .Values.repoServer.priorityClassName }}
{{- end }}