From fa3108d7b029f434e84842b9d5e6fb5ddbff2484 Mon Sep 17 00:00:00 2001
From: Craig Russell <ctr26@ebi.ac.uk>
Date: Tue, 3 Sep 2024 16:21:34 +0100
Subject: [PATCH] [fix] updating daskhub, adding gpu, removing old gpu, adding
 allow all auth

---
 daskhub/values.yaml | 19 +++++++++++--------
 helmsman.yaml       | 25 ++++++++++++-------------
 helmsman/local.yaml | 12 ------------
 3 files changed, 23 insertions(+), 33 deletions(-)

diff --git a/daskhub/values.yaml b/daskhub/values.yaml
index 674cb95..b48b10b 100644
--- a/daskhub/values.yaml
+++ b/daskhub/values.yaml
@@ -31,6 +31,9 @@ jupyterhub:
   # See https://github.com/jupyterhub/zero-to-jupyterhub-k8s/blob/master/jupyterhub/values.yaml
   hub:
     config:
+      Authenticator:
+        enable_auth_state: true
+        allow_all: true   ## Add this to allow all users
       GenericOAuthenticator:
         # client_id: cfac1c45-ab70-4596-b5b6-d1d92cf8ce3b
         # client_secret: c064871e-2b7b-4b64-a6cb-0c0b3821d262e1002124-2cb5-4d80-ab64-f82b1ad6e2c6
@@ -97,14 +100,14 @@ jupyterhub:
         kubespawner_override:
           cpu_limit: 8
           mem_limit: "32G"
-      - display_name: "1 GPU High Memory"
-        description: "Environment with 4 CPUs, 16Gi RAM, and 1 GPU"
-        kubespawner_override:
-          image: pangeo/ml-notebook
-          cpu_limit: 4
-          mem_limit: "16G"
-          extra_resource_limits:
-            nvidia.com/gpu: "1"
+      # - display_name: "1 GPU High Memory"
+      #   description: "Environment with 4 CPUs, 16Gi RAM, and 1 GPU"
+      #   kubespawner_override:
+      #     image: pangeo/ml-notebook
+      #     cpu_limit: 4
+      #     mem_limit: "16G"
+      #     extra_resource_limits:
+      #       nvidia.com/gpu: "1"
 
 dask-gateway:
   enabled: true  # Enabling dask-gateway will install Dask Gateway as a dependency.
diff --git a/helmsman.yaml b/helmsman.yaml
index 5a592e2..0ed4a3b 100644
--- a/helmsman.yaml
+++ b/helmsman.yaml
@@ -1,7 +1,3 @@
-namespaces:
-  prod:
-  dev:
-
 metadata:
   organization: EBI
   maintainer: Craig Russell (ctr26@ebi.ac.uk)
@@ -46,7 +42,17 @@ appsTemplates:
       config.BinderHub.use_registry: true
 
 
+
 apps:
+
+  nvidia-device-plugin:
+    name: "nvidia-device-plugin"
+    namespace: "nvidia-device-plugin"
+    chart: "nvdp/nvidia-device-plugin"
+    group: "prod"
+    enabled: false
+    version: "0.10.0"
+
   docker-registry:
     name: "docker-registry"
     namespace: "docker-registry"
@@ -68,7 +74,7 @@ apps:
     chart: "ingress-nginx/ingress-nginx"
     wait: true
     group: "prod"
-    enabled: true
+    enabled: false
     priority: -100
     version: "4.6.0"
     valuesFiles:
@@ -99,6 +105,7 @@ apps:
     valuesFiles:
     - "binderhub/values.yaml"
 
+
   cert-manager:
     name: "cert-manager"
     chart: "jetstack/cert-manager"
@@ -125,11 +132,3 @@ apps:
     enabled: false
     version: "1.9.1"
     group: "prod"
-
-  nvidia-device-plugin:
-    name: "nvidia-device-plugin"
-    namespace: "nvidia-device-plugin"
-    chart: "nvdp/nvidia-device-plugin"
-    group: "prod"
-    enabled: false
-    version: "0.10.0"
\ No newline at end of file
diff --git a/helmsman/local.yaml b/helmsman/local.yaml
index ac04a3b..efa6d57 100644
--- a/helmsman/local.yaml
+++ b/helmsman/local.yaml
@@ -45,15 +45,3 @@ apps:
     valuesFiles:
     - "../binderhub/values.yaml"
     - "../binderhub/local.yaml"
-  binderhub-gpu:
-    namespace: "prod"
-    enabled: false
-    # valuesFiles:
-    # - "../binderhub/values.yaml"
-    # - "../binderhub/local.yaml"
-    # - "../binderhub/local/gpu.yaml"
- 
-  # cert-manager:
-    # enabled: true
-  # nvidia-gpu-operator:
-    # enabled: true