Skip to content

Commit 48b04ff

Browse files
chore: split cert_manager validation and cert_manager enabled utilities
1 parent 3dade16 commit 48b04ff

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

charts/shield/templates/cluster/_tls.tpl

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,19 @@
5959
{{- end -}}
6060
{{- end }}
6161

62-
{{- define "cluster.tls_certificates.use_cert_manager" -}}
62+
{{- define "cluster.tls_certificates.validate_cert_manager" -}}
6363
{{- if and .Values.cluster.tls_certificates.cert_manager .Values.cluster.tls_certificates.cert_manager.enabled -}}
6464
{{- if and (not .Values.cluster.tls_certificates.cert_manager.ca.generate) (not .Values.cluster.tls_certificates.cert_manager.ca.secret_name) -}}
6565
{{- fail "cert_manager.ca.secret_name must be specified when CA generation is disabled" -}}
6666
{{- end -}}
6767
{{- if and (not .Values.cluster.tls_certificates.cert_manager.issuer.generate) (not .Values.cluster.tls_certificates.cert_manager.issuer.name) -}}
6868
{{- fail "cert_manager.issuer.name must be specified when Issuer generation is disabled" -}}
6969
{{- end -}}
70+
{{- end -}}
71+
{{- end }}
72+
73+
{{- define "cluster.tls_certificates.use_cert_manager" -}}
74+
{{- if and .Values.cluster.tls_certificates.cert_manager .Values.cluster.tls_certificates.cert_manager.enabled -}}
7075
{{- true -}}
7176
{{- end -}}
7277
{{- end }}

charts/shield/templates/cluster/cert-manager-certificate.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{{- if (include "cluster.tls_certificates.use_cert_manager" .) }}
2+
{{- include "cluster.tls_certificates.validate_cert_manager" . -}}
23
---
34
apiVersion: cert-manager.io/v1
45
kind: Certificate

0 commit comments

Comments
 (0)