Merge pull request #5310 from berkeley-dsep-infra/staging

merging 5298/5299/5305/5306/5308/5309 to prod

README.md

@@ -1,3 +1,5 @@
+[![CircleCI](https://dl.circleci.com/status-badge/img/gh/berkeley-dsep-infra/datahub/tree/staging.svg?style=svg)](https://dl.circleci.com/status-badge/redirect/gh/berkeley-dsep-infra/datahub/tree/staging)
+
 # Berkeley JupyterHubs 
 
 Contains a fully reproducible configuration for JupyterHub on datahub.berkeley.edu,

deployments/datahub/images/default/environment.yml

@@ -56,10 +56,6 @@ dependencies:
 # https://github.com/berkeley-dsep-infra/datahub/issues/3324, spring 2022
 - gdown==4.4.0
 
-# LBL summer research internship in materials informatics. Jupyter Book curriculum at https://enze-chen.github.io/mi-book/
-- pymatgen==2023.10.4
-- matminer=0.9.0
-
 # Econ 148, Spring 2023, https://github.com/berkeley-dsep-infra/datahub/issues/4067
 - ipykernel = 6.19.4
 

node-placeholder/values.yaml

@@ -78,95 +78,95 @@ nodePools:
       requests:
         # Some value slightly lower than allocatable RAM on the nodepool
         memory: 60929654784
-    replicas: 1
+    replicas: 0
   biology:
     nodeSelector:
       hub.jupyter.org/pool-name: biology-pool
     resources:
       requests:
         # Some value slightly lower than allocatable RAM on the nodepool
         memory: 60929654784
-    replicas: 1
+    replicas: 0
   cee:
     nodeSelector:
       hub.jupyter.org/pool-name: cee-pool
     resources:
       requests:
         # Some value slightly lower than allocatable RAM on the nodepool
         memory: 60929654784
-    replicas: 1
+    replicas: 0
   data100:
     nodeSelector:
       hub.jupyter.org/pool-name: data100-pool
     resources:
       requests:
         # Some value slightly lower than allocatable RAM on the nodepool
         memory: 207314055168
-    replicas: 1
+    replicas: 0
   data101:
     nodeSelector:
       hub.jupyter.org/pool-name: data101-pool
     resources:
       requests:
         # Some value slightly lower than allocatable RAM on the nodepool
         memory: 60929654784
-    replicas: 1
+    replicas: 0
   data102:
     nodeSelector:
       hub.jupyter.org/pool-name: data102-pool
     resources:
       requests:
         # Some value slightly lower than allocatable RAM on the nodepool
         memory: 60929654784
-    replicas: 1
+    replicas: 0
   data8:
     nodeSelector:
       hub.jupyter.org/pool-name: data8-pool
     resources:
       requests:
         # Some value slightly lower than allocatable RAM on the nodepool
         memory: 60929654784
-    replicas: 1
+    replicas: 0
   datahub:
     nodeSelector:
       hub.jupyter.org/pool-name: datahub-pool
     resources:
       requests:
         # Some value slightly lower than allocatable RAM on the nodepool
         memory: 60929654784
-    replicas: 1
+    replicas: 0
   dlab:
     nodeSelector:
       hub.jupyter.org/pool-name: dlab-pool
     resources:
       requests:
         # Some value slightly lower than allocatable RAM on the nodepool
         memory: 60929654784
-    replicas: 1
+    replicas: 0
   eecs:
     nodeSelector:
       hub.jupyter.org/pool-name: eecs-pool
     resources:
       requests:
         # Some value slightly lower than allocatable RAM on the nodepool
         memory: 60929654784
-    replicas: 1
+    replicas: 0
   ischool:
     nodeSelector:
       hub.jupyter.org/pool-name: ischool-pool
     resources:
       requests:
         # Some value slightly lower than allocatable RAM on the nodepool
         memory: 60929654784
-    replicas: 1
+    replicas: 0
   publichealth:
     nodeSelector:
       hub.jupyter.org/pool-name: publichealth-pool
     resources:
       requests:
         # Some value slightly lower than allocatable RAM on the nodepool
         memory: 60929654784
-    replicas: 1
+    replicas: 0
   stat159:
     nodeSelector:
       hub.jupyter.org/pool-name: stat159-pool
@@ -182,15 +182,15 @@ nodePools:
       requests:
         # Some value slightly lower than allocatable RAM on the nodepool
         memory: 60929654784
-    replicas: 1
+    replicas: 0
   r:
     nodeSelector:
       hub.jupyter.org/pool-name: r-pool
     resources:
       requests:
         # Some value slightly lower than allocatable RAM on the nodepool
         memory: 60929654784
-    replicas: 1
+    replicas: 0
   small-courses:
     nodeSelector:
       hub.jupyter.org/pool-name: small-courses-pool

support/secrets.yaml

@@ -11,6 +11,7 @@ grafana:
             token_url: ENC[AES256_GCM,data:ITYpbm7RLkk8NINopOkwhKLrecDwFj5oSqMLPzOlSfchHYJ21zk8FiYEBQ==,iv:0eWAQZHBzCNjhABk41OGxRuBXKTuNIQEc4vvo3ZwEMw=,tag:vpdbRUb4BHfbgh/qD741tA==,type:str]
             api_url: ENC[AES256_GCM,data:gfGiz/0Pydt+ceaGr6Ks+RpTqS2pQLf395zG,iv:KuZX6JnyDAE1kgcZqGfp0CsyjNiURtL0RiJAmTPJBkU=,tag:OSKoVAolLpHMLAnsXlzdxA==,type:str]
             allowed_organizations: ENC[AES256_GCM,data:BClZFieAKd242fhSi13C4ye2BA==,iv:Hm3cH7uKc8qCNH0E5X9xzakIQes/87+hfrLjVceP9jA=,tag:Tclre2xU+7aS/iuKKIlc6A==,type:str]
+            role_attribute_path: ENC[AES256_GCM,data:SA15Ob8SOCMlzQPVrTzPDo/Lwie8pTTwCqyPBS5GxLv1CmtZK3XwjL515pXwvCt6S3+DPT2ZBb58HUIAq0r/ycxlnfB0iju6VuGXOAyWcsSw,iv:5gllfK/HHB+R30FoDMZaiy1dQOvtjYvhI1TWIgMG0Hc=,tag:+o6Ddzhb5ohvZPLCkzqsCg==,type:str]
 sops:
     kms: []
     gcp_kms:
@@ -20,8 +21,8 @@ sops:
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2021-04-09T22:20:27Z"
-    mac: ENC[AES256_GCM,data:5YQEQNAeLpBzByceeL2+EctvUBWjsHrM066Yq3lPd5aM2Y4gumgC2G7EuqLPK6MHG8wBfdnxPxEncaJTXcpef70xKaYJmrxzx1VYD8F6wO9aHWid7YFspYzd9+CwPbmIwGm0VYoweOzOM2O465/w54QJp9amU3YljFLUwmhRHFw=,iv:i//WPsz7vvMj86BsA83UO2qjkRJVhvoddEdojWvMPYA=,tag:vkjakqnks6c43m2IeAwy8Q==,type:str]
+    lastmodified: "2023-12-20T19:15:21Z"
+    mac: ENC[AES256_GCM,data:j8ZPXDIhKEGohYBkBsGnyMMgxcZ1QZ5r67tP9ToWXWGfepoPZBK5ZjCf4Iw1cYocKN4+X9sk4kb5uVal82FdD0gVQhWKYaDNevHTeLOj/w8HvlMiEt2dAOvdTL2Vne0qcmODCJakwSY5wheaDorf08DCMO3NoxEGBBPF8HmxRa8=,iv:L7nFZhg8MvQT2cradQ7hABEaJoV/gChk2XdPkcEjNtc=,tag:HCIR55exzk/HEoxBimFqKw==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
-    version: 3.7.0
+    version: 3.7.3