diff --git a/src/main/helm/templates/ingress.yaml b/src/main/helm/templates/ingress.yaml index 68307d45dd3f0f5af11bda1f8f2d4bb05a953d60..421e36f3bd25c446ea7f1e9c951ccd030f02ba6c 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