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

Make redis and dex command line arguements dependant on enabled values

Browse source 
Redis and Dex commandline arguements should only exist if those services are enabled.
This commit is contained in:
Jaret Deprin 2019-10-16 13:09:29 -07:00
parent 3d92993827
commit 3656e6cb68
3 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
charts/argo-cd/templates/argocd-application-controller/deployment.yaml
View file

@ -46,8 +46,10 @@ spec:
- {{ template "argo-cd.repoServer.fullname" . }}:{{ .Values.repoServer.service.port }} - {{ template "argo-cd.repoServer.fullname" . }}:{{ .Values.repoServer.service.port }}
- --loglevel - --loglevel
- {{ .Values.controller.logLevel }} - {{ .Values.controller.logLevel }}
{{- if .Values.redis.enabled }}
- --redis - --redis
- {{ template "argo-cd.redis.fullname" . }}:{{ .Values.redis.servicePort }} - {{ template "argo-cd.redis.fullname" . }}:{{ .Values.redis.servicePort }}
{{- end }}
{{- range $key, $value := .Values.controller.extraArgs }} {{- range $key, $value := .Values.controller.extraArgs }}
{{- if $value }} {{- if $value }}
- --{{ $key }}={{ $value }} - --{{ $key }}={{ $value }}

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

@ -41,8 +41,10 @@ spec:
imagePullPolicy: {{ default .Values.global.image.imagePullPolicy .Values.repoServer.image.imagePullPolicy }} imagePullPolicy: {{ default .Values.global.image.imagePullPolicy .Values.repoServer.image.imagePullPolicy }}
command: command:
- argocd-repo-server - argocd-repo-server
{{- if .Values.redis.enabled }}
- --redis - --redis
- {{ template "argo-cd.redis.fullname" . }}:{{ .Values.redis.servicePort }} - {{ template "argo-cd.redis.fullname" . }}:{{ .Values.redis.servicePort }}
{{- end }}
- --loglevel - --loglevel
- {{ .Values.repoServer.logLevel }} - {{ .Values.repoServer.logLevel }}
{{- range $key, $value := .Values.repoServer.extraArgs }} {{- range $key, $value := .Values.repoServer.extraArgs }}

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

@ -45,12 +45,16 @@ spec:
- /shared/app - /shared/app
- --repo-server - --repo-server
- {{ template "argo-cd.repoServer.fullname" . }}:{{ .Values.repoServer.service.port }} - {{ template "argo-cd.repoServer.fullname" . }}:{{ .Values.repoServer.service.port }}
{{- if .Values.dex.enabled }}
- --dex-server - --dex-server
- http://{{ template "argo-cd.dex.fullname" . }}:{{ .Values.dex.servicePortHttp }} - http://{{ template "argo-cd.dex.fullname" . }}:{{ .Values.dex.servicePortHttp }}
{{- end }}
- --loglevel - --loglevel
- {{ .Values.server.logLevel }} - {{ .Values.server.logLevel }}
{{- if .Values.redis.enabled }}
- --redis - --redis
- {{ template "argo-cd.redis.fullname" . }}:{{ .Values.redis.servicePort }} - {{ template "argo-cd.redis.fullname" . }}:{{ .Values.redis.servicePort }}
{{- end }}
{{- range $key, $value := .Values.server.extraArgs }} {{- range $key, $value := .Values.server.extraArgs }}
{{- if $value }} {{- if $value }}
- --{{ $key }}={{ $value }} - --{{ $key }}={{ $value }}