From 83148fdb44778cee3bb1f7ef274c595112fbf53d Mon Sep 17 00:00:00 2001 From: shane knapp Date: Mon, 12 Jun 2023 16:02:10 -0700 Subject: [PATCH 01/27] initial commit of data100-jl4 hub --- .circleci/config.yml | 25 +++++ .github/labeler.yml | 2 + deployments/data100-jl4/config/common.yaml | 54 +++++++++++ deployments/data100-jl4/config/prod.yaml | 35 +++++++ deployments/data100-jl4/config/staging.yaml | 16 ++++ deployments/data100-jl4/hubploy.yaml | 19 ++++ deployments/data100-jl4/image/apt.txt | 93 ++++++++++++++++++ deployments/data100-jl4/image/environment.yml | 96 +++++++++++++++++++ .../data100-jl4/image/infra-requirements.txt | 31 ++++++ deployments/data100-jl4/secrets/prod.yaml | 21 ++++ deployments/data100-jl4/secrets/staging.yaml | 21 ++++ 11 files changed, 413 insertions(+) create mode 100644 deployments/data100-jl4/config/common.yaml create mode 100644 deployments/data100-jl4/config/prod.yaml create mode 100644 deployments/data100-jl4/config/staging.yaml create mode 100644 deployments/data100-jl4/hubploy.yaml create mode 100644 deployments/data100-jl4/image/apt.txt create mode 100644 deployments/data100-jl4/image/environment.yml create mode 100644 deployments/data100-jl4/image/infra-requirements.txt create mode 100644 deployments/data100-jl4/secrets/prod.yaml create mode 100644 deployments/data100-jl4/secrets/staging.yaml diff --git a/.circleci/config.yml b/.circleci/config.yml index 223a5d7ad..d9178815c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -276,6 +276,12 @@ jobs: hubploy deploy --timeout 30m data100 hub ${CIRCLE_BRANCH} no_output_timeout: 30m + - run: + name: Deploy data100-jl4 + command: | + hubploy deploy --timeout 30m data100-jl4 hub ${CIRCLE_BRANCH} + no_output_timeout: 30m + - run: name: Deploy shiny command: | @@ -473,6 +479,15 @@ workflows: ignore: - staging - prod + - hubploy/build-image: + deployment: data100-jl4 + name: data100-jl4 image build + # Filters can only be per-job? wtf + filters: + branches: + ignore: + - staging + - prod - hubploy/build-image: deployment: stat159 name: stat159 image build @@ -659,6 +674,15 @@ workflows: branches: only: - staging + - hubploy/build-image: + deployment: data100-jl4 + name: data100-jl4 image build + push: true + # Filters can only be per-job? wtf + filters: + branches: + only: + - staging - hubploy/build-image: deployment: stat159 name: stat159 image build @@ -760,6 +784,7 @@ workflows: - datahub image build - data8 image build - data100 image build + - data100-jl4 image build # - astro image build - stat159 image build - stat20 image build diff --git a/.github/labeler.yml b/.github/labeler.yml index fcf659b7b..059fb4c93 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -64,6 +64,8 @@ node-placeholder-scaler: - "deployments/cee/**" "hub: data100": - "deployments/data100/**" +"hub: data100-jl4": + - "deployments/data100-jl4/**" "hub: data101": - "deployments/data101/**" "hub: data102": diff --git a/deployments/data100-jl4/config/common.yaml b/deployments/data100-jl4/config/common.yaml new file mode 100644 index 000000000..fe550fb71 --- /dev/null +++ b/deployments/data100-jl4/config/common.yaml @@ -0,0 +1,54 @@ +nfsPVC: + enabled: true + nfs: + serverIP: 10.203.15.114 + +jupyterhub: + hub: + config: + Authenticator: + admin_users: + # infrastructure + - balajialwar + - felder + - gmerritt + - rylo + - sknapp + +# prePuller: +# extraImages: +# postgres: +# name: gcr.io/ucb-datahub-2018/jupyterhub-postgres +# tag: 0.0.1-n3657.h4f7f88c + singleuser: + defaultUrl: "/lab" + extraEnv: + GH_SCOPED_CREDS_CLIENT_ID: Iv1.f79b4903c7ea2847 + GH_SCOPED_CREDS_APP_URL: https://github.com/apps/data100-berkeley-datahub-access + nodeSelector: + hub.jupyter.org/pool-name: data100-pool + storage: + type: static + static: + pvcName: home-nfs-v3 + subPath: "{username}" + extraVolumeMounts: + - name: home + mountPath: /home/jovyan/shared + subPath: _shared + readOnly: true + memory: + guarantee: 2G + limit: 2G + image: {} + + custom: + admin: + mem_limit: 4G + mem_guarantee: 2G + extraVolumeMounts: + - name: home + mountPath: /srv/homes + - name: home + mountPath: /home/jovyan/shared-readwrite + subPath: _shared diff --git a/deployments/data100-jl4/config/prod.yaml b/deployments/data100-jl4/config/prod.yaml new file mode 100644 index 000000000..c90e97e47 --- /dev/null +++ b/deployments/data100-jl4/config/prod.yaml @@ -0,0 +1,35 @@ +nfsPVC: + nfs: + shareName: shares/data100-jl4/prod + +jupyterhub: + ingress: + enabled: true + hosts: + - data100-jl4.datahub.berkeley.edu + tls: + - secretName: tls-cert + hosts: + - data100-jl4.datahub.berkeley.edu + proxy: + chp: + resources: + requests: + # Give data100 a lot of guaranteed CPU, prevent 503s? + # https://github.com/berkeley-dsep-infra/datahub/issues/2677 + cpu: 1 + + hub: + resources: + requests: + # Give data100 a lot of guaranteed CPU, prevent 503s? + # https://github.com/berkeley-dsep-infra/datahub/issues/2677 + cpu: 1 + db: + pvc: + # This also holds logs + storage: 40Gi + + scheduling: + userPlaceholder: + enabled: false diff --git a/deployments/data100-jl4/config/staging.yaml b/deployments/data100-jl4/config/staging.yaml new file mode 100644 index 000000000..858863ec5 --- /dev/null +++ b/deployments/data100-jl4/config/staging.yaml @@ -0,0 +1,16 @@ +nfsPVC: + nfs: + shareName: shares/data100-jl4/staging + +jupyterhub: + prePuller: + continuous: + enabled: false + ingress: + enabled: true + hosts: + - data100-jl4-staging.datahub.berkeley.edu + tls: + - secretName: tls-cert + hosts: + - data100-jl4-staging.datahub.berkeley.edu diff --git a/deployments/data100-jl4/hubploy.yaml b/deployments/data100-jl4/hubploy.yaml new file mode 100644 index 000000000..1f1a17e3a --- /dev/null +++ b/deployments/data100-jl4/hubploy.yaml @@ -0,0 +1,19 @@ +images: + images: + - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/data100-jl4-user-image + path: image/ + repo2docker: + base_image: docker.io/library/buildpack-deps:jammy + registry: + provider: gcloud + gcloud: + project: ucb-datahub-2018 + service_key: gcr-key.json + +cluster: + provider: gcloud + gcloud: + project: ucb-datahub-2018 + service_key: gke-key.json + cluster: fall-2019 + zone: us-central1 diff --git a/deployments/data100-jl4/image/apt.txt b/deployments/data100-jl4/image/apt.txt new file mode 100644 index 000000000..c4bb4d06c --- /dev/null +++ b/deployments/data100-jl4/image/apt.txt @@ -0,0 +1,93 @@ +# Some linux packages for basic terminal work, particularly +# oriented at users new to Unix/cmd line environments. + +# Basic unix tools +man +man-db +manpages-posix +manpages-dev +manpages-posix-dev + +# Download tools +curl +wget + +# Core text editors on a *nix box: vim and emacs +vim +emacs-nox +emacs-goodies-el + +# A couple of CLI editors that are easier than vim +# micro # currently not working on 18.04 +nano +jed +jed-extra + +# powerful terminal-based file manager, better than the one in JLab +mc + +# for easily managing multiple repositories with one command (perl-doc +# is needed for its help pages to work) +mr +perl-doc + +# Regular build tools for compiling common stuff +build-essential +gfortran + +# Dependencies for nbconvert +texlive-xetex +texlive-fonts-recommended +texlive-plain-generic +# https://github.com/berkeley-dsep-infra/datahub/issues/3719 +texlive-lang-chinese +lmodern + +# Other useful document-related tools +pandoc +latexdiff + +# Some useful git utilities use basic Ruby +ruby + +# Other niceties for command-line work and life +ack # powerful grep-like tool +pydf # colorized disk usage +tmux +screen +htop +nnn # cmd line file manager +zsh +rsync +tig # console UI for git +multitail + +# For later, these are not available in 18.04 +#browsh # text-based web browser, occasionally handy +#dasel # json/yml/csv/etc data wrangling at the terminal +#fzf # fuzzy file finder + +## This section adds tools for desktop environment usage +dbus-x11 +xorg +xubuntu-icon-theme +xfce4 +xfce4-goodies +xclip +xsel +firefox +chromium-browser + +# GUI text editors +emacs +vim-gtk3 +gedit + +# Git clients and tools +git-gui +gitg +qgit +meld + +# For jupyter-tree-download. Ref: https://github.com/berkeley-dsep-infra/datahub/issues/3979 +zip diff --git a/deployments/data100-jl4/image/environment.yml b/deployments/data100-jl4/image/environment.yml new file mode 100644 index 000000000..e6681300f --- /dev/null +++ b/deployments/data100-jl4/image/environment.yml @@ -0,0 +1,96 @@ +name: data100-s23 + +channels: +- conda-forge + +dependencies: +- python==3.9 +- syncthing==1.20.4 +- git +- altair==4.2.0 +- beautifulsoup4==4.11.1 +- black==22.6.0 +- bokeh==2.4.3 +- bqplot==0.12.34 +- cartopy==0.21.0 +- coverage==6.4.4 +- cython==0.29.32 +- dask==2022.8.1 +- dask-labextension==5.3.0 +- fortran-magic==0.7 +- h5netcdf==1.0.2 +- h5py==3.7.0 +- hdf4==4.2.15 +- hdf5==1.12.2 +- intake==0.6.5 +- intake-esm==2021.8.17 +- intake-xarray==0.6.0 +- ipycanvas==0.12.1 +- ipydatagrid==1.1.12 +- ipympl==0.9.2 +- ipyparallel==8.4.1 +- jupyter-book==0.13.1 +- jupyter-repo2docker==2022.2.0 +- jupyter-resource-usage==0.6.1 +- jupyter_bokeh==3.0.4 +- jupyterlab==3.4.5 +- jupyterlab-drawio==0.9.0 +- jupyterlab-favorites==3.0.0 +- jupyterlab-geojson==3.2.0 +- jupyterlab-git==0.39.0 +- jupyterlab-link-share==0.2.4 +- jupyterlab-variableinspector==3.0.9 +- jupyterlab_pygments==0.2.2 +- jupyterlab_widgets==3.0.2 +- jupytext==1.14.0 +- matplotlib==3.5.3 +- matplotlib-inline==0.1.6 +- mock==4.0.3 +- nbdime==3.1.1 +- networkx==2.8.6 +- numba +- numpy==1.23.2 +- pandas==1.4.3 +- pandoc==2.19.2 +- pandocfilters==1.5.0 +- pep8==1.7.1 +- pillow==9.2.0 +- plotly==5.10.0 +- pooch==1.6.0 +- prettytable==3.4.1 +- pyarrow==9.0.0 +- pypdf2==2.10.4 +- pytables==3.7.0 +- pytest==7.1.2 +- pytest-cov==3.0.0 +- pytest-notebook==0.6.1 +- python-pdfkit==1.0.0 +- requests==2.28.1 +- scikit-image==0.19.3 +- scikit-learn==1.1.2 +- scipy==1.9.0 +- seaborn==0.11.2 +- sphinx-jupyterbook-latex==0.4.6 +- sqlparse==0.4.3 +- statsmodels==0.13.2 +- sympy==1.10.1 +- tqdm==4.64.0 +- xarray==2022.6.0 +- xlrd==2.0.1 +- micro==2.0.8 +- websockify +- folium==0.14.0 +- sqlalchemy==1.4.29 +- pip +- pip: + - -r infra-requirements.txt + - jupyter-desktop-server + # For push authentication to GitHub + - gh-scoped-creds==4.1 + # Upgrade separate from what everyone else uses for now + # https://github.com/berkeley-dsep-infra/datahub/issues/3693 + - otter-grader==4.0.1 + - ipython-sql==0.4.1 + - geopandas==0.12.1 + - iwut==0.0.4 + - tensorflow-cpu==2.12.0 diff --git a/deployments/data100-jl4/image/infra-requirements.txt b/deployments/data100-jl4/image/infra-requirements.txt new file mode 100644 index 000000000..4a6e199be --- /dev/null +++ b/deployments/data100-jl4/image/infra-requirements.txt @@ -0,0 +1,31 @@ +# WARNING: Original source at scripts/infra-packages/requirements.txt +# PLEASE DO NOT EDIT ELSEWHERE +# After editing scripts/infra-packages/requirements.txt, please run +# scripts/infra-packages/sync.bash. + +# This file pins versions of notebook related python packages we want +# across all hubs. This makes sure we don't need to upgrade them +# everwhere one by one. + +# FIXME: Freeze this to get exact versions of all dependencies +notebook==6.4.12 +jupyterlab==3.4.5 +retrolab==0.3.21 +nbgitpuller==1.1.0 +jupyter-resource-usage==0.6.1 +# Matches version in images/hub/Dockerfile +jupyterhub==4.0.0b2 +appmode==0.8.0 +ipywidgets==7.7.2 +jupyter-tree-download==1.0.1 +git-credential-helpers==0.2 +# Enough people like this, let's load it in. +jupyter-contrib-nbextensions==0.5.1 +jupyter_nbextensions_configurator==0.4.1 +# Measure popularity of different packages in our hubs +# https://discourse.jupyter.org/t/request-for-implementation-instrument-libraries-actively-used-by-users-on-a-jupyterhub/7994?u=yuvipanda +popularity-contest==0.4.1 +# RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527 +RISE==5.7.1 +# syncthing for dropbox-like functionality +jupyter-syncthing-proxy==1.0.3 diff --git a/deployments/data100-jl4/secrets/prod.yaml b/deployments/data100-jl4/secrets/prod.yaml new file mode 100644 index 000000000..c31214500 --- /dev/null +++ b/deployments/data100-jl4/secrets/prod.yaml @@ -0,0 +1,21 @@ +jupyterhub: + hub: + config: + CanvasOAuthenticator: + client_id: ENC[AES256_GCM,data:/VedfPLyL+Rj3gciMxQ5H84=,iv:WZsC/06SEfEEeH4/NY+txGypgP/lShrJLc8DVXS7tco=,tag:kdZCzktRscuCYz4nRlkxTA==,type:str] + client_secret: ENC[AES256_GCM,data:EqzXDvAIMyGeTnGjUDOg6X6XqSwDmogtz/HXhc2LNYMhoSgg8PSUqvEFNUNG6w59tkRXPerBR6PyOuG31ftYXQ==,iv:D/rf3aWams6O2NcmdjFYxEVV5dQoWv3ubZ1kTN5KMO8=,tag:/LLaEHP/RB17Td0UW1I2bQ==,type:str] + oauth_callback_url: ENC[AES256_GCM,data:YuKnhYJtOzbQvLzxkz7Shf8zGrnnUuN78GdWJXHNSBy4/4rHzDwdPv0HunqBTUfe7VpM8S3t/5zUM8pGqa+sj8GCH1qhgQYVkA==,iv:zetZc6+0+/HPjYtUrUM7577AVGz/K5/cFZvCVt0Tuwo=,tag:Djx/8MM/GsVMmSXrqCm2Ow==,type:str] +sops: + kms: [] + gcp_kms: + - resource_id: projects/ucb-datahub-2018/locations/global/keyRings/datahub/cryptoKeys/sops + created_at: "2021-05-05T10:57:58Z" + enc: CiQA67O9AK2027WGYGTzywa01Cz+Ez7sOTk/d9payovyK5pg8g4SSADmhpq89bbIWFjlGg79o/iupJ4anLU5Ab9VL+qNzhu6e83JtJ7wSv6sK+cDiEfVSaKQ1YIcadDXFt4WUKRt7MFvAa1sLqp2LA== + azure_kv: [] + hc_vault: [] + age: [] + lastmodified: "2022-12-21T03:33:03Z" + mac: ENC[AES256_GCM,data:Ms5m4bCGLVMsDiXc/puK0kSpSDLmZ1vk8vTXI04YjoxEGRyK5cuaJr9LVyIo0GTLfpalP/LViJRypYOtnJ+KpIZcVEHfIzobrHQumGfke6KJeXxiFoBAj1FOpzIy9l7vkZLYqAreo3uPWqzohod4XCcp/BgkaWuaKjAA8r9hkKw=,iv:q13jk2ebjzcNBsyhAzPo7wH4Qm/wMg9Xxdbmp3209/M=,tag:epWXlKmP5bK2+9KuxBqeFQ==,type:str] + pgp: [] + unencrypted_suffix: _unencrypted + version: 3.7.3 diff --git a/deployments/data100-jl4/secrets/staging.yaml b/deployments/data100-jl4/secrets/staging.yaml new file mode 100644 index 000000000..85406ec53 --- /dev/null +++ b/deployments/data100-jl4/secrets/staging.yaml @@ -0,0 +1,21 @@ +jupyterhub: + hub: + config: + CanvasOAuthenticator: + client_id: ENC[AES256_GCM,data:G0+pIvyOsh+Zj4ZxddKbON4=,iv:iX8jMrXcJvjBi0GKRtuN886bXWFwBfCsaUoH+HRMn6U=,tag:BsyGAveKrd8TvWMuUlw3kw==,type:str] + client_secret: ENC[AES256_GCM,data:6mR3zs4jvkVuVwjut56tuW3HIOHcYWRSIJJZiOeC+H82tqgZeuVEe7+/zMxq6J0ba5RMas9npep4svuL+TppcA==,iv:K6/MFusdxnLkrEA5LaXLO8mFm1Xa4U2OmxUBOLqdpJk=,tag:xweE4+/ZCIcXj9CtbFpUSw==,type:str] + oauth_callback_url: ENC[AES256_GCM,data:1c57kXqHdMDgnKcx2fMTyF1Bmmq+zs/5+XGzw3jMf11A1ftu4ovK5qeykF+SCUI1HZdIIDD//HNvr9fBfuGibPvsNHVUTe0c1RmvE0XqwD7F,iv:vEv7BTRjyh4muW+KEotKAQt0INSjZpGrjnDVVVt87hM=,tag:jres6/1KO/L96eGyWI/Ybw==,type:str] +sops: + kms: [] + gcp_kms: + - resource_id: projects/ucb-datahub-2018/locations/global/keyRings/datahub/cryptoKeys/sops + created_at: "2021-05-05T10:57:58Z" + enc: CiQA67O9ALEiz+lgnWQQgjT08Fx2+SUNdWEA2MqdIoEl0Ett3zASSQDmhpq85T+08Rtt/sqeMktjA6t8rCVH8soCR/sNJwDHgXabOipn/od+64D/L+aggCaXqJ433twByk0+YUJAe5z733oW/3J53eU= + azure_kv: [] + hc_vault: [] + age: [] + lastmodified: "2022-12-21T03:32:26Z" + mac: ENC[AES256_GCM,data:W24v2meL24A2uJMuv+Asu5OrNofxmD2yc4tkeIo1w7s66lnPyYLMHasWMyXPjx0zXYzwcdEy2jyMOrxbEi8ZcpMfXDzwr+0z5I9erl/WArVQaSHkU6+xE17/CQ65o7/+A+vtYivmvDauaZCVaMITwuHkZVIQ2p9NCTV/lhu/Ccw=,iv:3F1wnItIwfopBpUpaiVoUaCIPfVAb5Znhb9jlTf8dGE=,tag:tI3UxENOa3ZDshodyoe83A==,type:str] + pgp: [] + unencrypted_suffix: _unencrypted + version: 3.7.3 From 01c7ca0edda210bf7c2e5232e6fd7e23db251dc6 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Mon, 12 Jun 2023 16:16:44 -0700 Subject: [PATCH 02/27] bump JL to 4.0.2 and see what breaks! XD --- deployments/data100-jl4/image/environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployments/data100-jl4/image/environment.yml b/deployments/data100-jl4/image/environment.yml index e6681300f..70f627197 100644 --- a/deployments/data100-jl4/image/environment.yml +++ b/deployments/data100-jl4/image/environment.yml @@ -33,7 +33,7 @@ dependencies: - jupyter-repo2docker==2022.2.0 - jupyter-resource-usage==0.6.1 - jupyter_bokeh==3.0.4 -- jupyterlab==3.4.5 +- jupyterlab==4.0.2 - jupyterlab-drawio==0.9.0 - jupyterlab-favorites==3.0.0 - jupyterlab-geojson==3.2.0 From 85fc8ba889b2f6a2482da113e7761b398fa52edd Mon Sep 17 00:00:00 2001 From: shane knapp Date: Mon, 12 Jun 2023 16:30:52 -0700 Subject: [PATCH 03/27] jupyter_bokeh might not be compatible with JL4 --- deployments/data100-jl4/image/environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployments/data100-jl4/image/environment.yml b/deployments/data100-jl4/image/environment.yml index 70f627197..9c96d92ad 100644 --- a/deployments/data100-jl4/image/environment.yml +++ b/deployments/data100-jl4/image/environment.yml @@ -32,7 +32,7 @@ dependencies: - jupyter-book==0.13.1 - jupyter-repo2docker==2022.2.0 - jupyter-resource-usage==0.6.1 -- jupyter_bokeh==3.0.4 +- jupyter_bokeh==3.0.7 - jupyterlab==4.0.2 - jupyterlab-drawio==0.9.0 - jupyterlab-favorites==3.0.0 From fc64f27cd01bc8bdf0e62fb7004ed5016988c472 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Mon, 12 Jun 2023 16:43:06 -0700 Subject: [PATCH 04/27] brokeh and widgets --- deployments/data100-jl4/image/environment.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deployments/data100-jl4/image/environment.yml b/deployments/data100-jl4/image/environment.yml index 9c96d92ad..2bba4ed4a 100644 --- a/deployments/data100-jl4/image/environment.yml +++ b/deployments/data100-jl4/image/environment.yml @@ -32,7 +32,7 @@ dependencies: - jupyter-book==0.13.1 - jupyter-repo2docker==2022.2.0 - jupyter-resource-usage==0.6.1 -- jupyter_bokeh==3.0.7 +- jupyter_bokeh - jupyterlab==4.0.2 - jupyterlab-drawio==0.9.0 - jupyterlab-favorites==3.0.0 @@ -41,7 +41,7 @@ dependencies: - jupyterlab-link-share==0.2.4 - jupyterlab-variableinspector==3.0.9 - jupyterlab_pygments==0.2.2 -- jupyterlab_widgets==3.0.2 +- jupyterlab_widgets - jupytext==1.14.0 - matplotlib==3.5.3 - matplotlib-inline==0.1.6 From 29de1cde95cba6b6194b35d37896346722042454 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Mon, 12 Jun 2023 16:50:48 -0700 Subject: [PATCH 05/27] bump jupyterlab-link-share to latest --- deployments/data100-jl4/image/environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployments/data100-jl4/image/environment.yml b/deployments/data100-jl4/image/environment.yml index 2bba4ed4a..c1ac80d4d 100644 --- a/deployments/data100-jl4/image/environment.yml +++ b/deployments/data100-jl4/image/environment.yml @@ -38,7 +38,7 @@ dependencies: - jupyterlab-favorites==3.0.0 - jupyterlab-geojson==3.2.0 - jupyterlab-git==0.39.0 -- jupyterlab-link-share==0.2.4 +- jupyterlab-link-share==0.3.0 - jupyterlab-variableinspector==3.0.9 - jupyterlab_pygments==0.2.2 - jupyterlab_widgets From baebbb287747e3617cda318c513c42ced2df4d10 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Mon, 12 Jun 2023 17:00:28 -0700 Subject: [PATCH 06/27] s/jupyterlab-link-share/jupyter_collaboration --- deployments/data100-jl4/image/environment.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/deployments/data100-jl4/image/environment.yml b/deployments/data100-jl4/image/environment.yml index c1ac80d4d..86b29ae37 100644 --- a/deployments/data100-jl4/image/environment.yml +++ b/deployments/data100-jl4/image/environment.yml @@ -33,12 +33,13 @@ dependencies: - jupyter-repo2docker==2022.2.0 - jupyter-resource-usage==0.6.1 - jupyter_bokeh +- jupyter_collaboration - jupyterlab==4.0.2 - jupyterlab-drawio==0.9.0 - jupyterlab-favorites==3.0.0 - jupyterlab-geojson==3.2.0 - jupyterlab-git==0.39.0 -- jupyterlab-link-share==0.3.0 + # - jupyterlab-link-share==0.3.0 - jupyterlab-variableinspector==3.0.9 - jupyterlab_pygments==0.2.2 - jupyterlab_widgets From 45aa6ec549caf5f07eebcf069b66244326d0db4b Mon Sep 17 00:00:00 2001 From: shane knapp Date: Tue, 13 Jun 2023 08:05:21 -0700 Subject: [PATCH 07/27] move jupyter_collaboration to pip block --- deployments/data100-jl4/image/environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployments/data100-jl4/image/environment.yml b/deployments/data100-jl4/image/environment.yml index 86b29ae37..25e9c7f3d 100644 --- a/deployments/data100-jl4/image/environment.yml +++ b/deployments/data100-jl4/image/environment.yml @@ -33,7 +33,6 @@ dependencies: - jupyter-repo2docker==2022.2.0 - jupyter-resource-usage==0.6.1 - jupyter_bokeh -- jupyter_collaboration - jupyterlab==4.0.2 - jupyterlab-drawio==0.9.0 - jupyterlab-favorites==3.0.0 @@ -95,3 +94,4 @@ dependencies: - geopandas==0.12.1 - iwut==0.0.4 - tensorflow-cpu==2.12.0 + - jupyter_collaboration From 994f9f566b920031408e4111628d4e2c42f1f77f Mon Sep 17 00:00:00 2001 From: shane knapp Date: Tue, 13 Jun 2023 08:06:46 -0700 Subject: [PATCH 08/27] remove jupyter-drawio --- deployments/data100-jl4/image/environment.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/deployments/data100-jl4/image/environment.yml b/deployments/data100-jl4/image/environment.yml index 25e9c7f3d..de06e35f9 100644 --- a/deployments/data100-jl4/image/environment.yml +++ b/deployments/data100-jl4/image/environment.yml @@ -34,7 +34,6 @@ dependencies: - jupyter-resource-usage==0.6.1 - jupyter_bokeh - jupyterlab==4.0.2 -- jupyterlab-drawio==0.9.0 - jupyterlab-favorites==3.0.0 - jupyterlab-geojson==3.2.0 - jupyterlab-git==0.39.0 From f43a8753bc093b04e8044268f4280bdea5e01759 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Tue, 13 Jun 2023 08:15:26 -0700 Subject: [PATCH 09/27] bumping dask-labextension --- deployments/data100-jl4/image/environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployments/data100-jl4/image/environment.yml b/deployments/data100-jl4/image/environment.yml index de06e35f9..650bcc4a4 100644 --- a/deployments/data100-jl4/image/environment.yml +++ b/deployments/data100-jl4/image/environment.yml @@ -16,7 +16,7 @@ dependencies: - coverage==6.4.4 - cython==0.29.32 - dask==2022.8.1 -- dask-labextension==5.3.0 +- dask-labextension==6.1.0 - fortran-magic==0.7 - h5netcdf==1.0.2 - h5py==3.7.0 From 92e1c6a1d4c05f0d0b1fd5662c581c61608910c9 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Tue, 13 Jun 2023 08:26:43 -0700 Subject: [PATCH 10/27] add jsonschema, bump jupyter-book --- deployments/data100-jl4/image/environment.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/deployments/data100-jl4/image/environment.yml b/deployments/data100-jl4/image/environment.yml index 650bcc4a4..f2b444216 100644 --- a/deployments/data100-jl4/image/environment.yml +++ b/deployments/data100-jl4/image/environment.yml @@ -29,7 +29,8 @@ dependencies: - ipydatagrid==1.1.12 - ipympl==0.9.2 - ipyparallel==8.4.1 -- jupyter-book==0.13.1 +- jsonschema +- jupyter-book==0.15.1 - jupyter-repo2docker==2022.2.0 - jupyter-resource-usage==0.6.1 - jupyter_bokeh From 6348815a6af5c77f39bde4ea06483fda81a13650 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Tue, 13 Jun 2023 08:35:20 -0700 Subject: [PATCH 11/27] pin sphinx-jupyterbook-latex, pin jsonschema --- deployments/data100-jl4/image/environment.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deployments/data100-jl4/image/environment.yml b/deployments/data100-jl4/image/environment.yml index f2b444216..dee3ac419 100644 --- a/deployments/data100-jl4/image/environment.yml +++ b/deployments/data100-jl4/image/environment.yml @@ -29,7 +29,7 @@ dependencies: - ipydatagrid==1.1.12 - ipympl==0.9.2 - ipyparallel==8.4.1 -- jsonschema +- jsonschema==4.17 - jupyter-book==0.15.1 - jupyter-repo2docker==2022.2.0 - jupyter-resource-usage==0.6.1 @@ -70,7 +70,7 @@ dependencies: - scikit-learn==1.1.2 - scipy==1.9.0 - seaborn==0.11.2 -- sphinx-jupyterbook-latex==0.4.6 +- sphinx-jupyterbook-latex==0.5.2 - sqlparse==0.4.3 - statsmodels==0.13.2 - sympy==1.10.1 From 33572531fc3b1db742bda2e42caab7a68273f5f0 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Tue, 13 Jun 2023 08:43:30 -0700 Subject: [PATCH 12/27] adding jupyterlab_server --- deployments/data100-jl4/image/environment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/deployments/data100-jl4/image/environment.yml b/deployments/data100-jl4/image/environment.yml index dee3ac419..5cc3b4ffa 100644 --- a/deployments/data100-jl4/image/environment.yml +++ b/deployments/data100-jl4/image/environment.yml @@ -85,6 +85,7 @@ dependencies: - pip: - -r infra-requirements.txt - jupyter-desktop-server + - jupyterlab_server==2.23.0 # For push authentication to GitHub - gh-scoped-creds==4.1 # Upgrade separate from what everyone else uses for now From 44e77976f3d21424b6422573b588bd82f10e3f9e Mon Sep 17 00:00:00 2001 From: shane knapp Date: Tue, 13 Jun 2023 08:50:52 -0700 Subject: [PATCH 13/27] move jupyterlab_server to conda block --- deployments/data100-jl4/image/environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployments/data100-jl4/image/environment.yml b/deployments/data100-jl4/image/environment.yml index 5cc3b4ffa..ac89fdab3 100644 --- a/deployments/data100-jl4/image/environment.yml +++ b/deployments/data100-jl4/image/environment.yml @@ -41,6 +41,7 @@ dependencies: # - jupyterlab-link-share==0.3.0 - jupyterlab-variableinspector==3.0.9 - jupyterlab_pygments==0.2.2 +- jupyterlab_server==2.23.0 - jupyterlab_widgets - jupytext==1.14.0 - matplotlib==3.5.3 @@ -85,7 +86,6 @@ dependencies: - pip: - -r infra-requirements.txt - jupyter-desktop-server - - jupyterlab_server==2.23.0 # For push authentication to GitHub - gh-scoped-creds==4.1 # Upgrade separate from what everyone else uses for now From 4db97405453acfc8762c3f52e924287af7ed8fce Mon Sep 17 00:00:00 2001 From: shane knapp Date: Tue, 13 Jun 2023 08:51:22 -0700 Subject: [PATCH 14/27] node-placeholder config --- node-placeholder/values.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/node-placeholder/values.yaml b/node-placeholder/values.yaml index 7515bbe40..3f96d23e0 100644 --- a/node-placeholder/values.yaml +++ b/node-placeholder/values.yaml @@ -103,6 +103,14 @@ nodePools: # Some value slightly lower than allocatable RAM on the nodepool memory: 207314055168 replicas: 1 + data100-jl4: + nodeSelector: + hub.jupyter.org/pool-name: data100-pool + resources: + requests: + # Some value slightly lower than allocatable RAM on the nodepool + memory: 207314055168 + replicas: 1 # data101: # nodeSelector: # hub.jupyter.org/pool-name: data101-pool From 295df67ff8ef98c68c4a26ad643862143eec04e4 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Tue, 13 Jun 2023 08:59:10 -0700 Subject: [PATCH 15/27] bump jsonschema and altair --- deployments/data100-jl4/image/environment.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deployments/data100-jl4/image/environment.yml b/deployments/data100-jl4/image/environment.yml index ac89fdab3..0f77220c4 100644 --- a/deployments/data100-jl4/image/environment.yml +++ b/deployments/data100-jl4/image/environment.yml @@ -7,7 +7,7 @@ dependencies: - python==3.9 - syncthing==1.20.4 - git -- altair==4.2.0 +- altair==5.0.1 - beautifulsoup4==4.11.1 - black==22.6.0 - bokeh==2.4.3 @@ -29,7 +29,7 @@ dependencies: - ipydatagrid==1.1.12 - ipympl==0.9.2 - ipyparallel==8.4.1 -- jsonschema==4.17 +- jsonschema==4.17.3 - jupyter-book==0.15.1 - jupyter-repo2docker==2022.2.0 - jupyter-resource-usage==0.6.1 From d3ed9e2d45c4b09c379046becfb2fd8288594e6a Mon Sep 17 00:00:00 2001 From: shane knapp Date: Tue, 13 Jun 2023 09:07:47 -0700 Subject: [PATCH 16/27] adding jupyter_server --- deployments/data100-jl4/image/environment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/deployments/data100-jl4/image/environment.yml b/deployments/data100-jl4/image/environment.yml index 0f77220c4..b5fa236ce 100644 --- a/deployments/data100-jl4/image/environment.yml +++ b/deployments/data100-jl4/image/environment.yml @@ -44,6 +44,7 @@ dependencies: - jupyterlab_server==2.23.0 - jupyterlab_widgets - jupytext==1.14.0 +- jupyter_server==2.6.0 - matplotlib==3.5.3 - matplotlib-inline==0.1.6 - mock==4.0.3 From 389890b73ce749f0047c5c9a9340c33471b338d0 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Tue, 13 Jun 2023 09:17:30 -0700 Subject: [PATCH 17/27] comment out jupyter-resource-usage --- deployments/data100-jl4/image/environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployments/data100-jl4/image/environment.yml b/deployments/data100-jl4/image/environment.yml index b5fa236ce..bdf20ef83 100644 --- a/deployments/data100-jl4/image/environment.yml +++ b/deployments/data100-jl4/image/environment.yml @@ -32,7 +32,7 @@ dependencies: - jsonschema==4.17.3 - jupyter-book==0.15.1 - jupyter-repo2docker==2022.2.0 -- jupyter-resource-usage==0.6.1 + # - jupyter-resource-usage==0.6.1 - jupyter_bokeh - jupyterlab==4.0.2 - jupyterlab-favorites==3.0.0 From 568e5700b1e42bd6930675747f9ae2ff51ad7e34 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Tue, 13 Jun 2023 09:45:23 -0700 Subject: [PATCH 18/27] add tornado, comment out some infra-reqs.txt --- deployments/data100/image/environment.yml | 1 + deployments/data100/image/infra-requirements.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/deployments/data100/image/environment.yml b/deployments/data100/image/environment.yml index e6681300f..acd0af2d7 100644 --- a/deployments/data100/image/environment.yml +++ b/deployments/data100/image/environment.yml @@ -74,6 +74,7 @@ dependencies: - sqlparse==0.4.3 - statsmodels==0.13.2 - sympy==1.10.1 +- tornado==6.2.0 - tqdm==4.64.0 - xarray==2022.6.0 - xlrd==2.0.1 diff --git a/deployments/data100/image/infra-requirements.txt b/deployments/data100/image/infra-requirements.txt index 4a6e199be..4aed6a731 100644 --- a/deployments/data100/image/infra-requirements.txt +++ b/deployments/data100/image/infra-requirements.txt @@ -9,7 +9,7 @@ # FIXME: Freeze this to get exact versions of all dependencies notebook==6.4.12 -jupyterlab==3.4.5 +# jupyterlab==3.4.5 retrolab==0.3.21 nbgitpuller==1.1.0 jupyter-resource-usage==0.6.1 From e3377fa197638e280a497ab2dfd0eb73fe4e2611 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Tue, 13 Jun 2023 09:48:23 -0700 Subject: [PATCH 19/27] derp dont change data100 --- deployments/data100-jl4/image/environment.yml | 1 + deployments/data100-jl4/image/infra-requirements.txt | 4 ++-- deployments/data100/image/environment.yml | 1 - deployments/data100/image/infra-requirements.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deployments/data100-jl4/image/environment.yml b/deployments/data100-jl4/image/environment.yml index bdf20ef83..76069a905 100644 --- a/deployments/data100-jl4/image/environment.yml +++ b/deployments/data100-jl4/image/environment.yml @@ -76,6 +76,7 @@ dependencies: - sqlparse==0.4.3 - statsmodels==0.13.2 - sympy==1.10.1 +- tornado==6.2.0 - tqdm==4.64.0 - xarray==2022.6.0 - xlrd==2.0.1 diff --git a/deployments/data100-jl4/image/infra-requirements.txt b/deployments/data100-jl4/image/infra-requirements.txt index 4a6e199be..8625a2298 100644 --- a/deployments/data100-jl4/image/infra-requirements.txt +++ b/deployments/data100-jl4/image/infra-requirements.txt @@ -9,10 +9,10 @@ # FIXME: Freeze this to get exact versions of all dependencies notebook==6.4.12 -jupyterlab==3.4.5 +# jupyterlab==3.4.5 retrolab==0.3.21 nbgitpuller==1.1.0 -jupyter-resource-usage==0.6.1 +# jupyter-resource-usage==0.6.1 # Matches version in images/hub/Dockerfile jupyterhub==4.0.0b2 appmode==0.8.0 diff --git a/deployments/data100/image/environment.yml b/deployments/data100/image/environment.yml index acd0af2d7..e6681300f 100644 --- a/deployments/data100/image/environment.yml +++ b/deployments/data100/image/environment.yml @@ -74,7 +74,6 @@ dependencies: - sqlparse==0.4.3 - statsmodels==0.13.2 - sympy==1.10.1 -- tornado==6.2.0 - tqdm==4.64.0 - xarray==2022.6.0 - xlrd==2.0.1 diff --git a/deployments/data100/image/infra-requirements.txt b/deployments/data100/image/infra-requirements.txt index 4aed6a731..4a6e199be 100644 --- a/deployments/data100/image/infra-requirements.txt +++ b/deployments/data100/image/infra-requirements.txt @@ -9,7 +9,7 @@ # FIXME: Freeze this to get exact versions of all dependencies notebook==6.4.12 -# jupyterlab==3.4.5 +jupyterlab==3.4.5 retrolab==0.3.21 nbgitpuller==1.1.0 jupyter-resource-usage==0.6.1 From 9b7ee3dfe1c90e4c0b3fb709d3092a9f7d2551c1 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Tue, 13 Jun 2023 09:58:14 -0700 Subject: [PATCH 20/27] comment out jupyterlab-git, add distributed --- deployments/data100-jl4/image/environment.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/deployments/data100-jl4/image/environment.yml b/deployments/data100-jl4/image/environment.yml index 76069a905..83785ef69 100644 --- a/deployments/data100-jl4/image/environment.yml +++ b/deployments/data100-jl4/image/environment.yml @@ -17,6 +17,7 @@ dependencies: - cython==0.29.32 - dask==2022.8.1 - dask-labextension==6.1.0 +- distributed==2022.8.1 - fortran-magic==0.7 - h5netcdf==1.0.2 - h5py==3.7.0 @@ -37,7 +38,7 @@ dependencies: - jupyterlab==4.0.2 - jupyterlab-favorites==3.0.0 - jupyterlab-geojson==3.2.0 -- jupyterlab-git==0.39.0 + # - jupyterlab-git==0.39.0 # - jupyterlab-link-share==0.3.0 - jupyterlab-variableinspector==3.0.9 - jupyterlab_pygments==0.2.2 From af6560a6bd5f05a139f2cb35237ec322c54e5d65 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Tue, 13 Jun 2023 10:03:10 -0700 Subject: [PATCH 21/27] commenting out ipywidgets https://github.com/jupyter-widgets/ipywidgets/issues/3781 --- deployments/data100-jl4/image/infra-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployments/data100-jl4/image/infra-requirements.txt b/deployments/data100-jl4/image/infra-requirements.txt index 8625a2298..1a4e7ca17 100644 --- a/deployments/data100-jl4/image/infra-requirements.txt +++ b/deployments/data100-jl4/image/infra-requirements.txt @@ -16,7 +16,7 @@ nbgitpuller==1.1.0 # Matches version in images/hub/Dockerfile jupyterhub==4.0.0b2 appmode==0.8.0 -ipywidgets==7.7.2 +#ipywidgets==7.7.2 jupyter-tree-download==1.0.1 git-credential-helpers==0.2 # Enough people like this, let's load it in. From 6b4cc41ff251410eba57f8e915302e07d89ad1a0 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Tue, 13 Jun 2023 10:05:38 -0700 Subject: [PATCH 22/27] bump distributed --- deployments/data100-jl4/image/environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployments/data100-jl4/image/environment.yml b/deployments/data100-jl4/image/environment.yml index 83785ef69..bb817c4a7 100644 --- a/deployments/data100-jl4/image/environment.yml +++ b/deployments/data100-jl4/image/environment.yml @@ -17,7 +17,7 @@ dependencies: - cython==0.29.32 - dask==2022.8.1 - dask-labextension==6.1.0 -- distributed==2022.8.1 +- distributed==2023.6.0 - fortran-magic==0.7 - h5netcdf==1.0.2 - h5py==3.7.0 From efb8a4ae8be4c49a54f7cd84a53ae158c7b76790 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Tue, 13 Jun 2023 10:13:34 -0700 Subject: [PATCH 23/27] bump dask --- deployments/data100-jl4/image/environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployments/data100-jl4/image/environment.yml b/deployments/data100-jl4/image/environment.yml index bb817c4a7..b9ce61452 100644 --- a/deployments/data100-jl4/image/environment.yml +++ b/deployments/data100-jl4/image/environment.yml @@ -15,7 +15,7 @@ dependencies: - cartopy==0.21.0 - coverage==6.4.4 - cython==0.29.32 -- dask==2022.8.1 +- dask==2023.6.0 - dask-labextension==6.1.0 - distributed==2023.6.0 - fortran-magic==0.7 From 6f661d9ac4fc967adee06ad8af5712f29331afa7 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Tue, 13 Jun 2023 10:37:20 -0700 Subject: [PATCH 24/27] s/jupyter_server/jupyter-server and comment out retrolab --- deployments/data100-jl4/image/environment.yml | 4 ++-- deployments/data100-jl4/image/infra-requirements.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deployments/data100-jl4/image/environment.yml b/deployments/data100-jl4/image/environment.yml index b9ce61452..db4e81c9e 100644 --- a/deployments/data100-jl4/image/environment.yml +++ b/deployments/data100-jl4/image/environment.yml @@ -43,9 +43,9 @@ dependencies: - jupyterlab-variableinspector==3.0.9 - jupyterlab_pygments==0.2.2 - jupyterlab_server==2.23.0 -- jupyterlab_widgets +- jupyterlab_widgets==3.0.7 - jupytext==1.14.0 -- jupyter_server==2.6.0 +- jupyter-server==2.6.0 - matplotlib==3.5.3 - matplotlib-inline==0.1.6 - mock==4.0.3 diff --git a/deployments/data100-jl4/image/infra-requirements.txt b/deployments/data100-jl4/image/infra-requirements.txt index 1a4e7ca17..8423b9a50 100644 --- a/deployments/data100-jl4/image/infra-requirements.txt +++ b/deployments/data100-jl4/image/infra-requirements.txt @@ -10,7 +10,7 @@ # FIXME: Freeze this to get exact versions of all dependencies notebook==6.4.12 # jupyterlab==3.4.5 -retrolab==0.3.21 +# retrolab==0.3.21 nbgitpuller==1.1.0 # jupyter-resource-usage==0.6.1 # Matches version in images/hub/Dockerfile From 0b00f5f3dfba47f8f0dadc4ab83da8ae80f375ef Mon Sep 17 00:00:00 2001 From: shane knapp Date: Tue, 13 Jun 2023 10:44:58 -0700 Subject: [PATCH 25/27] s/jupyter-server/jupyter_server --- deployments/data100-jl4/image/environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployments/data100-jl4/image/environment.yml b/deployments/data100-jl4/image/environment.yml index db4e81c9e..5a0129e6b 100644 --- a/deployments/data100-jl4/image/environment.yml +++ b/deployments/data100-jl4/image/environment.yml @@ -45,7 +45,7 @@ dependencies: - jupyterlab_server==2.23.0 - jupyterlab_widgets==3.0.7 - jupytext==1.14.0 -- jupyter-server==2.6.0 +- jupyter_server==2.6.0 - matplotlib==3.5.3 - matplotlib-inline==0.1.6 - mock==4.0.3 From 69fe4a7ee1333ffd34321745670b752762ce7ee5 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Wed, 14 Jun 2023 13:32:34 -0700 Subject: [PATCH 26/27] forgot about the gcr/gke keys --- deployments/data100-jl4/secrets/gcr-key.json | 30 ++++++++++++++++++++ deployments/data100-jl4/secrets/gke-key.json | 30 ++++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 deployments/data100-jl4/secrets/gcr-key.json create mode 100644 deployments/data100-jl4/secrets/gke-key.json diff --git a/deployments/data100-jl4/secrets/gcr-key.json b/deployments/data100-jl4/secrets/gcr-key.json new file mode 100644 index 000000000..58cb074eb --- /dev/null +++ b/deployments/data100-jl4/secrets/gcr-key.json @@ -0,0 +1,30 @@ +{ + "type": "ENC[AES256_GCM,data:0I7dYFUSBF5oONBtUxkc,iv:Ws7MGUhHoDOGESUyEi+HdPY1CbBDB98FufA8d+cOw18=,tag:bkfWgySRKcIXnIzB5/9AJQ==,type:str]", + "project_id": "ENC[AES256_GCM,data:TwqH+3sdXcs3zOOSoCgkaA==,iv:vDjOAoumM6tnMNcVkzlqPk7ujGEwOI/Db0kVaO5AAqk=,tag:OT7c60NkyS1aw0L1HvYd/g==,type:str]", + "private_key_id": "ENC[AES256_GCM,data:EpePb4USzZBigubVyyo+sjdNcGXAeyXgmJS33MZtDqXs8VfBCvL16w==,iv:NLyJFb62z/Yj+4X0IUTN8WxTgdpxtc5udlJ89WH6c6I=,tag:y9bHxvqYyaJsxMLaHhkvsA==,type:str]", + "private_key": "ENC[AES256_GCM,data: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,iv:9qLRN/v7Q2Twl/5SaOOCN3ACOs8ZyLnZx+Qkbg6X2Ig=,tag:cNLrRzp6ZWnU9WgWc0kdqQ==,type:str]", + "client_email": "ENC[AES256_GCM,data:r1/9+NDcLQ5oh4MAaF0h2gPfUJJLoMZ6SIJnBgnpa/nCCoAjOn3BlMlVb+odkhGnW1W4qIDnRFuepw==,iv:ALhr5g8VLEOV3PPw8E7rbV/INU2qte0VEJVbtVF8kWk=,tag:l8a4Al6+9k7HiO9fnclcGA==,type:str]", + "client_id": "ENC[AES256_GCM,data:lKB1S3DiB430noJTuWEFsxzhqeu6,iv:f9wPi87mJekuNaO4kBOsMEe7aK0qaVUTRRht7skZQd4=,tag:DgXci6MDlY7Y7v/p6pOAzA==,type:str]", + "auth_uri": "ENC[AES256_GCM,data:sw+45WN8mou/cSjmcbdweGel3odEV7tTw3pNSywaw0MSWSJ0H9qZIhM=,iv:tmCzryizCEmwQ/vnVhF2xecwXtjkj9j74qYX2OXfY8E=,tag:X2JuV9/6Ir4LyE8E7uUqLQ==,type:str]", + "token_uri": "ENC[AES256_GCM,data:u8bETqFMsmGIhG74OvFh1guEawWasf/TPi9W6q5mr5xdR0U=,iv:SvY5NGGU2pstrT3bgk7tLy72VIZWIcrtb6n4fQJmaJI=,tag:q/+ZftThljF/NQkx4yyWng==,type:str]", + "auth_provider_x509_cert_url": "ENC[AES256_GCM,data:0Wyr5hZPP8EFxj09do28+hTNpRQ2W7kgCd8RKwgdgj+HjyngwFNMlX8t,iv:dtagZNXNeN4gAO0EQSCPe4aJ2jo64uVgy7KNpm0O554=,tag:BTKYg7hnSmxCVBcYUQOGkA==,type:str]", + "client_x509_cert_url": "ENC[AES256_GCM,data:nBL+9RFEq7Yak5F/rfMTLVmrTlwRqJcmU7XuTby+CTWYxLrvj45cJ4zGjrFJVprR4SX/atfJvd+oz3INJtj+R2xuFqeAEwOA83cQ8hc2QQTp/dZnIfx/mfhLYcee2pYSdw9UvUeVMwZnrMNU2Ds=,iv:4hrK/i4PMwffA0fPkhO1IhOMgEuXo1BGUVHuK0gFjMA=,tag:LxT+OWq5eV72w5YjoSvgJQ==,type:str]", + "sops": { + "kms": null, + "gcp_kms": [ + { + "resource_id": "projects/ucb-datahub-2018/locations/global/keyRings/datahub/cryptoKeys/sops", + "created_at": "2021-04-09T20:37:52Z", + "enc": "CiQA67O9AMN7YazFkiINr1H6EseNuc5e1Uaev/rqdGmyNJN0U4QSSADmhpq83a6J0ki/Id/e8MhBAAKdaADW6SFNX8J8wlVaXX2s7u3P8wMYloROZUpRG+mrpXAVsLAEWRFKV9ITu+TVluTg3Ig1HQ==" + } + ], + "azure_kv": null, + "hc_vault": null, + "age": null, + "lastmodified": "2023-04-11T23:08:35Z", + "mac": "ENC[AES256_GCM,data:HBzGqxepGtknCNT5i0rKkTBJcp1H9mkc4z4D2IvYEtKPmBnc6XkY18wEqa15CSMW9gulsO+I/ejbViiwwJJ1BQoarkE/bB6wrjWbt6y5lwB1V81ICRghw3XuWa6pKiyTq5ZpVxDR7szDYLSgAx94tRjinAKRD+JQvUKXtknTlhM=,iv:5eNNj9yb8q2KFBi4YYIfROz5HbeFvSU18D5S+UMBaUw=,tag:qEI545hV9k5V0l8thb5l9w==,type:str]", + "pgp": null, + "unencrypted_suffix": "_unencrypted", + "version": "3.7.3" + } +} \ No newline at end of file diff --git a/deployments/data100-jl4/secrets/gke-key.json b/deployments/data100-jl4/secrets/gke-key.json new file mode 100644 index 000000000..b93212fa3 --- /dev/null +++ b/deployments/data100-jl4/secrets/gke-key.json @@ -0,0 +1,30 @@ +{ + "type": "ENC[AES256_GCM,data:pviDYpoudn2mPXuSTCau,iv:5gsuBqez83Rd1A/wbbkKd5e3qbMzEmD7pL7jXW0cPqU=,tag:0mwsPS5wQptG/DaSQgm8HQ==,type:str]", + "project_id": "ENC[AES256_GCM,data:mR7xINYn/ly6dkpKJTZycg==,iv:Nxu2uscmC80IVfcAdDh9COmtAGDdtCHQ5uAORvjdGKM=,tag:ZejnMpC4ilLXA4D3tnxxwg==,type:str]", + "private_key_id": "ENC[AES256_GCM,data:6bJxLE0n0QM1HLX+ennIeHf9H6SYylodt5+zsgH07fjc30RSpBRUKA==,iv:YUFoEj2fQ4pNHt7TVVosBi9k9w6aXIKsQU6DSFG8brc=,tag:RK6k0YlB991yxtf+95E0Vw==,type:str]", + "private_key": "ENC[AES256_GCM,data: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,iv:rbE1gehD5XO8z8OZ2pzZgGKXb//IP9VkeqLWVYazENw=,tag:0g/VRRFexQDWSkKBoD+b9Q==,type:str]", + "client_email": "ENC[AES256_GCM,data:F7CrAz9fxWpAfIgxzUtHuw4eWMh08MpcKpoLVW6WygRQEbqO6WQIxBzyrU1goMhA,iv:9FXvjHt2hy6spkWfyOQr1m67cWd6vChV+8vg5Frd7XI=,tag:MjptTtfiWHKoiVhB3dC9dA==,type:str]", + "client_id": "ENC[AES256_GCM,data:NFrWfX2TNO9AKzPOYHyM1AIX50eo,iv:lLV/e9tj/ba0KvxOMAYLWv3RyYU9n97ku2GHCCkgED8=,tag:H7k/cQqLJBNOaXnPCv4JfA==,type:str]", + "auth_uri": "ENC[AES256_GCM,data:K85ELixk7QPpuqhjNTG4QIYUbz5yyKy3qXfarTxO650S77SJWXHsYR8=,iv:vt2GJ7cwKJyY/7XDiCZdX51ZBY3nb7g9miHmmfabriY=,tag:HB8xc5oeEc1JCnqIa1eZYg==,type:str]", + "token_uri": "ENC[AES256_GCM,data:kaKX9Zx/DU0rqFWeyoVEpghkCjqOmTjifSgg0NU4ESdI5Ss=,iv:Rp5NJKCRDdxbw8xmp0gcy+CnilVE6YeookI3criH/mE=,tag:729lX9HQpeyUdg4C1AQAPw==,type:str]", + "auth_provider_x509_cert_url": "ENC[AES256_GCM,data:2tTSvbO8RUjv1cUwIg3/JTZcHIVKt+Ki4tyPRxvMwj46YeRkeE+ZC0/p,iv:9ci+AYYmjPq7hfIFPuilgUtxks/9ypIgU4+PXvwfSzM=,tag:AsGU//l4WbQX85/NV1L5dA==,type:str]", + "client_x509_cert_url": "ENC[AES256_GCM,data:uAvNlbSLjImhE93+Z6NuIRdfVVGbmvwf9cFD5N7y9Ln79W7Oa6Mi3lUgyzbmuk5T3j9W+u2SONcKMRiyekyXXsBEOWlJP5OHYb3x0jfO0dIy4+eWXxkkkfFgz6CNX7Z6xZJ+kg==,iv:PUC1h4esq7Bf6594yhV/CMHxFlbXbh48Y2RIJOVwUaQ=,tag:YBJjzkvNe9I4xUGZEYCQ5w==,type:str]", + "sops": { + "kms": null, + "gcp_kms": [ + { + "resource_id": "projects/ucb-datahub-2018/locations/global/keyRings/datahub/cryptoKeys/sops", + "created_at": "2021-04-09T20:37:56Z", + "enc": "CiQA67O9AJiRNfloqVj5a7vZOpd6u0guaOQw8jj6EQhNSo6WNY0SSQDmhpq8262T34fGwV/BFo5FV/8s5kyPq3+1UG4orX22ASsKhzXJiOUxc5BqF8oVkMXgkjsR5saTuBI1tqpVbwfin8vspFa2JDo=" + } + ], + "azure_kv": null, + "hc_vault": null, + "age": null, + "lastmodified": "2021-04-09T20:37:57Z", + "mac": "ENC[AES256_GCM,data:RCfor+HF2+DT4GWZ3dooDb9hhR7FWMmYJ9e6SRdXQcG25eIU9Jo5H+OdvRJVj4d5slljcjeIGadgODgvdfLD+rqq2RGTqp/cZJ1qlpdIec2y+6AHt0mqM7lHLw/qLs/5Cx/MMmSGk4BrIvGlK22ciixP660JV34mdSJuG/4As3Q=,iv:nl6FLf43mKK6MSQKEkHxeHoTuqwYEm0ZNwFNj0b+pCA=,tag:ZJQvL+MAuM11C1oTS2hLpw==,type:str]", + "pgp": null, + "unencrypted_suffix": "_unencrypted", + "version": "3.7.0" + } +} \ No newline at end of file From 9293fe0fc8faa978c98422bca7a54e896aa290a1 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Wed, 14 Jun 2023 13:59:39 -0700 Subject: [PATCH 27/27] update secrets --- deployments/data100-jl4/secrets/prod.yaml | 6 +++--- deployments/data100-jl4/secrets/staging.yaml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/deployments/data100-jl4/secrets/prod.yaml b/deployments/data100-jl4/secrets/prod.yaml index c31214500..41cf49829 100644 --- a/deployments/data100-jl4/secrets/prod.yaml +++ b/deployments/data100-jl4/secrets/prod.yaml @@ -4,7 +4,7 @@ jupyterhub: CanvasOAuthenticator: client_id: ENC[AES256_GCM,data:/VedfPLyL+Rj3gciMxQ5H84=,iv:WZsC/06SEfEEeH4/NY+txGypgP/lShrJLc8DVXS7tco=,tag:kdZCzktRscuCYz4nRlkxTA==,type:str] client_secret: ENC[AES256_GCM,data:EqzXDvAIMyGeTnGjUDOg6X6XqSwDmogtz/HXhc2LNYMhoSgg8PSUqvEFNUNG6w59tkRXPerBR6PyOuG31ftYXQ==,iv:D/rf3aWams6O2NcmdjFYxEVV5dQoWv3ubZ1kTN5KMO8=,tag:/LLaEHP/RB17Td0UW1I2bQ==,type:str] - oauth_callback_url: ENC[AES256_GCM,data:YuKnhYJtOzbQvLzxkz7Shf8zGrnnUuN78GdWJXHNSBy4/4rHzDwdPv0HunqBTUfe7VpM8S3t/5zUM8pGqa+sj8GCH1qhgQYVkA==,iv:zetZc6+0+/HPjYtUrUM7577AVGz/K5/cFZvCVt0Tuwo=,tag:Djx/8MM/GsVMmSXrqCm2Ow==,type:str] + oauth_callback_url: ENC[AES256_GCM,data:wCp+RL7E3EBOp7+FN9Sz+dPoNmET3pk+PQHczLS2TVfNKhFWm3gOKBYtPssaJEoIBX5m3jpooSLL9qs=,iv:K27NXIRoPBEZ4ZH6vOmWV6Nq5w8riBRHuLdsAMBVlcU=,tag:pTNXAfM2to8gBy0jlF7o4g==,type:str] sops: kms: [] gcp_kms: @@ -14,8 +14,8 @@ sops: azure_kv: [] hc_vault: [] age: [] - lastmodified: "2022-12-21T03:33:03Z" - mac: ENC[AES256_GCM,data:Ms5m4bCGLVMsDiXc/puK0kSpSDLmZ1vk8vTXI04YjoxEGRyK5cuaJr9LVyIo0GTLfpalP/LViJRypYOtnJ+KpIZcVEHfIzobrHQumGfke6KJeXxiFoBAj1FOpzIy9l7vkZLYqAreo3uPWqzohod4XCcp/BgkaWuaKjAA8r9hkKw=,iv:q13jk2ebjzcNBsyhAzPo7wH4Qm/wMg9Xxdbmp3209/M=,tag:epWXlKmP5bK2+9KuxBqeFQ==,type:str] + lastmodified: "2023-06-14T20:58:55Z" + mac: ENC[AES256_GCM,data:hP8W1Bn6HzvBuJX+x7e8TK4xHc0rjldGfcWZcgxceOzAX1gn4Nhgw3Vp8zWybIOx08CcN1v9WU+gvEFJep/OylK1AT+ZKQMJ+XE5DAeNrFRqHNUaVP16xquaFUcTK02hKHTRnHinqEoS5EPpr2E8tuFSkHyyqW+GM10Sa/+XtOs=,iv:2Oy4FJXWTRuBfK8HoY1PH3kM2Jbj/kSqMFcjWGLi41Q=,tag:xAq80/Q313PhzF5kAY0wew==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.7.3 diff --git a/deployments/data100-jl4/secrets/staging.yaml b/deployments/data100-jl4/secrets/staging.yaml index 85406ec53..80d360b13 100644 --- a/deployments/data100-jl4/secrets/staging.yaml +++ b/deployments/data100-jl4/secrets/staging.yaml @@ -4,7 +4,7 @@ jupyterhub: CanvasOAuthenticator: client_id: ENC[AES256_GCM,data:G0+pIvyOsh+Zj4ZxddKbON4=,iv:iX8jMrXcJvjBi0GKRtuN886bXWFwBfCsaUoH+HRMn6U=,tag:BsyGAveKrd8TvWMuUlw3kw==,type:str] client_secret: ENC[AES256_GCM,data:6mR3zs4jvkVuVwjut56tuW3HIOHcYWRSIJJZiOeC+H82tqgZeuVEe7+/zMxq6J0ba5RMas9npep4svuL+TppcA==,iv:K6/MFusdxnLkrEA5LaXLO8mFm1Xa4U2OmxUBOLqdpJk=,tag:xweE4+/ZCIcXj9CtbFpUSw==,type:str] - oauth_callback_url: ENC[AES256_GCM,data:1c57kXqHdMDgnKcx2fMTyF1Bmmq+zs/5+XGzw3jMf11A1ftu4ovK5qeykF+SCUI1HZdIIDD//HNvr9fBfuGibPvsNHVUTe0c1RmvE0XqwD7F,iv:vEv7BTRjyh4muW+KEotKAQt0INSjZpGrjnDVVVt87hM=,tag:jres6/1KO/L96eGyWI/Ybw==,type:str] + oauth_callback_url: ENC[AES256_GCM,data:/+G1lc/TkS4jsvWGfetUFM+5ANODx73oToNSFk8jktaFP9a47QR58CoBe3AiqmRHeye4wTDG5cwJquohr52sHVCyew==,iv:HPSqiB0LvXQcwzDTtv5qAQOs2hO9VJKZdSzeJc+04pw=,tag:ZLi3wVKYZvOzgKBavFtquw==,type:str] sops: kms: [] gcp_kms: @@ -14,8 +14,8 @@ sops: azure_kv: [] hc_vault: [] age: [] - lastmodified: "2022-12-21T03:32:26Z" - mac: ENC[AES256_GCM,data:W24v2meL24A2uJMuv+Asu5OrNofxmD2yc4tkeIo1w7s66lnPyYLMHasWMyXPjx0zXYzwcdEy2jyMOrxbEi8ZcpMfXDzwr+0z5I9erl/WArVQaSHkU6+xE17/CQ65o7/+A+vtYivmvDauaZCVaMITwuHkZVIQ2p9NCTV/lhu/Ccw=,iv:3F1wnItIwfopBpUpaiVoUaCIPfVAb5Znhb9jlTf8dGE=,tag:tI3UxENOa3ZDshodyoe83A==,type:str] + lastmodified: "2023-06-14T20:59:15Z" + mac: ENC[AES256_GCM,data:vBjCsxykSFnAJuQtWtb+UKqTH61tE8kzchNBpBOCy4BX35OuBZXPTg0lW9Sk1fg22DU48RafH/GJ+/f58t8VFb9ePNOVJrzdFUQD9/VxrfX5KCiabG7kKB20MWrNH6d0sZRbGEZQhwM7bz+ODkYZQfh0KKWu9cIdwMmjmbLnwV0=,iv:oMk6evhN+iCDsEacXsfn5r9dbh4Lap//RgwWp8B0RbM=,tag:YXioDJqTJ06Zuo6QidMyFg==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.7.3