From dcc04e54f3a528b181978e3428f4631e02d8c689 Mon Sep 17 00:00:00 2001
From: Mathias Petermann <mathias.petermann@gmail.com>
Date: Mon, 27 Mar 2023 17:12:28 +0200
Subject: [PATCH] fix(cert manager): Fix manifest if
cert_manager_trusted_internal_ca is provided (#9922)
---
.../templates/cert-manager.yml.j2 | 22 +++++++++----------
1 file changed, 11 insertions(+), 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
index 9696d5156..69635b351 100644
--- 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
--
GitLab