Fix cert manager to use custom CA issuer provided by user (#374)

cockroachdb · Jan 30, 2024 · 0cba0b6 · 0cba0b6
1 parent 2fb27f5
commit 0cba0b6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/cockroachdb/templates/certificate.client.yaml b/cockroachdb/templates/certificate.client.yaml
@@ -28,7 +28,13 @@ spec:
       - Cockroach
   secretName: {{ .Values.tls.certs.clientRootSecret }}
   issuerRef:
+  {{- if .Values.tls.certs.certManagerIssuer.isSelfSignedIssuer }}
     name: {{ template "cockroachdb.fullname" . }}-ca-issuer
     kind: Issuer
     group: cert-manager.io
+  {{- else }}
+    name: {{ .Values.tls.certs.certManagerIssuer.name }}
+    kind: {{ .Values.tls.certs.certManagerIssuer.kind }}
+    group: {{ .Values.tls.certs.certManagerIssuer.group }}
+  {{- end }}
 {{- end }}
diff --git a/cockroachdb/templates/certificate.node.yaml b/cockroachdb/templates/certificate.node.yaml
@@ -38,7 +38,13 @@ spec:
     - {{ printf "*.%s.%s.svc.%s" (include "cockroachdb.fullname" .) .Release.Namespace .Values.clusterDomain | quote }}
   secretName: {{ .Values.tls.certs.nodeSecret }}
   issuerRef:
+  {{- if .Values.tls.certs.certManagerIssuer.isSelfSignedIssuer }}
     name: {{ template "cockroachdb.fullname" . }}-ca-issuer
     kind: Issuer
     group: cert-manager.io
+  {{- else }}
+    name: {{ .Values.tls.certs.certManagerIssuer.name }}
+    kind: {{ .Values.tls.certs.certManagerIssuer.kind }}
+    group: {{ .Values.tls.certs.certManagerIssuer.group }}
+  {{- end }}
 {{- end }}