Removing ingress.class annotation

toolforge · Nov 1, 2022 · 8298478 · 8298478
1 parent d699bf9
commit 8298478
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 5 deletions.
diff --git a/paws/templates/frontpage.yaml b/paws/templates/frontpage.yaml
@@ -9,7 +9,6 @@ metadata:
     ingress.paws.wmcloud.org: front
   annotations:
     nginx.ingress.kubernetes.io/permanent-redirect: {{ .Values.paws.ingress.frontRedirect | quote }}
-    kubernetes.io/ingress.class: "nginx"
   name: paws-front-page
 spec:
   rules:

diff --git a/paws/templates/legacy.yaml b/paws/templates/legacy.yaml
@@ -9,7 +9,6 @@ metadata:
   annotations:
     nginx.ingress.kubernetes.io/permanent-redirect: $scheme://{{ .Values.pawspublic.ingress.host }}/$2$is_args$args
     nginx.ingress.kubernetes.io/use-regex: "true"
-    kubernetes.io/ingress.class: "nginx"
   name: paws-public-legacy
 spec:
   rules:
@@ -35,7 +34,6 @@ metadata:
   annotations:
     nginx.ingress.kubernetes.io/permanent-redirect: $scheme://{{ index .Values.jupyterhub.ingress.hosts 0 }}/$2
     nginx.ingress.kubernetes.io/use-regex: "true"
-    kubernetes.io/ingress.class: "nginx"
   name: paws-legacy
 spec:
   rules:

diff --git a/paws/templates/public.yaml b/paws/templates/public.yaml
@@ -149,7 +149,6 @@ metadata:
     name: paws-public-custom
     ingress.paws.wmcloud.org: public
   annotations:
-    kubernetes.io/ingress.class: "nginx"
   name: paws-public-custom
 spec:
   rules:

diff --git a/paws/values.yaml b/paws/values.yaml
@@ -260,7 +260,6 @@ jupyterhub:
         cpu: .2
   ingress:
     enabled: true
-    annotations: {kubernetes.io/ingress.class: "nginx"}
     hosts:
       - hub.paws.local
   # We are not on an autoscaling cluster, so we don't want this