Merge branch 'master' into hhmi_add_mysql_database

2i2c-org · Nov 11, 2023 · cfc1a86 · cfc1a86
2 parents 650dc5d + b50605e
commit cfc1a86
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/config/clusters/qcl/common.values.yaml b/config/clusters/qcl/common.values.yaml
@@ -43,6 +43,10 @@ jupyterhub:
           - gizmo404
           - jtkmckenna
   singleuser:
+    image:
+      # Required when using :latest, until https://github.com/jupyterhub/kubespawner/pull/807
+      # is merged
+      pullPolicy: Always
     profileList:
       # NOTE: About node sharing
       #

diff --git a/config/clusters/ubc-eoas/common.values.yaml b/config/clusters/ubc-eoas/common.values.yaml
@@ -54,6 +54,10 @@ jupyterhub:
           - hmodzelewski # Technical representative, Henryk Modzelewski
 
   singleuser:
+    image:
+      # Required when using :latest, until https://github.com/jupyterhub/kubespawner/pull/807
+      # is merged
+      pullPolicy: Always
     defaultUrl: /lab
     memory:
       # https://2i2c.freshdesk.com/a/tickets/955

diff --git a/terraform/gcp/cluster.tf b/terraform/gcp/cluster.tf
@@ -218,6 +218,10 @@ resource "google_container_node_pool" "core" {
     # Faster disks provide faster image pulls!
     disk_type = "pd-balanced"
 
+    resource_labels = {
+      "node-purpose" : "core"
+    }
+
     labels = {
       "hub.jupyter.org/node-purpose" = "core",
       "k8s.dask.org/node-purpose"    = "core"
@@ -336,7 +340,9 @@ resource "google_container_node_pool" "notebook" {
       "https://www.googleapis.com/auth/cloud-platform"
     ]
 
-    resource_labels = each.value.resource_labels
+    resource_labels = merge({
+      "node-purpose" : "notebook"
+    }, each.value.resource_labels)
 
     // Set these values explicitly so they don't "change outside terraform"
     tags = []
@@ -416,7 +422,9 @@ resource "google_container_node_pool" "dask_worker" {
       "https://www.googleapis.com/auth/cloud-platform"
     ]
 
-    resource_labels = each.value.resource_labels
+    resource_labels = merge({
+      "node-purpose" : "dask-worker"
+    }, each.value.resource_labels)
 
     // Set these values explicitly so they don't "change outside terraform"
     tags = []