Reference globals instead

charts/subcharts/templates/cert-manager.yaml

@@ -12,12 +12,12 @@ spec:
     solvers:
       - dns01:
           rfc2136:
-            nameserver: {{ .Values.rfc2136.nameserver | quote }}
+            nameserver: {{ .Values.global.rfc2136.nameserver | quote }}
-            tsigKeyName: {{ .Values.rfc2136.tsigKeyName | quote }}
+            tsigKeyName: {{ .Values.global.rfc2136.tsigKeyName | quote }}
-            tsigAlgorithm: {{ .Values.rfc2136.tsigAlgorithm | quote }}
+            tsigAlgorithm: {{ .Values.global.rfc2136.tsigAlgorithm | quote }}
             tsigSecretSecretRef:
-              name: {{ .Values.rfc2136.tsigSecretName | quote }}
+              name: {{ .Values.global.rfc2136.tsigSecretName | quote }}
-              key: {{ .Values.rfc2136.tsigSecretKey | quote }}
+              key: {{ .Values.global.rfc2136.tsigSecretKey | quote }}
 ---
 apiVersion: cert-manager.io/v1
 kind: Certificate
@@ -29,12 +29,12 @@ spec:
   secretTemplate:
     annotations:
       replicator.v1.mittwald.de/replication-allowed: "true"
-      replicator.v1.mittwald.de/replicate-to: "{{ .Values.replicatorNamespaces }}"
+      replicator.v1.mittwald.de/replicate-to: "{{ .Values.global.replicatorNamespaces }}"
   issuerRef:
     name: {{ .Values.global.issuerName }}
     kind: ClusterIssuer
   commonName: {{ .Values.global.domain | quote }}
   dnsNames:
     - {{ .Values.global.domain | quote }}
-    - "*."{{ .Values.global.domain | quote }}
+    - "*.{{ .Values.global.domain }}"
 

values.yaml

@@ -4,11 +4,12 @@ global:
   issuerName: letsencrypt-rfc2136
   email: admin@hxme.net
 
-rfc2136:
+  rfc2136:
     nameserver: hawke.hxst.com.au:53
     tsigKeyName: hxme-update-key
     tsigAlgorithm: HMACSHA512
     tsigSecretName: hxme-update-key
     tsigSecretKey: hxme-update-key
 
-replicatorNamespaces: "monitoring,authentik,nextcloud"
+  replicatorNamespaces: "monitoring,authentik,nextcloud"
+