Merge pull request #5956 from berkeley-dsep-infra/staging

merging 5920/5954/5955/5959 to prod
berkeley-dsep-infra · Aug 15, 2024 · c8f6341 · c8f6341
2 parents 19bae14 + 662551e
commit c8f6341
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 10 deletions.
diff --git 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:

diff --git 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

diff --git 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
@@ -8,7 +8,7 @@ etcGitConfig:
 nfsPVC:
   enabled: true
   nfs:
-    serverIP: 10.204.227.122
+    serverIP: 10.185.238.42
 
 jupyterhub:
   scheduling:

diff --git 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
@@ -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
@@ -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
@@ -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: