Merge pull request #3904 from sepehrkrz/main

awai-ciroh: add old/new image choice to prod hub (tested on staging already)
2i2c-org · Apr 3, 2024 · bae3d32 · bae3d32
2 parents 9886964 + 92bc962
commit bae3d32
Showing 1 changed file with 19 additions and 8 deletions.
diff --git a/config/clusters/awi-ciroh/prod.values.yaml b/config/clusters/awi-ciroh/prod.values.yaml
@@ -9,14 +9,6 @@ basehub:
         - hosts: [ciroh.awi.2i2c.cloud]
           secretName: https-auto-tls
     singleuser:
-      image:
-        # Image build repo: https://github.com/2i2c-org/awi-ciroh-image
-        #
-        # NOTE: The configurator is used in this cluster, so this is stale
-        #       configuration.
-        #
-        name: "quay.io/2i2c/awi-ciroh-image"
-        tag: "584293e50d4c"
       profileList:
         # The mem-guarantees are here so k8s doesn't schedule other pods
         # on these nodes. They need to be just under total allocatable
@@ -41,6 +33,22 @@ basehub:
         - display_name: "Small"
           description: 5GB RAM, 2 CPUs
           default: true
+          profile_options: &profile_options
+            image:
+              display_name: Image
+              # Requested in https://2i2c.freshdesk.com/a/tickets/1387
+              choices:
+                old:
+                  display_name: Original Pangeo Notebook base image 2023.01.04
+                  slug: "old"
+                  kubespawner_override:
+                    image: "quay.io/2i2c/awi-ciroh-image:f7222fce8b16"
+                new:
+                  display_name: New Pangeo Notebook base image 2023.09.11
+                  default: true
+                  slug: "new"
+                  kubespawner_override:
+                    image: "quay.io/2i2c/awi-ciroh-image:d9f753c83a6b"
           kubespawner_override:
             mem_limit: 7G
             mem_guarantee: 5G
@@ -50,6 +58,7 @@ basehub:
               node.kubernetes.io/instance-type: n2-highmem-16
         - display_name: Medium
           description: 11GB RAM, 4 CPUs
+          profile_options: *profile_options
           kubespawner_override:
             mem_limit: 15G
             mem_guarantee: 11G
@@ -59,6 +68,7 @@ basehub:
               node.kubernetes.io/instance-type: n2-highmem-16
         - display_name: Large
           description: 24GB RAM, 8 CPUs
+          profile_options: *profile_options
           kubespawner_override:
             mem_limit: 30G
             mem_guarantee: 24G
@@ -68,6 +78,7 @@ basehub:
               node.kubernetes.io/instance-type: n2-highmem-16
         - display_name: Huge
           description: 52GB RAM, 16 CPUs
+          profile_options: *profile_options
           kubespawner_override:
             mem_limit: 60G
             mem_guarantee: 52G