linked-earth: upgrade k8s 1.26 -> 1.27, transition from e2- to n2-

2i2c-org · Sep 13, 2023 · a862afe · a862afe
1 parent 2c4a941
commit a862afe
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 10 deletions.
diff --git a/config/clusters/linked-earth/common.values.yaml b/config/clusters/linked-earth/common.values.yaml
@@ -109,7 +109,7 @@ basehub:
             cpu_limit: null
             mem_limit: null
             node_selector:
-              node.kubernetes.io/instance-type: e2-highmem-4
+              node.kubernetes.io/instance-type: n2-highmem-4
         - display_name: "Medium: up to 16 CPU / 128 GB RAM"
           description: *profile_list_description
           slug: medium
@@ -165,7 +165,7 @@ basehub:
             cpu_limit: null
             mem_limit: null
             node_selector:
-              node.kubernetes.io/instance-type: e2-highmem-16
+              node.kubernetes.io/instance-type: n2-highmem-16
 dask-gateway:
   gateway:
     backend:

diff --git a/terraform/gcp/projects/linked-earth.tfvars b/terraform/gcp/projects/linked-earth.tfvars
@@ -1,11 +1,20 @@
-prefix                 = "linked-earth"
-project_id             = "linked-earth-hubs"
-zone                   = "us-central1-c"
-region                 = "us-central1"
-core_node_machine_type = "e2-highmem-4"
+prefix     = "linked-earth"
+project_id = "linked-earth-hubs"
+
+zone             = "us-central1-c"
+region           = "us-central1"
+regional_cluster = true
+
+k8s_versions = {
+  min_master_version : "1.27.4-gke.900",
+  core_nodes_version : "1.27.4-gke.900",
+  notebook_nodes_version : "1.27.4-gke.900",
+  dask_nodes_version : "1.27.4-gke.900",
+}
+
+core_node_machine_type = "n2-highmem-4"
 enable_network_policy  = true
 
-# Setup a filestore for in-cluster NFS
 enable_filestore      = true
 filestore_capacity_gb = 1024
 
@@ -23,12 +32,12 @@ notebook_nodes = {
   "small" : {
     min : 0,
     max : 100,
-    machine_type : "e2-highmem-4"
+    machine_type : "n2-highmem-4"
   },
   "medium" : {
     min : 0,
     max : 100,
-    machine_type : "e2-highmem-16"
+    machine_type : "n2-highmem-16"
   },
 }