# HG changeset patch # User Xavier Garnier <xavier.garnier@logilab.fr> # Date 1712570476 -7200 # Mon Apr 08 12:01:16 2024 +0200 # Node ID fbcef7dd8ac5a6136b03e32f7da46c7ed959c53a # Parent ae06f1bbee9d3d5f0e9eac02f38eb29b5cb46cf4 feat(ingress): add corsAllowOrigin values to set cors annotations diff --git a/templates/ingress.yaml b/templates/ingress.yaml --- a/templates/ingress.yaml +++ b/templates/ingress.yaml @@ -15,6 +15,10 @@ {{- 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: |- diff --git a/values.yaml b/values.yaml --- a/values.yaml +++ b/values.yaml @@ -64,6 +64,7 @@ path: / annotations: {} # noindex: true + corsAllowOrigin: false # can be false, "*", "toto.example.org" … # Additional ingresses additionalIngresses: [] # HG changeset patch # User Xavier Garnier <xavier.garnier@logilab.fr> # Date 1712570512 -7200 # Mon Apr 08 12:01:52 2024 +0200 # Node ID 42036adcd0a70631605492a1e94d151d81931d20 # Parent fbcef7dd8ac5a6136b03e32f7da46c7ed959c53a feat(ingress): move deprecated ingress.class annotation to ingressClassName diff --git a/templates/ingress.yaml b/templates/ingress.yaml --- a/templates/ingress.yaml +++ b/templates/ingress.yaml @@ -7,7 +7,6 @@ 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" {{- with .Values.ingress.clusterIssuer }} cert-manager.io/cluster-issuer: {{ . }} @@ -25,6 +24,7 @@ add_header X-Robots-Tag "noindex, nofollow"; {{- end}} spec: + ingressClassName: nginx tls: - hosts: - {{ .Values.host }} # HG changeset patch # User Xavier Garnier <xavier.garnier@logilab.fr> # Date 1712937774 -7200 # Fri Apr 12 18:02:54 2024 +0200 # Node ID 07d511e4a0bb131115c065a0f1ad19ed4aa0c911 # Parent 42036adcd0a70631605492a1e94d151d81931d20 feat(ingress): add redirectToFromWww value diff --git a/templates/ingress.yaml b/templates/ingress.yaml --- a/templates/ingress.yaml +++ b/templates/ingress.yaml @@ -8,6 +8,9 @@ app.kubernetes.io/instance: {{ .Release.Name }} annotations: 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 }} @@ -28,6 +31,9 @@ tls: - hosts: - {{ .Values.host }} + {{- if .Values.ingress.redirectToFromWww }} + - www.{{ .Values.host }} + {{- end }} {{- if .Values.ingress.tlsSecret }} secretName: {{ .Release.Name }}-tls {{- end }} diff --git a/values.yaml b/values.yaml --- a/values.yaml +++ b/values.yaml @@ -65,6 +65,7 @@ annotations: {} # noindex: true corsAllowOrigin: false # can be false, "*", "toto.example.org" … + redirectToFromWww: false # Additional ingresses additionalIngresses: [] # HG changeset patch # User Xavier Garnier <xavier.garnier@logilab.fr> # Date 1712937802 -7200 # Fri Apr 12 18:03:22 2024 +0200 # Node ID a2909d42f1c678b0639ff299cb10f596d3443edb # Parent 07d511e4a0bb131115c065a0f1ad19ed4aa0c911 chore: prepare version 0.3.0 diff --git a/Chart.yaml b/Chart.yaml --- a/Chart.yaml +++ b/Chart.yaml @@ -2,4 +2,4 @@ name: web-app description: A Helm chart for web applitations type: application -version: 0.2.2 +version: 0.3.0 # HG changeset patch # User Xavier Garnier <xavier.garnier@logilab.fr> # Date 1712937812 -7200 # Fri Apr 12 18:03:32 2024 +0200 # Node ID f08919549ff5e60bb2ca777274f8cbf80aba4565 # Parent a2909d42f1c678b0639ff299cb10f596d3443edb Added tag 0.3.0 for changeset a2909d42f1c6 diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -8,3 +8,4 @@ 0b0bb2091bd728b1da6a9b780974e5fe2d588960 0.2.0 0510e6f3ef2a489c603fd8dbe4976a89991e1c39 0.2.1 60a8fadc3464197836ccbc8c439d65afe37b4a8b 0.2.2 +a2909d42f1c678b0639ff299cb10f596d3443edb 0.3.0