Merge pull request #4988 from yuvipanda/veda-prod

nasa-veda: Enable dynamic image building
2i2c-org · Dec 3, 2024 · de31b5e · de31b5e
2 parents 2d784a5 + f6ff6e1
commit de31b5e
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 5 deletions.
diff --git a/config/clusters/nasa-veda/common.values.yaml b/config/clusters/nasa-veda/common.values.yaml
@@ -123,6 +123,8 @@ basehub:
           profile_options:
             image:
               display_name: Environment
+              dynamic_image_building:
+                enabled: true
               unlisted_choice:
                 enabled: True
                 display_name: "Custom image"
@@ -252,6 +254,8 @@ basehub:
           profile_options:
             image:
               display_name: Environment
+              dynamic_image_building:
+                enabled: true
               unlisted_choice:
                 enabled: true
                 display_name: "Custom image"
@@ -285,3 +289,15 @@ basehub:
     scheduling:
       userScheduler:
         enabled: true
+
+  binderhub-service:
+    enabled: true
+    # Explicitly specify what nodes we want for our builds
+    # Otherwise we may scale up a larger node than needed
+    dockerApi:
+      nodeSelector:
+        node.kubernetes.io/instance-type: r5.xlarge
+    config:
+      KubernetesBuildExecutor:
+        node_selector:
+          node.kubernetes.io/instance-type: r5.xlarge
diff --git a/config/clusters/nasa-veda/enc-prod.secret.values.yaml b/config/clusters/nasa-veda/enc-prod.secret.values.yaml
@@ -5,6 +5,17 @@ basehub:
                 GitHubOAuthenticator:
                     client_id: ENC[AES256_GCM,data:H0O+Ha2N/Ax3K6luitZ37k6EQdk=,iv:CP5BGeDMmE6uznVB6utuW78+UeP8Ge5CnDmocZIkSXU=,tag:Q4QG+b8Nq36bbANHIAfpuA==,type:str]
                     client_secret: ENC[AES256_GCM,data:a0Xm3m7cHRCrBdV5q22ohFMYjdolj9dDnQhg9cG5E9W47Toqxwj2Gg==,iv:/1CHsZez3j26A8ODvlYgbjXtaRsKbGraxTzgoF2ZURs=,tag:cN59IZ+9J48QxSJ0IiqsAQ==,type:str]
+        imagePullSecret:
+            create: ENC[AES256_GCM,data:VXMGYw==,iv:t29RaK0WDSGUo1KPPIY1S6usrhOzVURi9MS/TjtrZ2c=,tag:gv/lFMGpl8itOtk1FKzVLg==,type:bool]
+            registry: ENC[AES256_GCM,data:wD9XWkyngg==,iv:p+Wg1KsEn2BOQaVXsCJdnJjJLOhbcuG3I6NAHGNe908=,tag:M6X4ER4BLw0/J6FaKKlEUg==,type:str]
+            username: ENC[AES256_GCM,data:kj2Vy/zG6JqxzB/dHVZ5ykuH3HgQ7ImGvg==,iv:nFnIPz/JdHNCGPTvzJmQpRpb+5Y3sMMU1h9k0Znf/Oo=,tag:LtW+KyPMbwa5aqgw5s5F2Q==,type:str]
+            password: ENC[AES256_GCM,data:UFunKFYLFnGaXuTLtHd/FSeuUKATJugvVm437efr7tqBxnTsAi9BY6P9jUoyrI0F/gbETcW8XcZ43ilM5P4vrA==,iv:hS01n8afHI7p7KKduPQEq45U83IT9npF6Rw/f0B7PXQ=,tag:Wf8gSXFJeY/kpcPDAMv4qA==,type:str]
+    binderhub-service:
+        buildPodsRegistryCredentials:
+            password: ENC[AES256_GCM,data:ciFabSeOnYdm0qz82hQbDRhk4zMf3r0lyhWzrmw5pRUs635Kl3jfAW3Edg/C1wmYrk5b4MeGCHUPsZDxI2yZQQ==,iv:Y1XI64eDVQI2MVmlZPS/9hay7JBWZgGxriIXd6PudwY=,tag:i7W7PA0R4s15otnPKdKdyw==,type:str]
+        config:
+            DockerRegistry:
+                password: ENC[AES256_GCM,data:T3G3WXoOvwR6wgQ0L2iC0j/fjWInhVWoce7McZAqdVmkikpSmHd5vub3Jn97VYTo2NjdT+dxcs7VKYcMeIEGyQ==,iv:KsI5iA2b0txa5kGjg8lsSdvMHi5rUbUucApz38aA+R0=,tag:3G2sEmnQSnZg7mxJ8JzoZw==,type:str]
 sops:
     kms: []
     gcp_kms:
@@ -14,8 +25,8 @@ sops:
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2023-01-26T14:57:40Z"
-    mac: ENC[AES256_GCM,data:57DrEJDR9q4W9O7SJXo/R0XjriaoTmwTSkWtkdAKkXpxIjT37ynN6sSANlk+zi+q8WbdITbk5K6hsHgOnS3VJrKnjTi8mpo0FJ6vAxIRIIr80NSzA1vhWXKn5rvSFWPNL1eh0XJK8HLoqsKBtNLMTis9jgKmAg4lME8uHgh6yxQ=,iv:Gkr554YmGLgT9ScNyxNcHhPq62C3GYph7L+MILyKN2E=,tag:e5k1BNZRscw+IK4eRtfZrA==,type:str]
+    lastmodified: "2024-10-19T04:19:27Z"
+    mac: ENC[AES256_GCM,data:/o1UMKj1UkYJZfnnyMde7hvSxGQgConsBKKFBQCQUqW4TyOtv+ajEpuT1gDI8ooWcCetzcdDVvQp+1WwxH862u1T41JwWspqOWmm+QHVPersoasIxqrbX4fhzoWs65Y5vRN2ZeHW1d4AMZvKUhAai/cmLvfcS39ndS/GP5mZ5SU=,iv:6cP1euO6h/jZeFO4SwdUQChzlW9mAVTIVYzN8bHxbpI=,tag:hm+qDxr2ttNZwff6REYSvw==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
-    version: 3.7.3
+    version: 3.8.1
diff --git a/config/clusters/nasa-veda/prod.values.yaml b/config/clusters/nasa-veda/prod.values.yaml
@@ -31,3 +31,22 @@ basehub:
           extraPodConfig:
             nodeSelector:
               2i2c/hub-name: prod
+
+  binderhub-service:
+    dockerApi:
+      nodeSelector:
+        2i2c/hub-name: prod
+    config:
+      KubernetesBuildExecutor:
+        node_selector:
+          2i2c/hub-name: prod
+      BinderHub:
+        # something like <region>-docker.pkg.dev/<project-name>/<repository-name> for grc.io
+        # or quay.io/org/repo/cluster-hub/ for quay.io
+        image_prefix: quay.io/veda-binder/prod-
+      DockerRegistry:
+        url: &url https://quay.io
+        username: &username veda-binder+image_builder
+    buildPodsRegistryCredentials:
+      server: *url
+      username: *username
diff --git a/config/clusters/nasa-veda/staging.values.yaml b/config/clusters/nasa-veda/staging.values.yaml
@@ -59,14 +59,12 @@ basehub:
         imagePullSecrets: [{ name: image-pull-secret }]
 
   binderhub-service:
-    enabled: true
     dockerApi:
       nodeSelector:
         2i2c/hub-name: staging
     config:
       KubernetesBuildExecutor:
         node_selector:
-          node.kubernetes.io/instance-type: r5.xlarge
           2i2c/hub-name: staging
       BinderHub:
         # something like <region>-docker.pkg.dev/<project-name>/<repository-name> for grc.io

diff --git a/helm-charts/basehub/values.yaml b/helm-charts/basehub/values.yaml
@@ -42,6 +42,7 @@ binderhub-service:
       base_url: /services/binder
       use_registry: true
     KubernetesBuildExecutor:
+      build_image: quay.io/jupyterhub/repo2docker:2024.07.0-34.gf77a7d9
       node_selector:
         # Schedule builder pods to run on user nodes only
         hub.jupyter.org/node-purpose: user