From 45b076e6e9e2c72ef428dde682d4bebb7b7fabf7 Mon Sep 17 00:00:00 2001 From: Sarah Gibson Date: Tue, 28 Jan 2025 11:29:18 +0000 Subject: [PATCH 1/2] NMFS Openscapes: Enable dynamic image building feature for staging and prod hubs --- config/clusters/nmfs-openscapes/cluster.yaml | 2 ++ .../nmfs-openscapes/common.values.yaml | 8 +++++++ .../enc-common.secret.values.yaml | 23 +++++++++++++++++++ .../clusters/nmfs-openscapes/prod.values.yaml | 5 ++++ .../nmfs-openscapes/staging.values.yaml | 5 ++++ 5 files changed, 43 insertions(+) create mode 100644 config/clusters/nmfs-openscapes/enc-common.secret.values.yaml diff --git a/config/clusters/nmfs-openscapes/cluster.yaml b/config/clusters/nmfs-openscapes/cluster.yaml index bb34b80b4..aac2f51a0 100644 --- a/config/clusters/nmfs-openscapes/cluster.yaml +++ b/config/clusters/nmfs-openscapes/cluster.yaml @@ -18,6 +18,7 @@ hubs: helm_chart: basehub helm_chart_values_files: - common.values.yaml + - enc-common.secret.values.yaml - staging.values.yaml - enc-staging.secret.values.yaml - name: prod @@ -26,6 +27,7 @@ hubs: helm_chart: basehub helm_chart_values_files: - common.values.yaml + - enc-common.secret.values.yaml - prod.values.yaml - enc-prod.secret.values.yaml - name: workshop diff --git a/config/clusters/nmfs-openscapes/common.values.yaml b/config/clusters/nmfs-openscapes/common.values.yaml index 5dc21d2ea..36799160f 100644 --- a/config/clusters/nmfs-openscapes/common.values.yaml +++ b/config/clusters/nmfs-openscapes/common.values.yaml @@ -53,6 +53,8 @@ jupyterhub: profile_options: &profile_options image: &profile_options_image display_name: Image + dynamic_image_building: + enabled: True choices: python: display_name: Py - NASA Openscapes Python 39dffde @@ -216,3 +218,9 @@ jupyterhub: scheduling: userScheduler: enabled: true + +binderhub-service: + enabled: true + buildPodsRegistryCredentials: + server: https://quay.io + username: "imagebuilding-non-gcp-hubs+image_builder" diff --git a/config/clusters/nmfs-openscapes/enc-common.secret.values.yaml b/config/clusters/nmfs-openscapes/enc-common.secret.values.yaml new file mode 100644 index 000000000..61f862a38 --- /dev/null +++ b/config/clusters/nmfs-openscapes/enc-common.secret.values.yaml @@ -0,0 +1,23 @@ +binderhub-service: + buildPodsRegistryCredentials: + password: ENC[AES256_GCM,data:GUCVEJge9YHhePE3AhnnGMSrxpgCSY1hkVMHCgJLDbG6biAKbx78hV/1lj13DaknsGsDH5YPRcSQlVtBFqbteA==,iv:MEkdHTFNEdmpKmNGcYyGRttc0oXOHS9bUEUjPr8NbVc=,tag:Za/E5D5Lhlwa57E/krDEuw==,type:str] +jupyterhub: + imagePullSecret: + create: ENC[AES256_GCM,data:SqcqWA==,iv:Kv2lh7NM+XK0VSmkMvWem+/W0XHpUlJzP32Q3033Rjw=,tag:fxEDRnqZ/1aUS6EoEQAOdA==,type:bool] + registry: ENC[AES256_GCM,data:QxzrfAqXkg==,iv:lKnMBugwwIqkmiaL8li0TlDKBeJec7LL9JV3QbCYQAs=,tag:j0LwVmYGy+ToMrhA6pDS3Q==,type:str] + username: ENC[AES256_GCM,data:JbxhGNf3BRMq74p3lSDs3yLgTUaP/mkDZdOcy+zdbPkiZ06lME/o6w==,iv:NOyfsDjxM87CdLrEHKWvOBV2ohGKDC0jumehD8QvexE=,tag:VW0XpK4c3/R8qrCjAcl4BA==,type:str] + password: ENC[AES256_GCM,data:dCwYP1vEjWtYQozm0uABrhNicbZXR51F19FgXASI8lTDygjh3EQQw+cipARDN9YboYhXdkEK2ZcaLjfBa1BUsA==,iv:y5/UR/+R1ZWSjPC24D05GhzBa1f31B2ErOH2xVgCD3g=,tag:z6gEYSxtPCEUmPPEtA/NFA==,type:str] +sops: + kms: [] + gcp_kms: + - resource_id: projects/two-eye-two-see/locations/global/keyRings/sops-keys/cryptoKeys/similar-hubs + created_at: "2025-01-28T11:25:11Z" + enc: CiUA4OM7eLZyBBlj1m/Kl7CtrAX0RdE9nHdRaTaDyOsS0VLXZU0sEkkAnGhyNjNqVU/tHIXc744mV5TqQWN5WJYh3qj3vtVTdZOjFtWjUvgKgDsg6iWgM7nvBDXFW066dWxWh0+Ve/bsQqDYb6qVy2hW + azure_kv: [] + hc_vault: [] + age: [] + lastmodified: "2025-01-28T11:25:11Z" + mac: ENC[AES256_GCM,data:gA4cVsQwOXa4xZQou+CAp2YVJJ9ZGtaKOJJgbvbHAy+39lZBUfZHnSK9N0WTsJTtghyVl5LfL/je/mG863pP+9BhkS73qkg9EjTWSu0og1PKkWLZcmEUmrKesT2jXfmAOlvIjicOy2QklgtL47e2JDgEpKCxZzJan6hQOiY5z+Q=,iv:qKyU+6oVNc8iEM3Ux6T1bVgY2HQzvUqzZfqHd1dM1n0=,tag:JzWuTdCKSipI/HSRJmNUww==,type:str] + pgp: [] + unencrypted_suffix: _unencrypted + version: 3.9.1 diff --git a/config/clusters/nmfs-openscapes/prod.values.yaml b/config/clusters/nmfs-openscapes/prod.values.yaml index 40822decc..f22a51a70 100644 --- a/config/clusters/nmfs-openscapes/prod.values.yaml +++ b/config/clusters/nmfs-openscapes/prod.values.yaml @@ -30,3 +30,8 @@ jupyterhub-home-nfs: quotaEnforcer: hardQuota: "64" # in GB path: "/export/prod" + +binderhub-service: + config: + BinderHub: + image_prefix: quay.io/imagebuilding-non-gcp-hubs/nmfs-openscapes-prod- diff --git a/config/clusters/nmfs-openscapes/staging.values.yaml b/config/clusters/nmfs-openscapes/staging.values.yaml index 60cf2f39a..6545e51e3 100644 --- a/config/clusters/nmfs-openscapes/staging.values.yaml +++ b/config/clusters/nmfs-openscapes/staging.values.yaml @@ -30,3 +30,8 @@ jupyterhub-home-nfs: quotaEnforcer: hardQuota: "0.1" # in GB path: "/export/staging" + +binderhub-service: + config: + BinderHub: + image_prefix: quay.io/imagebuilding-non-gcp-hubs/nmfs-openscapes-staging- From d96d1557d98fa77f2102fd834813d8233930d7d3 Mon Sep 17 00:00:00 2001 From: Sarah Gibson Date: Tue, 28 Jan 2025 11:29:51 +0000 Subject: [PATCH 2/2] NMFS Openscapes: Explicitly disable binderhub-service chart for workshop hub --- config/clusters/nmfs-openscapes/workshop.values.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/clusters/nmfs-openscapes/workshop.values.yaml b/config/clusters/nmfs-openscapes/workshop.values.yaml index e732580e1..59242e8b2 100644 --- a/config/clusters/nmfs-openscapes/workshop.values.yaml +++ b/config/clusters/nmfs-openscapes/workshop.values.yaml @@ -183,3 +183,6 @@ jupyterhub-home-nfs: quotaEnforcer: hardQuota: "4" # in GB path: "/export/workshop" + +binderhub-service: + enabled: false