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

fix: rebase conflict

Browse source
This commit is contained in:
Carlos Juan Gómez Peñalver 2020-03-10 23:08:24 +00:00
parent d4c9011e17
commit 7335409a05
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -55,16 +55,11 @@ spec:
{{- if .Values.redis.enabled }} {{- if .Values.redis.enabled }}
- --redis - --redis
- {{ template "argo-cd.redis.fullname" . }}:{{ .Values.redis.servicePort }} - {{ template "argo-cd.redis.fullname" . }}:{{ .Values.redis.servicePort }}
{{- end }} {{- Send }}
- --loglevel - --loglevel
- {{ .Values.repoServer.logLevel }} - {{ .Values.repoServer.logLevel }}
<<<<<<< HEAD
{{- with .Values.repoServer.extraArgs }} {{- with .Values.repoServer.extraArgs }}
{{- . | toYaml | nindent 8 }} {{- . | toYaml | nindent 8 }}
=======
{{- with .Values.controller.extraArgs }}
{{ . | toYaml | nindent 8 }}
>>>>>>> feat: extraArgs allows same flag multiple times
{{- end }} {{- end }}
{{- if .Values.repoServer.containerSecurityContext }} {{- if .Values.repoServer.containerSecurityContext }}
securityContext: {{- toYaml .Values.repoServer.containerSecurityContext | nindent 10 }} securityContext: {{- toYaml .Values.repoServer.containerSecurityContext | nindent 10 }}