Skip to content

helm: add certs secret mount #4641

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

Merged
merged 15 commits into from
Dec 7, 2022
Merged

helm: add certs secret mount #4641

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
e0eb5d2
helm: add certs secret mount
ericpaulsen Oct 19, 2022
28555c1
fix: values ref
ericpaulsen Oct 19, 2022
7444091
fix: conditional brackets
ericpaulsen Oct 19, 2022
b816d6a
rm: comment
ericpaulsen Oct 19, 2022
c133461
refactor: cert secrets list
ericpaulsen Oct 19, 2022
01eca84
fix: undefined var
ericpaulsen Oct 19, 2022
502a4a4
chore: remove deprecated value coder.tls.secretName
deansheather Oct 19, 2022
c655bf8
chore: improve helm volumes logic
deansheather Oct 19, 2022
5e2a75c
feat: add support for multiple CA bundles to helm
deansheather Oct 19, 2022
fd5f3e6
Merge branch 'main' into helm-ca-certs
ericpaulsen Oct 24, 2022
3dd81fe
Merge branch 'main' into helm-ca-certs
ericpaulsen Oct 24, 2022
d113cd7
fix: grammar
ericpaulsen Oct 24, 2022
43cd118
merge: main into branch
ericpaulsen Nov 29, 2022
479006b
resolve: conflict
ericpaulsen Dec 7, 2022
29e0f60
Merge branch 'main' into helm-ca-certs
ericpaulsen Dec 7, 2022
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
Prev Previous commit
Next Next commit
refactor: cert secrets list
  • Loading branch information
@ericpaulsen
ericpaulsen committed Oct 19, 2022
commit c133461ee098b0e0511e6db0162134fc4bf7f9eb
23 changes: 11 additions & 12 deletions helm/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ Scheme
Coder volume definitions.
*/}}
{{- define "coder.volumes" }}
{{- if or .Values.coder.tls.secretNames .Values.coder.tls.secretName }}
{{- if or .Values.coder.tls.secretNames .Values.coder.tls.secretName .Values.coder.certs.secretNames }}
volumes:
{{ range $secretName := .Values.coder.tls.secretNames -}}
- name: "tls-{{ $secretName }}"
Expand All @@ -98,21 +98,21 @@ volumes:
secret:
secretName: {{ .Values.coder.tls.secretName | quote }}
{{- end }}
{{- if .Values.coder.certs.secret.name }}
- name: {{ .Values.coder.certs.secret.name | quote }}
{{ range $certSecretNames := .Values.coder.certs.secretNames -}}
- name: {{ $certSecretNames | quote }}
secret:
secretName: {{ .Values.coder.certs.secret.name | quote }}
{{- end }}
secretName: {{ $certSecretNames | quote }}
{{ end -}}
{{- else }}
volumes: {{ if and (not .Values.coder.tls.secretNames) (not .Values.coder.tls.secretName) }}[]{{ end }}
volumes: {{ if and (not .Values.coder.tls.secretNames) (not .Values.coder.tls.secretName) (not .Values.coder.certs.secretNames) }}[]{{ end }}
{{- end }}
{{- end }}

{{/*
Coder volume mounts.
*/}}
{{- define "coder.volumeMounts" }}
{{- if or .Values.coder.tls.secretNames .Values.coder.tls.secretName }}
{{- if or .Values.coder.tls.secretNames .Values.coder.tls.secretName .Values.coder.certs.secretNames }}
volumeMounts:
{{ range $secretName := .Values.coder.tls.secretNames -}}
- name: "tls-{{ $secretName }}"
Expand All @@ -124,12 +124,11 @@ volumeMounts:
mountPath: "/etc/ssl/certs/coder/{{ .Values.coder.tls.secretName }}"
readOnly: true
{{- end }}
{{- if .Values.coder.certs.secret.name }}
- name: {{ .Values.coder.certs.secret.name | quote }}
mountPath: /etc/ssl/certs/{{ .Values.coder.certs.secret.key }}
subPath: {{ .Values.coder.certs.secret.key | quote }}
{{ range $certSecretNames := .Values.coder.certs.secretNames -}}
- name: {{ $certSecretNames | quote }}
mountPath: "/etc/ssl/certs/{{ $certSecretName }}"
readOnly: true
{{- end }}
{{ end }}
{{- else }}
volumeMounts: []
{{- end }}
Expand Down
9 changes: 4 additions & 5 deletions helm/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,10 @@ coder:

# coder.certs -- Certificate to mount inside the Coder pod (e.g. CA bundle).
certs:
secret:
# coder.certs.secret.name -- Name of the secret.
name: ""
# coder.certs.secret.key -- Key pointing to a certificate in the secret.
key: ""
# coder.certs.secretNames -- A list of CA certificate secrets to mount into
# the Coder pod. The secrets should exist in the same namespace as the Helm
# deployment.
secretNames: []

# coder.service -- The Service object to expose for Coder.
service:
Expand Down