fix: correct nginx.conf and ingress settings for sentry 24.7.1 and

above (#1462)
sentry-kubernetes · Sep 17, 2024 · 07c8e4f · 07c8e4f
1 parent 2936c46
commit 07c8e4f
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/charts/sentry/templates/configmap-nginx.yaml b/charts/sentry/templates/configmap-nginx.yaml
@@ -35,6 +35,10 @@ data:
       location ~ ^/api/[1-9]\d*/ {
         proxy_pass http://relay;
       }
+
+      location ^~ /api/0/relays/ {
+        proxy_pass http://relay;
+      }
       {{ end -}}
 
       {{ if or .Values.nginx.metrics.enabled .Values.nginx.metrics.serviceMonitor.enabled -}}

diff --git a/charts/sentry/templates/ingress.yaml b/charts/sentry/templates/ingress.yaml
@@ -142,6 +142,24 @@ spec:
           - path: {{ default "/" .Values.ingress.path }}api/{[1-9][0-9]*}/{(.*)}
         {{- else }}
           - path: {{ default "/" .Values.ingress.path }}api/[1-9][0-9]*/(.*)
+        {{- end }}
+            {{- if $ingressSupportsPathType }}
+            pathType: {{ $ingressPathType }}
+            {{- end }}
+            backend:
+              {{- if $ingressApiIsStable }}
+              service:
+                name: {{ template "sentry.fullname" . }}-relay
+                port:
+                  number: {{ template "relay.port" . }}
+              {{- else }}
+              serviceName: {{ template "sentry.fullname" . }}-relay
+              servicePort: {{ template "relay.port" . }}
+              {{- end }}
+        {{- if eq (default "nginx" .Values.ingress.regexPathStyle) "traefik" }}
+          - path: {{ default "/" .Values.ingress.path }}api/0/relays/{(.*)}
+        {{- else }}
+          - path: {{ default "/" .Values.ingress.path }}api/0/relays/(.*)
         {{- end }}
             {{- if $ingressSupportsPathType }}
             pathType: {{ $ingressPathType }}