merging 5355/5356/5357/5359/5360/5361/5362/5363 to prod

.github/ISSUE_TEMPLATE/admin_request.yml

@@ -1,17 +1,17 @@
-name: Admin Access Request
-description: Request admin access for your instance of Datahub
+name: Request Elevated Privileges for Course Staff
+description: Enable course staff to manage student servers
 labels: "support"
-assignees: 
+assignees:
 - balajialg
 body:
   - type: markdown
     attributes:
       value: |
-        Please follow the sections in the template below and share the required information for providing admin access! If you are curious to understand the process through which we assign admin users, please refer to this documentation - https://docs.datahub.berkeley.edu/en/latest/admins/howto/course-config.html#defining-group-profiles 	
+        Course staff may be assigned elevated privileges on a hub to view and manage student servers. Please follow the sections in the template below and share the required information. If you are curious to understand the process through which we assign privileges, please refer to [our documentation](https://docs.datahub.berkeley.edu/en/latest/admins/howto/course-config.html#defining-group-profiles).
   - type: input
     attributes:
       label: Your Name
-      description: 
+      description:
     validations:
       required: true
   - type: input
@@ -22,16 +22,16 @@ body:
       required: true
   - type: input
     attributes:
-      label: Bcourses Id
-      description: bcourses id for the course you are teaching. You can find that in the URL to your course (It is a six digit number). Please ensure that the course is published in bcourses. If not, Datahub will not get the required group information from an unpublished course in bcourses.
+      label: bCourses ID
+      description: bCourses ID for the course you are teaching. You can find that in the URL to your course -- it is a six digit number. The course needs to be set to Published in bCourses, otherwise the hub will not be able to assign extra privileges.
     validations:
       required: true
   - type: input
     attributes:
       label: Role
-      description: Your role as part of the teaching team!
+      description: Your role as part of the teaching team
     validations:
-      required: true    
+      required: true
   - type: input
     attributes:
       label: Name of the Hub
@@ -40,22 +40,19 @@ body:
         - <!-- Eg: Datahub/Data 8/Data 100 etc.. -->
     validations:
       required: true
-  - type: markdown
-    attributes:
-      value: Remove @berkeley.edu as part of the shared usernames and send them to [email protected]
   - type: textarea
     attributes:
       label: End Date
-      description: Till when do you need admin access for the shared usernames
+      description: Until when is elevated access needed
       value: |
         - <!-- MM/DD/YY -->
     validations:
       required: true
   - type: textarea
     attributes:
       label: Request Deadline
-      description: By when do you want admin access provisioned 
+      description: By when do you need elavated access provisioned
       value: |
         <!-- Any specific date(s) (MM/DD) to prioritize this request at our end? -->
     validations:
-      required: true 
+      required: true

deployments/biology/config/common.yaml

@@ -1,7 +1,7 @@
 nfsPVC:
   enabled: true
   nfs:
-    serverIP: 10.120.80.242
+    serverIP: 10.14.131.82
 
 jupyterhub:
   scheduling:

deployments/biology/config/filestore/squash-flags.json

@@ -2,7 +2,7 @@
 "--file-share":
   {
     "name": "shares",
-    "capacity": "8.5TiB",
+    "capacity": "5TiB",
     "nfs-export-options": [
       {
         "access-mode": "READ_WRITE",

deployments/data100/image/environment.yml

@@ -35,6 +35,10 @@ dependencies:
 - tensorflow-cpu==2.12.1
 - sqlalchemy==2.0.16
 - mlxtend==0.23.0
+- geopandas==0.14.2
+- geopy==2.4.1
+- lifelines==0.27.8
+- pycountry==22.3.5
 - pip
 - pip:
   # - -r infra-requirements.txt
@@ -46,3 +50,4 @@ dependencies:
   - pytest-notebook==0.8.1
   - gh-scoped-creds==4.1
   - git+https://github.com/shaneknapp/python-popularity-contest.git@add-error-handling
+  - ydata-profiling==4.6.4

deployments/datahub/config/common.yaml

@@ -173,3 +173,9 @@ jupyterhub:
             mountPath: /home/jovyan/ugba-88
             subPath: _shared/course/ugba-88
             readOnly: true
+      course::1530121: # ARE 212, Spring 2024, issue #5278
+        mem_limit: 4096M
+        mem_guarantee: 4096M
+      course::1531172: # ENVECON 153, Spring 2024, issue #5279
+        mem_limit: 4096M
+        mem_guarantee: 4096M

deployments/datahub/config/prod.yaml

@@ -10,79 +10,6 @@ jupyterhub:
       hosts:
         - datahub.berkeley.edu
   hub:
-    services:
-      cee.datahub.berkeley.edu:
-        name: cee.datahub.berkeley.edu
-        oauth_client_id: service-cee.datahub.berkeley.edu
-        oauth_redirect_uri: https://cee.datahub.berkeley.edu/hub/oauth_callback
-      astro.datahub.berkeley.edu:
-        name: astro.datahub.berkeley.edu
-        oauth_client_id: service-astro.datahub.berkeley.edu
-        oauth_redirect_uri: https://astro.datahub.berkeley.edu/hub/oauth_callback
-      data8.datahub.berkeley.edu:
-        name: data8.datahub.berkeley.edu
-        oauth_client_id: service-data8.datahub.berkeley.edu
-        oauth_redirect_uri: https://data8.datahub.berkeley.edu/hub/oauth_callback
-      data100.datahub.berkeley.edu:
-        name: data100.datahub.berkeley.edu
-        oauth_client_id: service-data100.datahub.berkeley.edu
-        oauth_redirect_uri: https://data100.datahub.berkeley.edu/hub/oauth_callback
-      data101.datahub.berkeley.edu:
-        name: data101.datahub.berkeley.edu
-        oauth_client_id: service-data101.datahub.berkeley.edu
-        oauth_redirect_uri: https://data101.datahub.berkeley.edu/hub/oauth_callback
-      data102.datahub.berkeley.edu:
-        name: data102.datahub.berkeley.edu
-        oauth_client_id: service-data102.datahub.berkeley.edu
-        oauth_redirect_uri: https://data102.datahub.berkeley.edu/hub/oauth_callback
-      dlab.datahub.berkeley.edu:
-        name: dlab.datahub.berkeley.edu
-        oauth_client_id: service-dlab.datahub.berkeley.edu
-        oauth_redirect_uri: https://dlab.datahub.berkeley.edu/hub/oauth_callback
-      eecs.datahub.berkeley.edu:
-        name: eecs.datahub.berkeley.edu
-        oauth_client_id: service-eecs.datahub.berkeley.edu
-        oauth_redirect_uri: https://eecs.datahub.berkeley.edu/hub/oauth_callback
-      ischool.datahub.berkeley.edu:
-        name: ischool.datahub.berkeley.edu
-        oauth_client_id: service-ischool.datahub.berkeley.edu
-        oauth_redirect_uri: https://ischool.datahub.berkeley.edu/hub/oauth_callback
-      julia.datahub.berkeley.edu:
-        name: julia.datahub.berkeley.edu
-        oauth_client_id: service-julia.datahub.berkeley.edu
-        oauth_redirect_uri: https://julia.datahub.berkeley.edu/hub/oauth_callback
-      logodev.datahub.berkeley.edu:
-        name: logodev.datahub.berkeley.edu
-        oauth_client_id: service-logodev.datahub.berkeley.edu
-        oauth_redirect_uri: https://logodev.datahub.berkeley.edu/hub/oauth_callback
-      prob140.datahub.berkeley.edu:
-        name: prob140.datahub.berkeley.edu
-        oauth_client_id: service-prob140.datahub.berkeley.edu
-        oauth_redirect_uri: https://prob140.datahub.berkeley.edu/hub/oauth_callback
-      r.datahub.berkeley.edu:
-        name: r.datahub.berkeley.edu
-        oauth_client_id: service-r.datahub.berkeley.edu
-        oauth_redirect_uri: https://r.datahub.berkeley.edu/hub/oauth_callback
-      publichealth.datahub.berkeley.edu:
-        name: publichealth.datahub.berkeley.edu
-        oauth_client_id: service-publichealth.datahub.berkeley.edu
-        oauth_redirect_uri: https://publichealth.datahub.berkeley.edu/hub/oauth_callback
-      stat159.datahub.berkeley.edu:
-        name: stat159.datahub.berkeley.edu
-        oauth_client_id: service-stat159.datahub.berkeley.edu
-        oauth_redirect_uri: https://stat159.datahub.berkeley.edu/hub/oauth_callback
-      stat20.datahub.berkeley.edu:
-        name: stat20.datahub.berkeley.edu
-        oauth_client_id: service-stat20.datahub.berkeley.edu
-        oauth_redirect_uri: https://stat20.datahub.berkeley.edu/hub/oauth_callback
-      shiny.datahub.berkeley.edu:
-        name: shiny.datahub.berkeley.edu
-        oauth_client_id: service-shiny.datahub.berkeley.edu
-        oauth_redirect_uri: https://shiny.datahub.berkeley.edu/hub/oauth_callback
-      a11y.datahub.berkeley.edu:
-        name: a11y.datahub.berkeley.edu
-        oauth_client_id: service-a11y.datahub.berkeley.edu
-        oauth_redirect_uri: https://a11y.datahub.berkeley.edu/hub/oauth_callback
     db:
       pvc:
         # This also holds logs

deployments/datahub/config/staging.yaml

@@ -3,80 +3,6 @@ nfsPVC:
     shareName: shares/datahub/staging
 
 jupyterhub:
-  hub:
-    services:
-      cee-staging.datahub.berkeley.edu:
-        name: cee-staging.datahub.berkeley.edu
-        oauth_client_id: service-cee-staging.datahub.berkeley.edu
-        oauth_redirect_uri: https://cee-staging.datahub.berkeley.edu/hub/oauth_callback
-      astro-staging.datahub.berkeley.edu:
-        name: astro-staging.datahub.berkeley.edu
-        oauth_client_id: service-astro-staging.datahub.berkeley.edu
-        oauth_redirect_uri: https://astro-staging.datahub.berkeley.edu/hub/oauth_callback
-      data8-staging.datahub.berkeley.edu:
-        name: data8-staging.datahub.berkeley.edu
-        oauth_client_id: service-data8-staging.datahub.berkeley.edu
-        oauth_redirect_uri: https://data8-staging.datahub.berkeley.edu/hub/oauth_callback
-      data100-staging.datahub.berkeley.edu:
-        name: data100-staging.datahub.berkeley.edu
-        oauth_client_id: service-data100-staging.datahub.berkeley.edu
-        oauth_redirect_uri: https://data100-staging.datahub.berkeley.edu/hub/oauth_callback
-      data101-staging.datahub.berkeley.edu:
-        name: data101-staging.datahub.berkeley.edu
-        oauth_client_id: service-data101-staging.datahub.berkeley.edu
-        oauth_redirect_uri: https://data101-staging.datahub.berkeley.edu/hub/oauth_callback
-      data102-staging.datahub.berkeley.edu:
-        name: data102-staging.datahub.berkeley.edu
-        oauth_client_id: service-data102-staging.datahub.berkeley.edu
-        oauth_redirect_uri: https://data102-staging.datahub.berkeley.edu/hub/oauth_callback
-      dlab-staging.datahub.berkeley.edu:
-        name: dlab-staging.datahub.berkeley.edu
-        oauth_client_id: service-dlab-staging.datahub.berkeley.edu
-        oauth_redirect_uri: https://dlab-staging.datahub.berkeley.edu/hub/oauth_callback
-      eecs-staging.datahub.berkeley.edu:
-        name: eecs-staging.datahub.berkeley.edu
-        oauth_client_id: service-eecs-staging.datahub.berkeley.edu
-        oauth_redirect_uri: https://eecs-staging.datahub.berkeley.edu/hub/oauth_callback
-      ischool-staging.datahub.berkeley.edu:
-        name: ischool-staging.datahub.berkeley.edu
-        oauth_client_id: service-ischool-staging.datahub.berkeley.edu
-        oauth_redirect_uri: https://ischool-staging.datahub.berkeley.edu/hub/oauth_callback
-      logodev-staging.datahub.berkeley.edu:
-        name: logodev-staging.datahub.berkeley.edu
-        oauth_client_id: service-logodev-staging.datahub.berkeley.edu
-        oauth_redirect_uri: https://logodev-staging.datahub.berkeley.edu/hub/oauth_callback
-      julia-staging.datahub.berkeley.edu:
-        name: julia-staging.datahub.berkeley.edu
-        oauth_client_id: service-julia-staging.datahub.berkeley.edu
-        oauth_redirect_uri: https://julia-staging.datahub.berkeley.edu/hub/oauth_callback
-      prob140-staging.datahub.berkeley.edu:
-        name: prob140-staging.datahub.berkeley.edu
-        oauth_client_id: service-prob140-staging.datahub.berkeley.edu
-        oauth_redirect_uri: https://prob140-staging.datahub.berkeley.edu/hub/oauth_callback
-      publichealth-staging.datahub.berkeley.edu:
-        name: publichealth-staging.datahub.berkeley.edu
-        oauth_client_id: service-publichealth-staging.datahub.berkeley.edu
-        oauth_redirect_uri: https://publichealth-staging.datahub.berkeley.edu/hub/oauth_callback
-      r-staging.datahub.berkeley.edu:
-        name: r-staging.datahub.berkeley.edu
-        oauth_client_id: service-r-staging.datahub.berkeley.edu
-        oauth_redirect_uri: https://r-staging.datahub.berkeley.edu/hub/oauth_callback
-      stat159-staging.datahub.berkeley.edu:
-        name: stat159-staging.datahub.berkeley.edu
-        oauth_client_id: service-stat159-staging.datahub.berkeley.edu
-        oauth_redirect_uri: https://stat159-staging.datahub.berkeley.edu/hub/oauth_callback
-      stat20-staging.datahub.berkeley.edu:
-        name: stat20-staging.datahub.berkeley.edu
-        oauth_client_id: service-stat20-staging.datahub.berkeley.edu
-        oauth_redirect_uri: https://stat20-staging.datahub.berkeley.edu/hub/oauth_callback
-      shiny-staging.datahub.berkeley.edu:
-        name: shiny-staging.datahub.berkeley.edu
-        oauth_client_id: service-shiny-staging.datahub.berkeley.edu
-        oauth_redirect_uri: https://shiny-staging.datahub.berkeley.edu/hub/oauth_callback
-      a11y-staging.datahub.berkeley.edu:
-        name: a11y-staging.datahub.berkeley.edu
-        oauth_client_id: service-a11y-staging.datahub.berkeley.edu
-        oauth_redirect_uri: https://a11y-staging.datahub.berkeley.edu/hub/oauth_callback
   scheduling:
     userPlaceholder:
       enabled: false

deployments/datahub/images/default/environment.yml

@@ -28,11 +28,10 @@ dependencies:
 - nltk=3.6.*
 
 # 3577, L&S 22, Spring 2023
-- spacy-model-en_core_web_sm=3.4.0
-- spacy-model-en_core_web_lg=3.4.0
-- spacy-model-en_core_web_md=3.4.0
-- spacy-model-en_core_web_trf=3.4.0
-- lemminflect=0.2.2
+# Packages listed below will be used during SP 25
+# - spacy-model-en_core_web_sm=3.4.0
+# - spacy-model-en_core_web_md=3.4.0
+# - lemminflect=0.2.2
 
 # EPS88, data100
 # https://github.com/berkeley-dsep-infra/datahub/issues/1796