From c9e3bd62b9aef9c60cde334da5edfddaceef2c08 Mon Sep 17 00:00:00 2001
From: Greg Merritt <gmerritt@berkeley.edu>
Date: Fri, 9 Aug 2024 11:07:40 -0700
Subject: [PATCH] nfs and load balancer fixes

---
 deployments/ugr01/config/common.yaml |  2 +-
 deployments/ugr01/config/prod.yaml   | 29 ++++++++++++++++++++--------
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/deployments/ugr01/config/common.yaml b/deployments/ugr01/config/common.yaml
index 9a897abec..9120cf1bf 100644
--- a/deployments/ugr01/config/common.yaml
+++ b/deployments/ugr01/config/common.yaml
@@ -1,7 +1,7 @@
 nfsPVC:
   enabled: true
   nfs:
-    serverIP: 10.49.181.18
+    serverIP: 10.185.238.42
 
 jupyterhub:
   scheduling:
diff --git a/deployments/ugr01/config/prod.yaml b/deployments/ugr01/config/prod.yaml
index 9268ff061..5ebf987d6 100644
--- a/deployments/ugr01/config/prod.yaml
+++ b/deployments/ugr01/config/prod.yaml
@@ -3,16 +3,29 @@ nfsPVC:
     shareName: shares/ugr01/prod
 
 jupyterhub:
-  ingress:
-    enabled: true
-    hosts:
-      - ugr01.datahub.berkeley.edu
-    tls:
-      - secretName: tls-cert
-        hosts:
-          - ugr01.datahub.berkeley.edu
   hub:
     db:
       pvc:
         # This also holds logs
         storage: 4Gi
+  prePuller:
+    continuous:
+      enabled: false
+  proxy:
+    service:
+      loadBalancerIP: 34.71.179.119
+    traefik:
+      extraInitContainers:
+        # This startup delay can help the k8s container network interface setup
+        # network routing of traffic to the pod, which is essential for the ACME
+        # challenge submitted by Traefik on startup to acquire a TLS certificate.
+        #
+        # Sleeping for 7 seconds has been consistently sufficient to avoid issues
+        # in GKE when this workaround was explored initially for GKE.
+        #
+        - name: startup-delay
+          image: busybox:stable
+          command: ["sh", "-c", "sleep 10"]
+    https:
+      hosts:
+        - ugr01.datahub.berkeley.edu