Skip to content

fix(helm): generate namespace-aware SANs in certgen and cert-manager templates #2062

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
TaylorMutch merged 1 commit into from
Jun 30, 2026
Merged

fix(helm): generate namespace-aware SANs in certgen and cert-manager templates #2062

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
18 changes: 18 additions & 0 deletions deploy/helm/openshell/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,24 @@ init-container
{{- end -}}
{{- end }}

{{/*
Default server certificate DNS SANs derived from the release name and namespace.
Returns a YAML list. Append extra SANs from values with range loops.
*/}}
{{- define "openshell.defaultServerDnsNames" -}}
{{- $name := include "openshell.fullname" . -}}
{{- $ns := .Release.Namespace -}}
{{- list $name
(printf "%s.%s.svc" $name $ns)
(printf "%s.%s.svc.cluster.local" $name $ns)
"localhost"
(printf "%s.localhost" $name)
(printf "*.%s.localhost" $name)
"host.docker.internal"
"host.containers.internal"
| toYaml }}
{{- end }}

{{/*
Gateway workload kind. StatefulSet is the default because the default SQLite
database requires persistent per-pod storage.
Expand Down
7 changes: 6 additions & 1 deletion deploy/helm/openshell/templates/cert-manager-pki.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,12 @@ spec:
renewBefore: {{ .Values.certManager.certificateRenewBefore | quote }}
commonName: openshell-server
dnsNames:
{{- toYaml .Values.certManager.serverDnsNames | nindent 4 }}
{{- range (include "openshell.defaultServerDnsNames" . | fromYamlArray) }}
- {{ . | quote }}
{{- end }}
{{- range .Values.certManager.serverDnsNames }}
- {{ . | quote }}
{{- end }}
{{- if .Values.certManager.serverIpAddresses }}
ipAddresses:
{{- toYaml .Values.certManager.serverIpAddresses | nindent 4 }}
Expand Down
4 changes: 4 additions & 0 deletions deploy/helm/openshell/templates/certgen.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,10 @@ spec:
{{- end }}
- --jwt-secret-name={{ include "openshell.sandboxJwtSecretName" . }}
{{- if and .Values.pkiInitJob.enabled (not .Values.certManager.enabled) }}
{{- range (include "openshell.defaultServerDnsNames" . | fromYamlArray) }}
- --server-san={{ . }}
{{- end }}
- --server-san=127.0.0.1
{{- range .Values.pkiInitJob.serverDnsNames }}
- --server-san={{ . }}
{{- end }}
Expand Down
Loading