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

merging 5436/5438 to prod

Author: shaneknapp

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.7126.h64800628
+version: 0.0.1-0.dev.git.7370.h98d3927c

hub/values.yaml

@@ -222,6 +222,14 @@ jupyterhub:
       tag: '0.0.1-0.dev.git.7126.h64800628'
     networkPolicy:
       enabled: true
+      # interNamespaceAccessLabels=accept makes the hub pod's associated
+      # NetworkPolicy accept ingress from pods in other namespaces that has a
+      # hub.jupyter.org/network-access-hub=true label.
+      #
+      # ref: https://z2jh.jupyter.org/en/stable/resources/reference.html#hub-networkpolicy-internamespaceaccesslabels
+      # ref: https://github.com/2i2c-org/infrastructure/pull/2648
+      #
+      interNamespaceAccessLabels: accept
       ingress:
         - from:
             - namespaceSelector:

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.7077.h95e09b06
+version: 0.0.1-0.dev.git.7305.h0a2e62d9
 
 # 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

support/values.yaml

@@ -95,7 +95,7 @@ prometheus:
       limits:
         cpu: 7
         memory: 48Gi
-    labels:
+    podLabels:
       # For HTTP access to the hub, to scrape metrics
       hub.jupyter.org/network-access-hub: 'true'
     persistentVolume: