fix(cert manager): Fix manifest if cert_manager_trusted_internal_ca i…

…s provided (#9922)
kubernetes-sigs · Mar 27, 2023 · dcc04e5 · dcc04e5
1 parent 4020a93
commit dcc04e5
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/roles/kubernetes-apps/ingress_controller/cert_manager/templates/cert-manager.yml.j2 b/roles/kubernetes-apps/ingress_controller/cert_manager/templates/cert-manager.yml.j2
@@ -964,6 +964,17 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: metadata.namespace
+{% if cert_manager_trusted_internal_ca is defined %}
+          volumeMounts:
+          - mountPath: /etc/ssl/certs/internal-ca.pem
+            name: ca-internal-truststore
+            subPath: internal-ca.pem
+      volumes:
+      - configMap:
+          defaultMode: 420
+          name: ca-internal-truststore
+        name: ca-internal-truststore
+{% endif %}
 {% if cert_manager_tolerations %}
       tolerations:
         {{ cert_manager_tolerations | to_nice_yaml(indent=2) | indent(width=8) }}
@@ -983,17 +994,6 @@ spec:
       dnsConfig:
         {{ cert_manager_dns_config | to_nice_yaml | indent(width=8) }}
 {% endif %}
-{% if cert_manager_trusted_internal_ca is defined %}
-          volumeMounts:
-          - mountPath: /etc/ssl/certs/internal-ca.pem
-            name: ca-internal-truststore
-            subPath: internal-ca.pem
-      volumes:
-      - configMap:
-          defaultMode: 420
-          name: ca-internal-truststore
-        name: ca-internal-truststore
-{% endif %}
 ---
 # Source: cert-manager/deploy/charts/cert-manager/templates/webhook-deployment.yaml
 apiVersion: apps/v1