From ad3ef50e0d928b003a84cf3d62f97c11a56fb66e Mon Sep 17 00:00:00 2001
From: Pan Luo <pan.luo@ubc.ca>
Date: Mon, 18 Nov 2024 15:15:58 -0800
Subject: [PATCH] Switch to new shib-web container v1.0.0

---
 jupyterhub/templates/shib/ingress.yml |  2 +-
 jupyterhub/templates/shib/service.yml | 10 +++-------
 jupyterhub/values.yaml                |  4 ++--
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/jupyterhub/templates/shib/ingress.yml b/jupyterhub/templates/shib/ingress.yml
index e913d670a5..0165e6b472 100644
--- a/jupyterhub/templates/shib/ingress.yml
+++ b/jupyterhub/templates/shib/ingress.yml
@@ -21,6 +21,6 @@ spec:
               service:
                name: {{ include "jupyterhub.shib.fullname" . }}-web
                port:
-                number: 443
+                number: 80
 {{- end }}
 {{- end }}
diff --git a/jupyterhub/templates/shib/service.yml b/jupyterhub/templates/shib/service.yml
index 52efaaf124..15c0e82d7c 100644
--- a/jupyterhub/templates/shib/service.yml
+++ b/jupyterhub/templates/shib/service.yml
@@ -25,14 +25,10 @@ metadata:
 spec:
   type: NodePort
   ports:
-#  - port: 80
-#    targetPort: 80
-#    protocol: TCP
-#    name: http
-  - port: 443
-    targetPort: 443
+  - port: 80
+    targetPort: 80
     protocol: TCP
-    name: https
+    name: http
   selector:
     tier: web
 {{- end }}
diff --git a/jupyterhub/values.yaml b/jupyterhub/values.yaml
index a565c49743..5102b541ad 100644
--- a/jupyterhub/values.yaml
+++ b/jupyterhub/values.yaml
@@ -682,8 +682,8 @@ shib:
   port: 1600
   web:
     image:
-      name: 032401129069.dkr.ecr.ca-central-1.amazonaws.com/jupyterhub
-      tag: shib-web-latestv1
+      name: 032401129069.dkr.ecr.ca-central-1.amazonaws.com/shib-web
+      tag: v1.0.0
       pullPolicy:
       pullSecrets: []
     replicas: 1