File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -54,13 +54,20 @@ spec:
5454{{- if .Values._cluster }}
5555 {{- $clusterDomain = (index .Values._cluster "cluster-domain") | default "cozy.local" }}
5656{{- end }}
57+ {{- $ns := .Release.Namespace }}
58+ {{- $name := .Release.Name }}
5759{{- $dnsNames := list
58- .Release.Name
59- (printf "%s.%s.svc" .Release.Name .Release.Namespace)
60- (printf "%s.%s.svc.%s" .Release.Name .Release.Namespace $clusterDomain)
60+ $name
61+ (printf "%s.%s.svc" $name $ns)
62+ (printf "%s.%s.svc.%s" $name $ns $clusterDomain)
63+ (printf "%s-nodes" $name)
64+ (printf "%s-nodes.%s.svc" $name $ns)
65+ (printf "%s-nodes.%s.svc.%s" $name $ns $clusterDomain)
66+ (printf "*.%s-nodes.%s.svc" $name $ns)
67+ (printf "*.%s-nodes.%s.svc.%s" $name $ns $clusterDomain)
6168}}
6269{{- if .Values.external }}
63- {{- $dnsNames = append $dnsNames (printf "%s.%s" .Release.Name .Values._namespace.host) }}
70+ {{- $dnsNames = append $dnsNames (printf "%s.%s" $name .Values._namespace.host) }}
6471{{- end }}
6572apiVersion : cert-manager.io/v1
6673kind : Certificate
7885 commonName : {{ .Release.Name }}
7986 dnsNames :
8087 {{- range $dnsNames }}
81- - {{ . }}
88+ - {{ . | quote }}
8289 {{- end }}
8390 usages :
8491 - digital signature
Original file line number Diff line number Diff line change @@ -182,6 +182,57 @@ tests:
182182 path : spec.dnsNames
183183 content : myrabbitmq.example.com
184184
185+ - it : leaf Certificate contains inter-node headless SANs when external is false
186+ release :
187+ name : myrabbitmq
188+ namespace : tenant-test
189+ set :
190+ tls.enabled : true
191+ external : false
192+ documentIndex : 3
193+ asserts :
194+ - contains :
195+ path : spec.dnsNames
196+ content : myrabbitmq-nodes
197+ - contains :
198+ path : spec.dnsNames
199+ content : myrabbitmq-nodes.tenant-test.svc
200+ - contains :
201+ path : spec.dnsNames
202+ content : myrabbitmq-nodes.tenant-test.svc.cozy.local
203+ - contains :
204+ path : spec.dnsNames
205+ content : " *.myrabbitmq-nodes.tenant-test.svc"
206+ - contains :
207+ path : spec.dnsNames
208+ content : " *.myrabbitmq-nodes.tenant-test.svc.cozy.local"
209+
210+ - it : leaf Certificate contains inter-node headless SANs when external is true
211+ release :
212+ name : myrabbitmq
213+ namespace : tenant-test
214+ set :
215+ tls.enabled : true
216+ external : true
217+ _namespace.host : example.com
218+ documentIndex : 3
219+ asserts :
220+ - contains :
221+ path : spec.dnsNames
222+ content : myrabbitmq-nodes
223+ - contains :
224+ path : spec.dnsNames
225+ content : myrabbitmq-nodes.tenant-test.svc
226+ - contains :
227+ path : spec.dnsNames
228+ content : myrabbitmq-nodes.tenant-test.svc.cozy.local
229+ - contains :
230+ path : spec.dnsNames
231+ content : " *.myrabbitmq-nodes.tenant-test.svc"
232+ - contains :
233+ path : spec.dnsNames
234+ content : " *.myrabbitmq-nodes.tenant-test.svc.cozy.local"
235+
185236 - it : leaf Certificate uses custom cluster domain in FQDN SAN when _cluster.cluster-domain is set
186237 release :
187238 name : myrabbitmq
@@ -198,6 +249,15 @@ tests:
198249 - notContains :
199250 path : spec.dnsNames
200251 content : myrabbitmq.tenant-test.svc.cozy.local
252+ - contains :
253+ path : spec.dnsNames
254+ content : myrabbitmq-nodes.tenant-test.svc.custom.example
255+ - contains :
256+ path : spec.dnsNames
257+ content : " *.myrabbitmq-nodes.tenant-test.svc.custom.example"
258+ - notContains :
259+ path : spec.dnsNames
260+ content : myrabbitmq-nodes.tenant-test.svc.cozy.local
201261
202262 # -----------------------------------------------------------------------
203263 # SAN coverage: external=true adds namespace.host SAN
You can’t perform that action at this time.
0 commit comments