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

merging 6161/6169/6170 to prod
berkeley-dsep-infra · Sep 12, 2024 · 8e06168 · 8e06168
2 parents b790423 + 3404261
commit 8e06168
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 7 deletions.
diff --git a/deployments/data100/config/common.yaml b/deployments/data100/config/common.yaml
@@ -12,6 +12,15 @@ jupyterhub:
     chp:
       nodeSelector:
         hub.jupyter.org/pool-name: core-pool-2024-05-08
+      resources:
+        requests:
+          # FIXME: We want no guarantees here!!!
+          # This is lowest possible value
+          cpu: 0.001
+          memory: 3Gi
+        limits:
+          memory: 3Gi
+
   hub:
     nodeSelector:
       hub.jupyter.org/pool-name: core-pool-2024-05-08

diff --git a/deployments/data8/config/common.yaml b/deployments/data8/config/common.yaml
@@ -23,6 +23,15 @@ jupyterhub:
     chp:
       nodeSelector:
         hub.jupyter.org/pool-name: core-pool-2024-05-08
+      resources:
+        requests:
+          # FIXME: We want no guarantees here!!!
+          # This is lowest possible value
+          cpu: 0.001
+          memory: 3Gi
+        limits:
+          memory: 3Gi
+
     traefik:
       nodeSelector:
         hub.jupyter.org/pool-name: core-pool-2024-05-08

diff --git a/deployments/datahub/config/common.yaml b/deployments/datahub/config/common.yaml
@@ -157,6 +157,15 @@ jupyterhub:
     chp:
       nodeSelector:
         hub.jupyter.org/pool-name: core-pool-2024-05-08
+      resources:
+        requests:
+          # FIXME: We want no guarantees here!!!
+          # This is lowest possible value
+          cpu: 0.001
+          memory: 3Gi
+        limits:
+          memory: 3Gi
+
   singleuser:
     extraEnv:
       GH_SCOPED_CREDS_CLIENT_ID: Iv23ct7Qx1mAotaIIYx9

diff --git a/deployments/nature/hubploy.yaml b/deployments/nature/hubploy.yaml
@@ -1,6 +1,6 @@
 images:
   images:
-    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/nature-user-image:00512349345a
+    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/nature-user-image:c248c1ca947c
 
 cluster:
   provider: gcloud

diff --git a/docs/admins/howto/transition-image.qmd b/docs/admins/howto/transition-image.qmd
@@ -13,7 +13,7 @@ You will need to install `git-filter-repo`.
 
 ```bash
 wget -O ~/bin/git-filter-repo https://raw.githubusercontent.com/newren/git-filter-repo/main/git-filter-repo
-  chmod +x ~/bin/git-filter-repo
+chmod +x ~/bin/git-filter-repo
 ```
 
 ## Create the repository
@@ -23,7 +23,7 @@ wget -O ~/bin/git-filter-repo https://raw.githubusercontent.com/newren/git-filte
 1. Click create repository.
 1. In the new repository, visit Settings > Secrets and variables > Actions > Variables tab. Create new variables:
    a. Set HUB to the hub deployment, e.g. `shiny`.
-   b. Set IMAGE to ucb-datahub-2018/user-images/{hub}-user-image, e.g. `ucb-datahub-2018/user-images/shiny-user-image`.
+   b. Set IMAGE to `ucb-datahub-2018/user-images/{hub}-user-image`, e.g. `ucb-datahub-2018/user-images/shiny-user-image`.
 1. Fork the new image repo into your own github account.
 
 ## Preparing working directories
@@ -61,14 +61,14 @@ As part of this process, we will pull the previous image's git history into the
 
 ## Preparing continuous integration
 
-1. In the berkeley-dsep-infra org settings, https://github.com/organizations/berkeley-dsep-infra/settings/profile, visit Secrets and variables > Actions, https://github.com/organizations/berkeley-dsep-infra/settings/secrets/actions. Edit the secrets for DATAHUB_CREATE_PR and GAR_SECRET_KEY, and enable the new repo to access each.
+1. In the [berkeley-dsep-infra org settings](https://github.com/organizations/berkeley-dsep-infra/settings/profile), visit [Secrets and variables > Actions](https://github.com/organizations/berkeley-dsep-infra/settings/secrets/actions). Edit the secrets for `DATAHUB_CREATE_PR` and `GAR_SECRET_KEY`, and enable the new repo to access each.
 
 1. In the datahub repo, in one PR:
    a. remove the hub deployment steps for the hub:
-      - Deploy {hub}
-      - hubploy/build-image {hub} image build (x2)
+      - *Deploy {hub}*
+      - *hubploy/build-image {hub} image build* (x2)
 
-   a. under `deployments/{hub}/hubploy.yaml`, remove the registry entry, and set the image_name to have `PLACEHOLDER` for the tag.
+   a. under `deployments/{hub}/hubploy.yaml`, remove the registry entry, and set the `image_name` to have `PLACEHOLDER` for the tag.
 
    a. In the datahub repo, under the deployment image directory, update the README to point to the new repo. Delete everything else in the image directory.