Support additional hostnames in Ingress (#480)

README.md

@@ -53,7 +53,9 @@ If you are using an ingress gateway (like istio), you have to change your inboun
 
 By default, NGINX is enabled to allow sending the incoming requests to [Sentry Relay](https://getsentry.github.io/relay/) or the Django backend depending on the path. When Sentry is meant to be exposed outside of the Kubernetes cluster, it is recommended to disable NGINX and let the Ingress do the same. It's recommended to go with the go to Ingress Controller, [NGINX Ingress](https://kubernetes.github.io/ingress-nginx/) but others should work as well.
 
-Note: if you are using NGINX Ingress, please set this annotation on your ingress : nginx.ingress.kubernetes.io/use-regex: "true"
+Note: if you are using NGINX Ingress, please set this annotation on your ingress : nginx.ingress.kubernetes.io/use-regex: "true".
+If you are using `additionalHostNames` the `nginx.ingress.kubernetes.io/upstream-vhost` annotation might also come in handy.
+It sets the `Host` header to the value you provide to avoid CSRF issues.
 
 ## Clickhouse warning
 

sentry/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: sentry
 description: A Helm chart for Kubernetes
 type: application
-version: 11.7.0
+version: 11.8.0
 appVersion: 21.8.0
 dependencies:
   - name: redis

sentry/templates/ingress.yaml

@@ -24,7 +24,14 @@ spec:
   ingressClassName: {{ .Values.ingress.ingressClassName | quote }}
   {{- end }}
   rules:
-    - host: {{ .Values.ingress.hostname }}
+{{- $hosts := list .Values.ingress.hostname }}
+{{- range .Values.ingress.additionalHostNames -}}
+{{- $hosts = append $hosts . -}}
+{{- end -}}
+{{- $outer := . -}}
+{{- range $idx, $host := $hosts }}
+{{- with $outer }}
+    - host: {{ $host }}
       http:
         paths:
     {{- if .Values.nginx.enabled }}
@@ -165,8 +172,10 @@ spec:
               servicePort: {{ .Values.service.externalPort }}
               {{- end }}
     {{- end }}
+{{- end -}}
+{{- end -}}
 {{- if .Values.ingress.tls }}
   tls:
 {{ toYaml .Values.ingress.tls | indent 4 }}
 {{- end -}}
-{{- end -}}
+{{- end -}}

sentry/values.yaml

@@ -524,6 +524,7 @@ ingress:
   #   nginx.ingress.kubernetes.io/use-regex: "true"
   #
   # hostname:
+  # additionalHostNames: []
   #
   # tls:
   # - secretName: