From 63b776bce8ddebee0df973ab390c45c7322683fb Mon Sep 17 00:00:00 2001
From: Ilya Kreymer <ikreymer@users.noreply.github.com>
Date: Wed, 23 Aug 2023 11:36:52 -0700
Subject: [PATCH] ingress: minor tweaks to ingress to update to latest spec:
 (#1096)

- use pathType ImplementationSpecific for regexes
- use ingressClassName instead of annotation
---
 chart/templates/ingress.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/chart/templates/ingress.yaml b/chart/templates/ingress.yaml
index 04ab5cc2..f4fdadb2 100644
--- a/chart/templates/ingress.yaml
+++ b/chart/templates/ingress.yaml
@@ -7,7 +7,6 @@ metadata:
   name: ingress-main
   namespace: {{ .Release.Namespace }}
   annotations:
-    kubernetes.io/ingress.class: {{ .Values.ingress_class | default "nginx" }}
     nginx.ingress.kubernetes.io/ssl-redirect: "true"
     nginx.ingress.kubernetes.io/rewrite-target: /$1
     # cors enabled via backend directly on allowed paths
@@ -23,6 +22,7 @@ metadata:
       proxy_set_header X-Forwarded-Proto {{ .Values.ingress.scheme | default "https" }};
 
 spec:
+  ingressClassName: {{ .Values.ingress_class | default "nginx" }}
   {{- if .Values.ingress.tls }}
   tls:
     - hosts:
@@ -35,7 +35,7 @@ spec:
     http:
       paths:
       - path: /(api/.*)
-        pathType: Prefix
+        pathType: ImplementationSpecific
         backend:
           service:
             name: browsertrix-cloud-backend
@@ -43,7 +43,7 @@ spec:
               number: 8000
 
       - path: /(.*)
-        pathType: Prefix
+        pathType: ImplementationSpecific
         backend:
           service:
             name: browsertrix-cloud-frontend