From 9f287165ca32238c6834d39b8ef7f4ed0ce90813 Mon Sep 17 00:00:00 2001
From: Vivian Rook <vrook@wikimedia.org>
Date: Fri, 28 Oct 2022 09:20:46 -0400
Subject: [PATCH] mount nfs into pods

Bug: T321886
---
 paws/nfs.yaml              | 23 ----------------------
 paws/production.yaml       | 39 +++++++++++++++++---------------------
 paws/templates/public.yaml |  6 ++----
 paws/values.yaml           | 21 +++++++++-----------
 4 files changed, 28 insertions(+), 61 deletions(-)
 delete mode 100644 paws/nfs.yaml

diff --git a/paws/nfs.yaml b/paws/nfs.yaml
deleted file mode 100644
index 68bf6ba2..00000000
--- a/paws/nfs.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-jupyterhub:
-  hub:
-    extraVolumes:
-    - name: homes
-      nfs:
-        server: 192.168.122.223
-        path: /mnt/project
-    - name: dumps
-      nfs:
-        server: 192.168.122.223
-        path: /mnt/public/dumps
-    # Without this, dumps becomes inaccessible and can hang the host
-    - name: dumps-src1
-      nfs:
-        server: 192.168.122.223
-        path: /mnt/nfs/dumps-labstore1007.wikimedia.org
-    - name: dumps-src2
-      nfs:
-        server: 192.168.122.223
-        path: /mnt/nfs/dumps-labstore1006.wikimedia.org
-    extraConfig:
-      00-myConfig: |
-          localdev = False
diff --git a/paws/production.yaml b/paws/production.yaml
index 4c54efb9..faf38978 100644
--- a/paws/production.yaml
+++ b/paws/production.yaml
@@ -10,28 +10,23 @@ dbProxy:
 jupyterhub:
   hub:
     extraVolumes:
-    - name: homes
-      nfs:
-        server: nfs-for-test-paws.admin.codfw1dev.wikimedia.cloud
-        #server: nfs-tools-project.svc.eqiad.wmnet
-        path: /mnt/project
-        #path: /srv/misc/shared/paws/project
-    - name: dumps
-      nfs:
-        server: nfs-for-test-paws.admin.codfw1dev.wikimedia.cloud
-        #server: labstore1007.wikimedia.org
-        path: /
-    # Without this, dumps becomes inaccessible and can hang the host
-    - name: dumps-src1
-      nfs:
-        server: nfs-for-test-paws.admin.codfw1dev.wikimedia.cloud
-        #server: labstore1007.wikimedia.org
-        path: /
-    - name: dumps-src2
-      nfs:
-        server: nfs-for-test-paws.admin.codfw1dev.wikimedia.cloud
-        #server: labstore1006.wikimedia.org
-        path: /
+      - name: homes
+        nfs:
+          server: nfs-tools-project.svc.eqiad.wmnet
+          path: /srv/misc/shared/paws/project
+      - name: dumps
+        nfs:
+          server: labstore1007.wikimedia.org
+          path: /
+      # Without this, dumps becomes inaccessible and can hang the host
+      - name: dumps-src1
+        nfs:
+          server: labstore1007.wikimedia.org
+          path: /
+      - name: dumps-src2
+        nfs:
+          server: labstore1006.wikimedia.org
+          path: /
     extraConfig:
       00-myConfig: |
           localdev = False
diff --git a/paws/templates/public.yaml b/paws/templates/public.yaml
index ef31f9e7..b7ffc576 100644
--- a/paws/templates/public.yaml
+++ b/paws/templates/public.yaml
@@ -46,8 +46,7 @@ spec:
             path: /mnt/project/paws/userhomes
 {{ else }}
         - nfs:
-            server: nfs-for-test-paws.admin.codfw1dev.wikimedia.cloud
-            #server: nfs-tools-project.svc.eqiad.wmnet
+            server: nfs-tools-project.svc.eqiad.wmnet
             path: /srv/misc/shared/paws/project/paws/userhomes
 {{ end }}
           name: pawshomes
@@ -95,8 +94,7 @@ spec:
             path: /mnt/project/paws/userhomes
 {{ else }}
         - nfs:
-            server: nfs-for-test-paws.admin.codfw1dev.wikimedia.cloud
-            #server: nfs-tools-project.svc.eqiad.wmnet
+            server: nfs-tools-project.svc.eqiad.wmnet
             path: /srv/misc/shared/paws/project/paws/userhomes
 {{ end }}
           name: pawshomes
diff --git a/paws/values.yaml b/paws/values.yaml
index 9fad586e..120764d2 100644
--- a/paws/values.yaml
+++ b/paws/values.yaml
@@ -166,14 +166,16 @@ jupyterhub:
                   # Set rather than use .extend!
                   # Since otherwise the volumes list will grow each time
                   # the spawner stops and starts!
+
                   homedir = '/data/project/paws/userhomes/{}'.format(identity['sub'])
+                  homenfs = '/mnt/project/paws/userhomes/{}'.format(identity['sub'])
                   # Create the homedir so docker doesn't do it as root
                   os.makedirs(homedir, mode=0o755, exist_ok=True)
                   if localdev == True:
                       spawner.volumes = [
                           {
                               'name': 'home',
-                              'hostPath': { 'path': homedir }
+                              'hostPath': { 'path': homenfs }
                           },
                           {
                               'name': 'dumps',
@@ -189,27 +191,22 @@ jupyterhub:
                           }
                       ]
                   else:
-                      homenfs = '/mnt/project/paws/userhomes/{}'.format(identity['sub'])
                       spawner.volumes = [
                           {
                               'name': 'home',
-                              'nfs': { 'server': 'nfs-for-test-paws.admin.codfw1dev.wikimedia.cloud', 'path': homenfs }
-                              #'nfs': { 'server': 'nfs-tools-project.svc.eqiad.wmnet', 'path': homenfs }
+                              'nfs': { 'server': 'nfs-tools-project.svc.eqiad.wmnet', 'path': homenfs }
                           },
                           {
                               'name': 'dumps',
-                              'nfs': { 'server': 'nfs-for-test-paws.admin.codfw1dev.wikimedia.cloud', 'path': '/' }
-                              #'nfs': { 'server': 'labstore1007.wikimedia.org', 'path': '/' }
+                              'nfs': { 'server': 'clouddumps1001.wikimedia.org', 'path': '/' }
                           },
                           {
                               'name': 'dumps-src1',
-                              'nfs': { 'server': 'nfs-for-test-paws.admin.codfw1dev.wikimedia.cloud', 'path': '/' }
-                              #'nfs': { 'server': 'clouddumps1002.wikimedia.org', 'path': '/' }
+                              'nfs': { 'server': 'clouddumps1002.wikimedia.org', 'path': '/' }
                           },
                           {
                               'name': 'dumps-src2',
-                              'nfs': { 'server': 'nfs-for-test-paws.admin.codfw1dev.wikimedia.cloud', 'path': '/' }
-                              #'nfs': { 'server': 'clouddumps1002.wikimedia.org', 'path': '/' }
+                              'nfs': { 'server': 'clouddumps1001.wikimedia.org', 'path': '/' }
                           }
                       ]
 
@@ -284,10 +281,10 @@ jupyterhub:
       tag: pr-222 # singleuser tag managed by github actions
       pullPolicy: Always
     memory:
-      guarantee: .1G
+      guarantee: 1G
       limit: 3G
     cpu:
-      guarantee: .1
+      guarantee: .5
       limit: 1
     storage:
       type: none