Merge pull request #1633 from porter-dev/main

main -> production

Author: rudimk

applications/web/templates/ingress.yaml

@@ -26,6 +26,8 @@ spec:
       {{- if not $.Values.ingress.useDefaultIngressTLSSecret }}
       {{ if $.Values.ingress.wildcard }}
       secretName: wildcard-cert-tls
+      {{ else if and $.Values.ingress.wildcard $.Values.ingress.setUniqueWildcardName }}
+      secretName: '{{ include "docker-template.fullname" $ }}-{{ . | replace "." "-" }}'
       {{ else if $.Values.ingress.customTls.enabled }}
       secretName: {{ $.Values.ingress.customTls.customTlsSecret }}
       {{ else }}

applications/web/values.yaml

@@ -57,6 +57,7 @@ ingress:
   rewriteCustomPathsEnabled: true
   annotations: {}
   wildcard: false
+  setUniqueWildcardName: false
   tls: true
   useDefaultIngressTLSSecret: false
   separateTlsPerCustomDomain: true