From 38ae5579fb9fa0bd7acdb12218b6236bec2746ba Mon Sep 17 00:00:00 2001
From: Andrea Zonca <code@andreazonca.com>
Date: Thu, 17 Mar 2022 13:13:59 -0700
Subject: [PATCH] updates for cinder-csi and jupyterhub 1.2.0

---
 config_standard_storage.yaml   | 44 ++++++++++++++++++----------------
 cvmfs/cvmfs_pvc_services.yaml  |  4 ++--
 cvmfs/deployment_cvms_nfs.yaml |  4 ----
 cvmfs/nfs_data_volume.yaml     |  2 +-
 4 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/config_standard_storage.yaml b/config_standard_storage.yaml
index b069746..7258b9c 100644
--- a/config_standard_storage.yaml
+++ b/config_standard_storage.yaml
@@ -5,27 +5,29 @@ hub:
       accessModes:
         - ReadWriteOnce
       storage: 1Gi
-      storageClassName: standard
-  # run only on master nodes
-  nodeSelector:
-        node-role.kubernetes.io/master: ""
-  extraConfig: |
-    c.Spawner.http_timeout = 90
-    c.Spawner.args = [
-          "--ResourceUseDisplay.track_cpu_percent=True",
-    ]
-  tolerations:
-      - key: "node-role.kubernetes.io/master"
-        operator: Exists
+      storageClassName: cinder-csi
+  extraConfig:
+    timeout.py: |
+        c.Spawner.http_timeout = 90
+    track_cpu.py: |
+        c.Spawner.args = [
+              "--ResourceUseDisplay.track_cpu_percent=True",
+        ]
+#   # run only on master nodes
+#   nodeSelector:
+#         node-role.kubernetes.io/master: ""
+#   tolerations:
+#       - key: "node-role.kubernetes.io/master"
+#         operator: Exists
 
-proxy:
-  # run only on master nodes
-  chp:
-      nodeSelector:
-            node-role.kubernetes.io/master: ""
-      tolerations:
-          - key: "node-role.kubernetes.io/master"
-            operator: Exists
+# proxy:
+#   # run only on master nodes
+#   chp:
+#       nodeSelector:
+#             node-role.kubernetes.io/master: ""
+#       tolerations:
+#           - key: "node-role.kubernetes.io/master"
+#             operator: Exists
 
 singleuser:
   memory:
@@ -53,7 +55,7 @@ singleuser:
     type: dynamic
     capacity: 10Gi
     dynamic:
-      storageClass: standard
+      storageClass: cinder-csi
     extraVolumes:
         - name: cvmfs-nfs-volume
           nfs:
diff --git a/cvmfs/cvmfs_pvc_services.yaml b/cvmfs/cvmfs_pvc_services.yaml
index a29282b..8bc3b3a 100644
--- a/cvmfs/cvmfs_pvc_services.yaml
+++ b/cvmfs/cvmfs_pvc_services.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
   accessModes:
     - ReadWriteOnce
-  storageClassName: standard
+  storageClassName: cinder-csi
   resources:
     requests:
       storage: 200Gi
@@ -19,7 +19,7 @@ metadata:
 spec:
   accessModes:
     - ReadWriteOnce
-  storageClassName: standard
+  storageClassName: cinder-csi
   resources:
     requests:
       storage: 1Gi
diff --git a/cvmfs/deployment_cvms_nfs.yaml b/cvmfs/deployment_cvms_nfs.yaml
index 2c66fbe..df93562 100644
--- a/cvmfs/deployment_cvms_nfs.yaml
+++ b/cvmfs/deployment_cvms_nfs.yaml
@@ -27,10 +27,6 @@ spec:
             persistentVolumeClaim:
               claimName: data-pv-claim
       restartPolicy: Always
-      tolerations:
-          - key: "node-role.kubernetes.io/master"
-            operator: "Exists"
-            effect: "NoSchedule"
       containers:
           - image: zonca/cvmfs-client-nfs
             imagePullPolicy: Always
diff --git a/cvmfs/nfs_data_volume.yaml b/cvmfs/nfs_data_volume.yaml
index 06c64af..97df9a1 100644
--- a/cvmfs/nfs_data_volume.yaml
+++ b/cvmfs/nfs_data_volume.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
   accessModes:
     - ReadWriteOnce
-  storageClassName: standard
+  storageClassName: cinder-csi
   resources:
     requests:
       storage: 500Gi