Topic/default/improvments

templates/ingress.yaml

@@ -7,5 +7,4 @@
     app.kubernetes.io/name: {{ .Values.appName }}
     app.kubernetes.io/instance: {{ .Release.Name }}
   annotations:
-    kubernetes.io/ingress.class: nginx
     nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
@@ -11,7 +10,10 @@
     nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
+    {{- if .Values.ingress.redirectToFromWww }}
+    nginx.ingress.kubernetes.io/from-to-www-redirect: "true"
+    {{- end }}
     {{- with .Values.ingress.clusterIssuer }}
     cert-manager.io/cluster-issuer: {{ . }}
     {{- end }}
     {{- with .Values.ingress.annotations }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
@@ -12,12 +14,16 @@
     {{- with .Values.ingress.clusterIssuer }}
     cert-manager.io/cluster-issuer: {{ . }}
     {{- end }}
     {{- with .Values.ingress.annotations }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
+    {{- if .Values.ingress.corsAllowOrigin }}
+    nginx.ingress.kubernetes.io/enable-cors: "true"
+    nginx.ingress.kubernetes.io/cors-allow-origin: "{{ .Values.ingress.corsAllowOrigin }}"
+    {{- end}}
     {{- $noindex := .Values.ingress.noindex | required ".Values.ingress.noindex is required." -}}
     {{- if .Values.ingress.noindex }}
     nginx.ingress.kubernetes.io/server-snippet: |-
        add_header X-Robots-Tag "noindex, nofollow";
     {{- end}}
 spec:
@@ -18,9 +24,10 @@
     {{- $noindex := .Values.ingress.noindex | required ".Values.ingress.noindex is required." -}}
     {{- if .Values.ingress.noindex }}
     nginx.ingress.kubernetes.io/server-snippet: |-
        add_header X-Robots-Tag "noindex, nofollow";
     {{- end}}
 spec:
+  ingressClassName: nginx
   tls:
     - hosts:
         - {{ .Values.host }}
@@ -24,6 +31,9 @@
   tls:
     - hosts:
         - {{ .Values.host }}
+        {{- if .Values.ingress.redirectToFromWww }}
+        - www.{{ .Values.host }}
+        {{- end }}
       {{- if .Values.ingress.tlsSecret }}
       secretName: {{ .Release.Name }}-tls
       {{- end }}