Skip to content

Commit

Permalink
Merge pull request #5438 from sgibson91/nmfs-openscapes/image-building
Browse files Browse the repository at this point in the history
Enable dynamic image building feature for NMFS Openscapes staging/prod hubs
  • Loading branch information
sgibson91 authored Jan 28, 2025
2 parents d34723b + d96d155 commit a35035a
Show file tree
Hide file tree
Showing 6 changed files with 46 additions and 0 deletions.
2 changes: 2 additions & 0 deletions config/clusters/nmfs-openscapes/cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
8 changes: 8 additions & 0 deletions config/clusters/nmfs-openscapes/common.values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
23 changes: 23 additions & 0 deletions config/clusters/nmfs-openscapes/enc-common.secret.values.yaml
Original file line number Diff line number Diff line change
@@ -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
5 changes: 5 additions & 0 deletions config/clusters/nmfs-openscapes/prod.values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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-
5 changes: 5 additions & 0 deletions config/clusters/nmfs-openscapes/staging.values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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-
3 changes: 3 additions & 0 deletions config/clusters/nmfs-openscapes/workshop.values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -183,3 +183,6 @@ jupyterhub-home-nfs:
quotaEnforcer:
hardQuota: "4" # in GB
path: "/export/workshop"

binderhub-service:
enabled: false

0 comments on commit a35035a

Please sign in to comment.