fix(clusterissuer): ensure clusterissuer is compatible with new cert-manager operator

charts/enterprise/clusterissuer/Chart.yaml

@@ -21,7 +21,7 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/enterprise/clusterissuer
   - https://cert-manager.io/
 type: application
-version: 1.0.11
+version: 1.0.12
 annotations:
   truecharts.org/catagories: |
     - core

charts/enterprise/clusterissuer/templates/_metrics.tpl

@@ -1,26 +0,0 @@
-{{- define "certmanager.metrics" -}}
-{{- if .Values.customMetrics.enabled }}
----
-apiVersion: monitoring.coreos.com/v1
-kind: PodMonitor
-metadata:
-  name: cert-manager
-  namespace: cert-manager
-  labels:
-    app: cert-manager
-    app.kubernetes.io/name: cert-manager
-    app.kubernetes.io/instance: cert-manager
-    app.kubernetes.io/component: "controller"
-spec:
-  jobLabel: app.kubernetes.io/name
-  selector:
-    matchLabels:
-      app: cert-manager
-      app.kubernetes.io/name: cert-manager
-      app.kubernetes.io/instance: cert-manager
-      app.kubernetes.io/component: "controller"
-  podMetricsEndpoints:
-    - port: http
-      honorLabels: true
-{{- end }}
-{{- end -}}

charts/enterprise/clusterissuer/templates/clusterissuer/_ACME.tpl

@@ -1,4 +1,10 @@
 {{- define "certmanager.clusterissuer.acme" -}}
+{{- $namespace := "cert-manager" -}}
+{{- if $.Values.operator.certmanager -}}
+{{- if $.Values.operator.certmanager.namespace -}}
+{{- $namespace = $.Values.operator.certmanager.namespace -}}
+{{- end -}}
+{{- end -}}
 {{- range .Values.clusterIssuer.ACME }}
   {{- if not (mustRegexMatch "^[a-z]+(-?[a-z]){0,63}-?[a-z]+$" .name) -}}
     {{- fail "ACME - Expected name to be all lowercase with hyphens, but not start or end with a hyphen" -}}
@@ -80,7 +86,7 @@ spec:
 apiVersion: v1
 kind: Secret
 metadata:
-  namespace: cert-manager
+  namespace: {{ $namespace }}
   name: {{ $issuerSecretName }}
 type: Opaque
 stringData:

charts/enterprise/clusterissuer/templates/clusterissuer/_CA.tpl

@@ -1,4 +1,11 @@
 {{- define "certmanager.clusterissuer.ca" -}}
+{{- $namespace := "cert-manager" -}}
+{{- if $.Values.operator.certmanager -}}
+{{- if $.Values.operator.certmanager.namespace -}}
+{{- $namespace = $.Values.operator.certmanager.namespace -}}
+{{- end -}}
+{{- end -}}
+
 {{- range .Values.clusterIssuer.CA }}
   {{- if not (mustRegexMatch "^[a-z]+(-?[a-z]){0,63}-?[a-z]+$" .name) -}}
     {{- fail "CA - Expected name to be all lowercase with hyphens, but not start or end with a hyphen" -}}
@@ -16,7 +23,7 @@ apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
   name: {{ .name }}-selfsigned-ca
-  namespace: cert-manager
+  namespace: {{ $namespace }}
 spec:
   isCA: true
   commonName: {{ .selfSignedCommonName }}
@@ -34,7 +41,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ .name }}-ca
-  namespace: cert-manager
+  namespace: {{ $namespace }}
 data:
   tls.crt: {{ .crt | b64enc }}
   tls.key: {{ .key | b64enc }}

charts/enterprise/clusterissuer/templates/common.yaml

@@ -7,4 +7,3 @@
 {{- include "certmanager.clusterissuer.acme" . }}
 {{- include "certmanager.clusterissuer.selfsigned" . }}
 {{- include "certmanager.clusterissuer.ca" . }}
-{{- include "certmanager.metrics" . }}