Merge branch 'master' into utoronto-homepage

2i2c-org · Jan 9, 2024 · 220526c · 220526c
2 parents 0501fe1 + 91db123
commit 220526c
Show file tree

Hide file tree

Showing 16 changed files with 48 additions and 43 deletions.
diff --git a/config/clusters/nasa-esdis/common.values.yaml b/config/clusters/nasa-esdis/common.values.yaml
@@ -55,7 +55,7 @@ jupyterhub:
             display_name: Resource Allocation
             choices:
               mem_1_9:
-                display_name: 1.9 GB RAM, upto 3.75 CPUs
+                display_name: 1.9 GB RAM, upto 3.7 CPUs
                 kubespawner_override:
                   mem_guarantee: 1992701952
                   mem_limit: 1992701952
@@ -65,7 +65,7 @@ jupyterhub:
                     node.kubernetes.io/instance-type: r5.xlarge
                 default: true
               mem_3_7:
-                display_name: 3.7 GB RAM, upto 3.75 CPUs
+                display_name: 3.7 GB RAM, upto 3.7 CPUs
                 kubespawner_override:
                   mem_guarantee: 3985403904
                   mem_limit: 3985403904
@@ -74,7 +74,7 @@ jupyterhub:
                   node_selector:
                     node.kubernetes.io/instance-type: r5.xlarge
               mem_7_4:
-                display_name: 7.4 GB RAM, upto 3.75 CPUs
+                display_name: 7.4 GB RAM, upto 3.7 CPUs
                 kubespawner_override:
                   mem_guarantee: 7970807808
                   mem_limit: 7970807808
@@ -83,7 +83,7 @@ jupyterhub:
                   node_selector:
                     node.kubernetes.io/instance-type: r5.xlarge
               mem_14_8:
-                display_name: 14.8 GB RAM, upto 3.75 CPUs
+                display_name: 14.8 GB RAM, upto 3.7 CPUs
                 kubespawner_override:
                   mem_guarantee: 15941615616
                   mem_limit: 15941615616
@@ -92,7 +92,7 @@ jupyterhub:
                   node_selector:
                     node.kubernetes.io/instance-type: r5.xlarge
               mem_29_7:
-                display_name: 29.7 GB RAM, upto 3.75 CPUs
+                display_name: 29.7 GB RAM, upto 3.7 CPUs
                 kubespawner_override:
                   mem_guarantee: 31883231232
                   mem_limit: 31883231232
@@ -101,7 +101,7 @@ jupyterhub:
                   node_selector:
                     node.kubernetes.io/instance-type: r5.xlarge
               mem_60_6:
-                display_name: 60.6 GB RAM, upto 15.72 CPUs
+                display_name: 60.6 GB RAM, upto 15.7 CPUs
                 kubespawner_override:
                   mem_guarantee: 65094813696
                   mem_limit: 65094813696
@@ -110,7 +110,7 @@ jupyterhub:
                   node_selector:
                     node.kubernetes.io/instance-type: r5.4xlarge
               mem_121_2:
-                display_name: 121.2 GB RAM, upto 15.72 CPUs
+                display_name: 121.2 GB RAM, upto 15.7 CPUs
                 kubespawner_override:
                   mem_guarantee: 130189627392
                   mem_limit: 130189627392

diff --git a/config/clusters/nasa-veda/common.values.yaml b/config/clusters/nasa-veda/common.values.yaml
@@ -106,7 +106,7 @@ basehub:
               display_name: Resource Allocation
               choices:
                 mem_1_9:
-                  display_name: 1.9 GB RAM, upto 3.75 CPUs
+                  display_name: 1.9 GB RAM, upto 3.7 CPUs
                   kubespawner_override:
                     mem_guarantee: 1991341312
                     mem_limit: 1991341312
@@ -116,7 +116,7 @@ basehub:
                       node.kubernetes.io/instance-type: r5.xlarge
                   default: true
                 mem_3_7:
-                  display_name: 3.7 GB RAM, upto 3.75 CPUs
+                  display_name: 3.7 GB RAM, upto 3.7 CPUs
                   kubespawner_override:
                     mem_guarantee: 3982682624
                     mem_limit: 3982682624
@@ -125,7 +125,7 @@ basehub:
                     node_selector:
                       node.kubernetes.io/instance-type: r5.xlarge
                 mem_7_4:
-                  display_name: 7.4 GB RAM, upto 3.75 CPUs
+                  display_name: 7.4 GB RAM, upto 3.7 CPUs
                   kubespawner_override:
                     mem_guarantee: 7965365248
                     mem_limit: 7965365248
@@ -134,7 +134,7 @@ basehub:
                     node_selector:
                       node.kubernetes.io/instance-type: r5.xlarge
                 mem_14_8:
-                  display_name: 14.8 GB RAM, upto 3.75 CPUs
+                  display_name: 14.8 GB RAM, upto 3.7 CPUs
                   kubespawner_override:
                     mem_guarantee: 15930730496
                     mem_limit: 15930730496
@@ -143,7 +143,7 @@ basehub:
                     node_selector:
                       node.kubernetes.io/instance-type: r5.xlarge
                 mem_29_7:
-                  display_name: 29.7 GB RAM, upto 3.75 CPUs
+                  display_name: 29.7 GB RAM, upto 3.7 CPUs
                   kubespawner_override:
                     mem_guarantee: 31861460992
                     mem_limit: 31861460992
@@ -152,7 +152,7 @@ basehub:
                     node_selector:
                       node.kubernetes.io/instance-type: r5.xlarge
                 mem_60_6:
-                  display_name: 60.6 GB RAM, upto 15.72 CPUs
+                  display_name: 60.6 GB RAM, upto 15.7 CPUs
                   kubespawner_override:
                     mem_guarantee: 65094813696
                     mem_limit: 65094813696
@@ -161,7 +161,7 @@ basehub:
                     node_selector:
                       node.kubernetes.io/instance-type: r5.4xlarge
                 mem_121_2:
-                  display_name: 121.2 GB RAM, upto 15.72 CPUs
+                  display_name: 121.2 GB RAM, upto 15.7 CPUs
                   kubespawner_override:
                     mem_guarantee: 130189627392
                     mem_limit: 130189627392

diff --git a/config/clusters/openscapes/prod.values.yaml b/config/clusters/openscapes/prod.values.yaml
@@ -22,7 +22,7 @@ basehub:
               display_name: Resource Allocation
               choices:
                 mem_1_9:
-                  display_name: 1.9 GB RAM, upto 3.75 CPUs
+                  display_name: 1.9 GB RAM, upto 3.7 CPUs
                   kubespawner_override:
                     mem_guarantee: 1992701952
                     mem_limit: 1992701952
@@ -32,7 +32,7 @@ basehub:
                       node.kubernetes.io/instance-type: r5.xlarge
                   default: true
                 mem_3_7:
-                  display_name: 3.7 GB RAM, upto 3.75 CPUs
+                  display_name: 3.7 GB RAM, upto 3.7 CPUs
                   kubespawner_override:
                     mem_guarantee: 3985403904
                     mem_limit: 3985403904
@@ -41,7 +41,7 @@ basehub:
                     node_selector:
                       node.kubernetes.io/instance-type: r5.xlarge
                 mem_7_4:
-                  display_name: 7.4 GB RAM, upto 3.75 CPUs
+                  display_name: 7.4 GB RAM, upto 3.7 CPUs
                   kubespawner_override:
                     mem_guarantee: 7970807808
                     mem_limit: 7970807808
@@ -50,7 +50,7 @@ basehub:
                     node_selector:
                       node.kubernetes.io/instance-type: r5.xlarge
                 mem_14_8:
-                  display_name: 14.8 GB RAM, upto 3.75 CPUs
+                  display_name: 14.8 GB RAM, upto 3.7 CPUs
                   kubespawner_override:
                     mem_guarantee: 15941615616
                     mem_limit: 15941615616
@@ -59,7 +59,7 @@ basehub:
                     node_selector:
                       node.kubernetes.io/instance-type: r5.xlarge
                 mem_29_7:
-                  display_name: 29.7 GB RAM, upto 3.75 CPUs
+                  display_name: 29.7 GB RAM, upto 3.7 CPUs
                   kubespawner_override:
                     mem_guarantee: 31883231232
                     mem_limit: 31883231232
@@ -68,7 +68,7 @@ basehub:
                     node_selector:
                       node.kubernetes.io/instance-type: r5.xlarge
                 mem_60_6:
-                  display_name: 60.6 GB RAM, upto 15.72 CPUs
+                  display_name: 60.6 GB RAM, upto 15.7 CPUs
                   kubespawner_override:
                     mem_guarantee: 65094813696
                     mem_limit: 65094813696
@@ -77,7 +77,7 @@ basehub:
                     node_selector:
                       node.kubernetes.io/instance-type: r5.4xlarge
                 mem_121_2:
-                  display_name: 121.2 GB RAM, upto 15.72 CPUs
+                  display_name: 121.2 GB RAM, upto 15.7 CPUs
                   kubespawner_override:
                     mem_guarantee: 130189627392
                     mem_limit: 130189627392

diff --git a/config/clusters/openscapes/staging.values.yaml b/config/clusters/openscapes/staging.values.yaml
@@ -35,7 +35,7 @@ basehub:
               display_name: Resource Allocation
               choices:
                 mem_1_9:
-                  display_name: 1.9 GB RAM, upto 3.75 CPUs
+                  display_name: 1.9 GB RAM, upto 3.7 CPUs
                   kubespawner_override:
                     mem_guarantee: 1992701952
                     mem_limit: 1992701952
@@ -45,7 +45,7 @@ basehub:
                       node.kubernetes.io/instance-type: r5.xlarge
                   default: true
                 mem_3_7:
-                  display_name: 3.7 GB RAM, upto 3.75 CPUs
+                  display_name: 3.7 GB RAM, upto 3.7 CPUs
                   kubespawner_override:
                     mem_guarantee: 3985403904
                     mem_limit: 3985403904
@@ -54,7 +54,7 @@ basehub:
                     node_selector:
                       node.kubernetes.io/instance-type: r5.xlarge
                 mem_7_4:
-                  display_name: 7.4 GB RAM, upto 3.75 CPUs
+                  display_name: 7.4 GB RAM, upto 3.7 CPUs
                   kubespawner_override:
                     mem_guarantee: 7970807808
                     mem_limit: 7970807808
@@ -63,7 +63,7 @@ basehub:
                     node_selector:
                       node.kubernetes.io/instance-type: r5.xlarge
                 mem_14_8:
-                  display_name: 14.8 GB RAM, upto 3.75 CPUs
+                  display_name: 14.8 GB RAM, upto 3.7 CPUs
                   kubespawner_override:
                     mem_guarantee: 15941615616
                     mem_limit: 15941615616
@@ -72,7 +72,7 @@ basehub:
                     node_selector:
                       node.kubernetes.io/instance-type: r5.xlarge
                 mem_29_7:
-                  display_name: 29.7 GB RAM, upto 3.75 CPUs
+                  display_name: 29.7 GB RAM, upto 3.7 CPUs
                   kubespawner_override:
                     mem_guarantee: 31883231232
                     mem_limit: 31883231232
@@ -81,7 +81,7 @@ basehub:
                     node_selector:
                       node.kubernetes.io/instance-type: r5.xlarge
                 mem_60_6:
-                  display_name: 60.6 GB RAM, upto 15.72 CPUs
+                  display_name: 60.6 GB RAM, upto 15.7 CPUs
                   kubespawner_override:
                     mem_guarantee: 65094813696
                     mem_limit: 65094813696
@@ -90,7 +90,7 @@ basehub:
                     node_selector:
                       node.kubernetes.io/instance-type: r5.4xlarge
                 mem_121_2:
-                  display_name: 121.2 GB RAM, upto 15.72 CPUs
+                  display_name: 121.2 GB RAM, upto 15.7 CPUs
                   kubespawner_override:
                     mem_guarantee: 130189627392
                     mem_limit: 130189627392

diff --git a/config/clusters/utoronto/default-common.values.yaml b/config/clusters/utoronto/default-common.values.yaml
@@ -2,7 +2,7 @@ jupyterhub:
   singleuser:
     image:
       name: quay.io/2i2c/utoronto-image
-      tag: "736072886c54"
+      tag: "14320bae73a0"
   hub:
     config:
       Authenticator:

diff --git a/config/clusters/utoronto/default-staging.values.yaml b/config/clusters/utoronto/default-staging.values.yaml
@@ -4,9 +4,6 @@ jupyterhub:
     tls:
       - hosts: [staging.utoronto.2i2c.cloud]
         secretName: https-auto-tls
-  singleuser:
-    image:
-      tag: "14320bae73a0"
   hub:
     config:
       CILogonOAuthenticator:

diff --git a/config/clusters/utoronto/r-common.values.yaml b/config/clusters/utoronto/r-common.values.yaml
@@ -14,4 +14,4 @@ jupyterhub:
     defaultUrl: /rstudio
     image:
       name: quay.io/2i2c/utoronto-r-image
-      tag: "60ec7c973a69"
+      tag: "b0f448387134"
diff --git a/config/clusters/utoronto/r-staging.values.yaml b/config/clusters/utoronto/r-staging.values.yaml
@@ -4,9 +4,6 @@ jupyterhub:
     tls:
       - hosts: [r-staging.datatools.utoronto.ca]
         secretName: https-auto-tls
-  singleuser:
-    image:
-      tag: "b0f448387134"
   hub:
     db:
       pvc:

diff --git a/deployer/commands/generate/resource_allocation/generate_choices.py b/deployer/commands/generate/resource_allocation/generate_choices.py
@@ -1,4 +1,5 @@
 import json
+import math
 import sys
 from enum import Enum
 from pathlib import Path
@@ -52,6 +53,11 @@ def proportional_memory_strategy(
     available_node_mem = nodeinfo["available"]["memory"]
     available_node_cpu = nodeinfo["available"]["cpu"]
 
+    # Only show one digit after . for CPU, but round *down* not up so we never
+    # say they are getting more CPU than our limit is set to. We multiply & divide
+    # with a floor, as otherwise 3.75 gets rounded to 3.8, not 3.7
+    cpu_display = math.floor(available_node_cpu * 10) / 10
+
     # We always start from the top, and provide a choice that takes up the whole node.
     mem_limit = available_node_mem
 
@@ -61,9 +67,9 @@ def proportional_memory_strategy(
         # This makes sure we utilize all the memory on a node all the time.
         cpu_guarantee = (mem_limit / available_node_mem) * available_node_cpu
 
-        # Memory is in bytes, let's convert it to GB to display
+        # Memory is in bytes, let's convert it to GB (with only 1 digit after .) to display
         mem_display = f"{mem_limit / 1024 / 1024 / 1024:.1f}"
-        display_name = f"{mem_display} GB RAM, upto {available_node_cpu} CPUs"
+        display_name = f"{mem_display} GB RAM, upto {cpu_display} CPUs"
 
         choice = {
             "display_name": display_name,

diff --git a/docs/Makefile b/docs/Makefile
@@ -15,7 +15,7 @@ help:
 .PHONY: help Makefile
 
 live:
-	sphinx-autobuild --ignore */_build/* --ignore */tmp/* -b html -n . _build/html 
+	sphinx-autobuild --ignore */_build/* --ignore */tmp/* --ignore */_static/hub-*.json -b dirhtml -n . _build/dirhtml
 
 # Catch-all target: route all unknown targets to Sphinx using the new
 # "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).

diff --git a/docs/conf.py b/docs/conf.py
@@ -44,6 +44,7 @@
 
 # -- Options for MyST -------------------------------------------------
 panels_add_bootstrap_css = False
+myst_footnote_transition = False
 myst_enable_extensions = [
     "colon_fence",
     "deflist",

diff --git a/docs/contributing/code-review.md b/docs/contributing/code-review.md
@@ -3,7 +3,7 @@
 
 Much of our active infrastructure is configured and automatically updated via CI/CD pipelines.
 This means that changes in this repository often immediately impact the infrastructure that we run.
-As such, we follow team policies for review/merge that are more specific [than our general development merge policies](tc:development:merge-policy).
+As such, we follow team policies for review/merge that are more specific [than our general development merge policies](inv:tc#development:merge-policy).
 
 This document codifies our guidelines for doing code review and merging pull requests on active infrastructure (ie, anything in the `infrastructure/` codebase).
 

diff --git a/docs/howto/prepare-for-events/exam.md b/docs/howto/prepare-for-events/exam.md
@@ -39,7 +39,7 @@ This page documents what we do to prep, based on our prior experiences.
    If the hub has a profile list enabled, based on the instance types setup for
    the hub, you can find the new allocation options by running:
 
-   ```{bash}
+   ```bash
    deployer generate resource-allocation choices <instance-type>
    ```
 

diff --git a/docs/hub-deployment-guide/hubs/other-hub-ops/move-hubs/across-clusters.md b/docs/hub-deployment-guide/hubs/other-hub-ops/move-hubs/across-clusters.md
@@ -5,7 +5,7 @@ to ensure data is preserved.
 
 ## 1. Setup a new hub
 
-Setup [a new hub](../../../topic/infrastructure/config.md) in the target cluster, mimicking
+Setup [a new hub](config) in the target cluster, mimicking
 the config of the old hub as much as possible.
 
 (copy-home-dirs)=

diff --git a/docs/topic/access-creds/secrets.md b/docs/topic/access-creds/secrets.md
@@ -50,7 +50,7 @@ For example, if a service we use has become compromised, and we need to generate
 To rotate our secrets, take these steps:
 
 1. Determine which configuration file you'd like to update. See [](secrets:locations).
-2. Unencrypt the configuration file. See [the team compass documentation](tc:secrets:sops) for instructions on unencrypting.
+2. Unencrypt the configuration file. See [the team compass documentation](inv:tc#secrets:sops) for instructions on unencrypting.
 3. Generate a new key with `openssl`:
 
    ```

diff --git a/helm-charts/basehub/values.yaml b/helm-charts/basehub/values.yaml
@@ -88,23 +88,27 @@ jupyterhub:
       add_staff_user_ids_to_admin_users: false
       add_staff_user_ids_of_type: ""
       staff_github_ids:
+        - agoose77
         - AIDEA775
         - choldgraf
         - colliand
         - consideRatio
         - damianavila
         - GeorgianaElena
+        - haroldcampbell
         - jmunroe
         - jnywong
         - sgibson91
         - yuvipanda
       staff_google_ids:
+        - [email protected]
         - [email protected]
         - [email protected]
         - [email protected]
         - [email protected]
         - [email protected]
         - [email protected]
+        - [email protected]
         - [email protected]
         - [email protected]
         - [email protected]