From 5c56610ee98ad742e50d85e4e8d2d38b1317afbe Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 30 Nov 2023 11:41:27 +0100
Subject: [PATCH] ingress certmanager annotations
---
src/main/helm/templates/ingress.yaml | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/helm/templates/ingress.yaml b/src/main/helm/templates/ingress.yaml
index 68307d45..421e36f3 100644
--- a/src/main/helm/templates/ingress.yaml
+++ b/src/main/helm/templates/ingress.yaml
@@ -29,7 +29,11 @@ metadata:
annotations: {{- toYaml . | nindent 4 }}
{{- end }}
more_set_headers "Access-Control-Allow-Origin: {{ (include "app.goofyAddress" .) }}";
- {{- if (.Values.ingress).use_staging_cert }}
+ {{- if (.Values.ingress).certManagerAnnotations -}}
+ {{- range (.Values.ingress).certManagerAnnotations }}
+{{ . | indent 4 }}
+ {{- end }}
+ {{- else if (.Values.ingress).use_staging_cert }}
cert-manager.io/cluster-issuer: letsencrypt-staging
{{- else }}
cert-manager.io/cluster-issuer: letsencrypt-prod
@@ -54,6 +58,8 @@ spec:
tls:
- hosts:
- {{ trimPrefix "https://" ( include "app.baseUrl" . ) }}
- {{- if ne (.Values).cluster_env "dataport" }}
+ {{- if (.Values.ingress).tlsSecretName }}
+ secretName: {{ (.Values.ingress).tlsSecretName }}
+ {{- else if ne (.Values).cluster_env "dataport" }}
secretName: {{ .Values.kop.bezeichner }}-{{ include "app.name" . }}-tls
{{- end }}
\ No newline at end of file
--
GitLab