ingress: minor tweaks to ingress to update to latest spec: (#1096)

- use pathType ImplementationSpecific for regexes
- use ingressClassName instead of annotation
This commit is contained in:
Ilya Kreymer 2023-08-23 11:36:52 -07:00 committed by GitHub
parent ce5b52f8af
commit 63b776bce8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

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