Skip to content

feat(argo-cd): dex-server — Add TLS support #1452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mrmm wants to merge 1 commit into from
Closed

feat(argo-cd): dex-server — Add TLS support #1452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions charts/argo-cd/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,16 @@ Create dex name and version as used by the chart label.
{{- define "argo-cd.dex.fullname" -}}
{{- printf "%s-%s" (include "argo-cd.fullname" .) .Values.dex.name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
Create dex server host and schema.
*/}}
{{- define "argo-cd.dex.serverUrl" -}}
{{- if .Values.dex.tls.enabled -}}
{{- printf "https://%s:%s" (include "argo-cd.dex.fullname" .) .Values.dex.servicePortHttp -}}
{{- else -}}
{{- printf "http://%s:%s" (include "argo-cd.dex.fullname" .) .Values.dex.servicePortHttp -}}
{{- end -}}
{{- end -}}

{{/*
Create redis name and version as used by the chart label.
Expand Down
2 changes: 1 addition & 1 deletion charts/argo-cd/templates/argocd-server/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ spec:
- {{ template "argo-cd.repoServer.fullname" . }}:{{ .Values.repoServer.service.port }}
{{- if .Values.dex.enabled }}
- --dex-server
- http://{{ template "argo-cd.dex.fullname" . }}:{{ .Values.dex.servicePortHttp }}
- {{ template "argo-cd.dex.serverUrl" . }}
{{- end }}
- --logformat
- {{default .Values.global.logging.format .Values.server.logFormat }}
Expand Down
20 changes: 20 additions & 0 deletions charts/argo-cd/templates/dex/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ spec:
volumeMounts:
- mountPath: /shared
name: static-files
{{- if .Values.dex.tls.secretName }}
- mountPath: /tls
name: argocd-dex-server-tls
{{- end }}
{{- if .Values.dex.initContainers }}
{{- toYaml .Values.dex.initContainers | nindent 6 }}
{{- end }}
Expand All @@ -57,6 +61,9 @@ spec:
command:
- /shared/argocd-dex
- rundex
{{- if eq .Values.dex.tls.enabled false }}
- --disable-tls
{{- end }}
{{- with .Values.dex.extraArgs }}
{{- . | toYaml | nindent 8 }}
{{- end }}
Expand Down Expand Up @@ -143,6 +150,19 @@ spec:
volumes:
- emptyDir: {}
name: tmp-dir
{{- if .Values.dex.tls.secretName }}
- name: dex-server-tls
secret:
secretName: {{ .Values.dex.tls.secretName }}
optional: true
items:
- key: tls.crt
path: tls.crt
- key: tls.key
path: tls.key
- key: ca.crt
path: ca.crt
{{- end }}
{{- if .Values.dex.volumes }}
{{- toYaml .Values.dex.volumes | nindent 6 }}
{{- end }}
Expand Down
6 changes: 6 additions & 0 deletions charts/argo-cd/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,12 @@ dex:
# -- Additional command line arguments to pass to the Dex server
extraArgs: []

tls:
# -- Use TLS to expose dex server to ArgoCD
enabled: false
# -- Use this secret as a certificate source
secretName: ""

metrics:
# -- Deploy metrics service
enabled: false
Expand Down