Revert "Revert "fix(ingress): ensure only capture and decide go to events"

charts/posthog/Chart.yaml

@@ -11,7 +11,7 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 30.2.6
+version: 30.2.7
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.

charts/posthog/templates/ingress.yaml

@@ -78,24 +78,57 @@ spec:
                 port:
                   number: {{ .Values.service.externalPort }}
           {{- if (ne (include "ingress.type" .) "clb") }}
+          # Match any url with a prefix ending with a forward-slash. Previously
+          # we would match without the forward-slash. To ensure that we pick up
+          # with the forward-slash omitted we also match Exact. Note that we
+          # could use e.g. [ingress-nginx regex support](https://kubernetes.github.io/ingress-nginx/user-guide/ingress-path-matching/#regular-expression-support)
+          # but to keep this agnostic we use a combination of Prefix and Exact.
+          #
+          # NOTE: we still use a Prefix match on paths with a forward-slash,
+          # just in case there are cases that we have subpaths for these
+          # endpoints that still need to be passed to the `posthog-events` pods.
           - pathType: Prefix
+            path: "/capture/"
+            backend: *INGESTION
+          - pathType: Exact
             path: "/capture"
             backend: *INGESTION
+
           - pathType: Prefix
+            path: "/decide/"
+            backend: *INGESTION
+          - pathType: Exact
             path: "/decide"
             backend: *INGESTION
+
           - pathType: Prefix
+            path: "/e/"
+            backend: *INGESTION
+          - pathType: Exact
             path: "/e"
             backend: *INGESTION
+
           - pathType: Prefix
+            path: "/engage/"
+            backend: *INGESTION
+          - pathType: Exact
             path: "/engage"
             backend: *INGESTION
+
           - pathType: Prefix
+            path: "/track/"
+            backend: *INGESTION
+          - pathType: Exact
             path: "/track"
             backend: *INGESTION
+
           - pathType: Prefix
+            path: "/s/"
+            backend: *INGESTION
+          - pathType: Exact
             path: "/s"
             backend: *INGESTION
+
           {{- else }}
           - pathType: ImplementationSpecific
             path: "/capture/*"

charts/posthog/tests/__snapshot__/ingress.yaml.snap

@@ -17,45 +17,87 @@ the "spec" path should match the snapshot when using default values:
                 number: 8000
           path: /batch
           pathType: Prefix
+        - backend:
+            service:
+              name: RELEASE-NAME-posthog-events
+              port:
+                number: 8000
+          path: /capture/
+          pathType: Prefix
         - backend:
             service:
               name: RELEASE-NAME-posthog-events
               port:
                 number: 8000
           path: /capture
+          pathType: Exact
+        - backend:
+            service:
+              name: RELEASE-NAME-posthog-events
+              port:
+                number: 8000
+          path: /decide/
           pathType: Prefix
         - backend:
             service:
               name: RELEASE-NAME-posthog-events
               port:
                 number: 8000
           path: /decide
+          pathType: Exact
+        - backend:
+            service:
+              name: RELEASE-NAME-posthog-events
+              port:
+                number: 8000
+          path: /e/
           pathType: Prefix
         - backend:
             service:
               name: RELEASE-NAME-posthog-events
               port:
                 number: 8000
           path: /e
+          pathType: Exact
+        - backend:
+            service:
+              name: RELEASE-NAME-posthog-events
+              port:
+                number: 8000
+          path: /engage/
           pathType: Prefix
         - backend:
             service:
               name: RELEASE-NAME-posthog-events
               port:
                 number: 8000
           path: /engage
+          pathType: Exact
+        - backend:
+            service:
+              name: RELEASE-NAME-posthog-events
+              port:
+                number: 8000
+          path: /track/
           pathType: Prefix
         - backend:
             service:
               name: RELEASE-NAME-posthog-events
               port:
                 number: 8000
           path: /track
+          pathType: Exact
+        - backend:
+            service:
+              name: RELEASE-NAME-posthog-events
+              port:
+                number: 8000
+          path: /s/
           pathType: Prefix
         - backend:
             service:
               name: RELEASE-NAME-posthog-events
               port:
                 number: 8000
           path: /s
-          pathType: Prefix
+          pathType: Exact