From 684412dd092b3d13277268d8203e63686de48728 Mon Sep 17 00:00:00 2001 From: Ryan Lovett Date: Thu, 8 Aug 2024 13:34:06 -0700 Subject: [PATCH 1/4] Reinstall coreutils to get man pages. This ensures that man pages for basic tools exist. There were previously being excluded by dpkg. --- deployments/datahub/images/default/Dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/deployments/datahub/images/default/Dockerfile b/deployments/datahub/images/default/Dockerfile index 49062d34d..451815ffb 100644 --- a/deployments/datahub/images/default/Dockerfile +++ b/deployments/datahub/images/default/Dockerfile @@ -22,7 +22,11 @@ RUN apt-get -qq update --yes && \ RUN adduser --disabled-password --gecos "Default Jupyter user" ${NB_USER} # Do not exclude manpages from being installed. -RUN sed -i -e '/usr.share.man/s/^/#/' /etc/dpkg/dpkg.cfg.d/excludes +RUN sed -i '/usr.share.man/s/^/#/' /etc/dpkg/dpkg.cfg.d/excludes + +# Reinstall coreutils so that basic man pages are installed. Due to dpkg's +# exclusion, they were not originally installed. +RUN apt --reinstall install coreutils # Install all apt packages COPY apt.txt /tmp/apt.txt From 3572e0edb784ee27677bc9d8fbcb59ef1eb321cf Mon Sep 17 00:00:00 2001 From: Jonathan Felder Date: Wed, 14 Aug 2024 09:47:44 -0700 Subject: [PATCH 2/4] moving data102 to small-courses-filestore --- deployments/data102/config/common.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployments/data102/config/common.yaml b/deployments/data102/config/common.yaml index ef4e3626c..1b602bb81 100644 --- a/deployments/data102/config/common.yaml +++ b/deployments/data102/config/common.yaml @@ -1,7 +1,7 @@ nfsPVC: enabled: true nfs: - serverIP: 172.31.130.242 + serverIP: 10.185.238.42 jupyterhub: scheduling: From 2abbc5d21e2f1e16ad36e25cd0b628e3ae3aa930 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Wed, 14 Aug 2024 14:30:35 -0700 Subject: [PATCH 3/4] update chp to 4.6.2 --- hub/Chart.yaml | 2 +- hub/values.yaml | 4 ++-- node-placeholder/Chart.yaml | 2 +- node-placeholder/values.yaml | 5 +++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/hub/Chart.yaml b/hub/Chart.yaml index e613e06cb..6bc9df43d 100644 --- a/hub/Chart.yaml +++ b/hub/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: '1.0' description: Deployment Chart for JupyterHub name: hub -version: 0.0.1-0.dev.git.7608.ha33ba6ef +version: 20240731-224556 diff --git a/hub/values.yaml b/hub/values.yaml index 0efd1c28f..b127ebac0 100644 --- a/hub/values.yaml +++ b/hub/values.yaml @@ -40,7 +40,7 @@ jupyterhub: # https://github.com/consideRatio/configurable-http-proxy/commits/main/ # image: - tag: 4.6.1-fork + tag: 4.6.2 extraCommandLineFlags: # set the timeout and proxyTimeout to 24 hours (arg is in milliseconds) # https://github.com/http-party/node-http-proxy?tab=readme-ov-file#options @@ -241,7 +241,7 @@ jupyterhub: # Generated by chartpress image: name: gcr.io/ucb-datahub-2018/jupyterhub-hub - tag: '0.0.1-0.dev.git.7607.h4497642d' + tag: '20240731-224556' networkPolicy: enabled: true # interNamespaceAccessLabels=accept makes the hub pod's associated diff --git a/node-placeholder/Chart.yaml b/node-placeholder/Chart.yaml index 0f7bcc317..4db5f93e7 100644 --- a/node-placeholder/Chart.yaml +++ b/node-placeholder/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.0.1-0.dev.git.7608.ha33ba6ef +version: 20240731-224556 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/node-placeholder/values.yaml b/node-placeholder/values.yaml index f6760f10b..679e2901c 100644 --- a/node-placeholder/values.yaml +++ b/node-placeholder/values.yaml @@ -4,7 +4,7 @@ image: repository: us-central1-docker.pkg.dev/ucb-datahub-2018/core/node-placeholder-scaler pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. - tag: "0.0.1-0.dev.git.6946.hdccbf2f4" + tag: "20240731-224556" imagePullSecrets: [] nameOverride: "" @@ -48,7 +48,8 @@ priorityClass: tolerations: -calendarUrl: https://calendar.google.com/calendar/ical/c_s47m3m1nuj3s81187k3b2b5s5o%40group.calendar.google.com/public/basic.ics +calendarUrl: + https://calendar.google.com/calendar/ical/c_s47m3m1nuj3s81187k3b2b5s5o%40group.calendar.google.com/public/basic.ics grafana: tags: From 9ac1d78e2fdc77e0ed57b93e18831b7e8c596c96 Mon Sep 17 00:00:00 2001 From: Jonathan Felder Date: Thu, 15 Aug 2024 10:23:43 -0700 Subject: [PATCH 4/4] moving dlab and publichealth to small-course-filestore --- deployments/dlab/config/common.yaml | 2 +- deployments/publichealth/config/common.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deployments/dlab/config/common.yaml b/deployments/dlab/config/common.yaml index ae7b435d6..0ab293b78 100644 --- a/deployments/dlab/config/common.yaml +++ b/deployments/dlab/config/common.yaml @@ -1,7 +1,7 @@ nfsPVC: enabled: true nfs: - serverIP: 10.50.250.234 + serverIP: 10.185.238.42 jupyterhub: scheduling: diff --git a/deployments/publichealth/config/common.yaml b/deployments/publichealth/config/common.yaml index 44f92504f..884246423 100644 --- a/deployments/publichealth/config/common.yaml +++ b/deployments/publichealth/config/common.yaml @@ -8,7 +8,7 @@ etcGitConfig: nfsPVC: enabled: true nfs: - serverIP: 10.204.227.122 + serverIP: 10.185.238.42 jupyterhub: scheduling: