Merge pull request #1436 from porter-dev/main

main -> production

Author: rudimk

applications/web/templates/multiple-wildcard-ingress.yaml

@@ -45,12 +45,14 @@ spec:
 {{- if hasKey $.Values.multipleWildcardIngress.annotations "kubernetes.io/ingress.class" }}
   ingressClassName: {{ index $.Values.multipleWildcardIngress.annotations "kubernetes.io/ingress.class" }}
 {{- else }}
-  ingressClassName: nginx
+  ingressClassName: {{ $.Values.multipleWildcardIngress.ingressClass }}
 {{- end }}
+  {{- if $hostDetails.tlsSecret}}
   tls:
     - hosts:
         - {{ $hostDetails.hostName | quote }}
       secretName: {{ $hostDetails.tlsSecret }}
+  {{- end }}
   rules:
       - host: {{ $hostDetails.hostName | quote }}
         http:

applications/web/values.yaml

@@ -65,6 +65,7 @@ multipleWildcardIngress:
   enabled: false
   ingressClass: nginx
   # hosts contains a list of objects, each object contains a hostName and a tlsSecret
+  # Leave tlsSecret blank ONLY if you want to allow Ingress for a specific host without TLS
   hosts: []
   custom_domain: true
   rewriteCustomPathsEnabled: true