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

Update default openshift.enabled value; Fix argocd-repo-server env template

Browse source
This commit is contained in:
Tyler Auerbeck 2020-04-20 14:42:55 -04:00
parent f48ad8d788
commit 904b549c46
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -67,17 +67,16 @@ spec:
{{- if .Values.repoServer.containerSecurityContext }} {{- if .Values.repoServer.containerSecurityContext }}
securityContext: {{- toYaml .Values.repoServer.containerSecurityContext | nindent 10 }} securityContext: {{- toYaml .Values.repoServer.containerSecurityContext | nindent 10 }}
{{- end }} {{- end }}
{{- if .Values.openshift.enabled }} {{- if or (.Values.repoServer.env) (.Values.openshift.enabled) }}
env: env:
- name: USER_NAME
value: argocd
{{- if .Values.repoServer.env }} {{- if .Values.repoServer.env }}
{{- toYaml .Values.repoServer.env | nindent 8 }} {{- toYaml .Values.repoServer.env | nindent 8 }}
{{- end }} {{- end }}
{{- else if .Values.repoServer.env }} {{- if .Values.openshift.enabled }}
env: - name: USER_NAME
{{- toYaml .Values.repoServer.env | nindent 8 }} value: argocd
{{- end }} {{- end }}
{{- end }}
volumeMounts: volumeMounts:
{{- if .Values.repoServer.volumeMounts }} {{- if .Values.repoServer.volumeMounts }}
{{- toYaml .Values.repoServer.volumeMounts | nindent 8}} {{- toYaml .Values.repoServer.volumeMounts | nindent 8}}

2
charts/argo-cd/values.yaml
View file

@ -792,4 +792,4 @@ configs:
# argocdServerAdminPasswordMtime: "2006-01-02T15:04:05Z" # argocdServerAdminPasswordMtime: "2006-01-02T15:04:05Z"
openshift: openshift:
enabled: true enabled: false