Make binderhub helm chart not depend on jupyterhub

.github/workflows/test.yml

@@ -1,6 +1,3 @@
-# This is a GitHub workflow defining a set of jobs with a set of steps.
-# ref: https://docs.github.com/en/actions/learn-github-actions/workflow-syntax-for-github-actions
-#
 name: Tests
 
 on:
@@ -27,17 +24,6 @@ on:
   workflow_dispatch:
 
 jobs:
-  lint:
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: install requirements
-        run: pip install ruamel.yaml
-
-      - name: check embedded chart code
-        run: ./ci/check_embedded_chart_code.py
-
   # Most of the "main", "auth" and "helm" jobs are the same and only differ
   # in small things. Unfortunately there is no easy way to share steps between
   # jobs or have "template" jobs, so we use `if` conditions on steps
@@ -170,7 +156,7 @@ jobs:
 
       - name: Setup Python package dependencies
         run: |
-          pip install --no-binary pycurl -r dev-requirements.txt -r helm-chart/images/binderhub/requirements.txt
+          pip install --no-binary pycurl -r dev-requirements.txt
           pip install -e .
 
       - name: Install Playwright browser

.pre-commit-config.yaml

@@ -31,22 +31,6 @@ repos:
       - id: isort
         # args are not passed, but see the config in pyproject.toml
 
-  # Generated code:
-  #   An entry in helm-chart/binderhub/values.yaml should be generated based on
-  #   binderhub/binderspawner_mixin.py. See ci/check_embedded_chart_code.py for
-  #   more details.
-  - repo: local
-    hooks:
-      - id: update-values-based-on-binderspawner-mixin
-        name: Update helm-chart/binderhub/values.yaml based on binderhub/binderspawner_mixin.py
-        language: python
-        additional_dependencies: ["ruamel.yaml"]
-        entry: python ci/check_embedded_chart_code.py
-        args:
-          - --update
-        files: binderhub/binderspawner_mixin.py|helm-chart/binderhub/values.yaml
-        pass_filenames: false
-
   # Autoformat: js, html, markdown, yaml, json
   - repo: https://github.com/pre-commit/mirrors-prettier
     rev: v4.0.0-alpha.8

binderhub/binderspawner_mixin.py

@@ -1,11 +1,6 @@
 """
 Helpers for creating BinderSpawners
 
-FIXME:
-This file is defined in binderhub/binderspawner_mixin.py
-and is copied to helm-chart/binderhub/values.yaml
-by ci/check_embedded_chart_code.py
-
 The BinderHub repo is just used as the distribution mechanism for this spawner,
 BinderHub itself doesn't require this code.
 

ci/refreeze

@@ -7,8 +7,8 @@ set -xeuo pipefail
 
 docker run --rm \
     --env=CUSTOM_COMPILE_COMMAND='Use the "Run workflow" button at https://github.com/jupyterhub/binderhub/actions/workflows/watch-dependencies.yaml' \
-    --volume="$PWD:/io" \
-    --workdir=/io \
+    --volume="$PWD:/src" \
+    --workdir=/src \
     --user=root \
     python:3.13-bookworm \
     sh -c 'pip install pip-tools==7.* && pip-compile --allow-unsafe --strip-extras --upgrade helm-chart/images/binderhub/requirements.in'

dev-config.yaml

@@ -0,0 +1,45 @@
+# NOTE: localhost:5000 will be replaced from the test job!
+#
+#       When running tests, we use a local container registry to test pushing
+#       images to that can be reached from the build pods. This local registry
+#       is run outside of k8s, so use of localhost won't work well. Due to that,
+#       all values with localhost:5000 below are set explicitly from the test
+#       job to an IP that is reachable instead.
+#
+config:
+  # DockerRegistry is a jupyterhub/binderhub class that is used to call
+  # get_image_manifest, which determines if an image needs to be built or is
+  # already available in a registry. It will not need credentials to the
+  # registry.
+  #
+  DockerRegistry:
+    url: http://localhost:5000
+  BinderHub:
+    # log_level isn't enabled to avoid overwhelming the reader with info
+    # log_level: DEBUG
+    use_registry: true
+    image_prefix: localhost:5000/binderhub/
+buildPodsRegistryCredentials:
+  server: http://localhost:5000
+  username: ""
+  password: ""
+
+service:
+  type: NodePort
+  nodePort: 30080
+
+dockerApi:
+  # The docker-api daemonset running the docker daemon needs to be configured in
+  # a way allowing it to work against insecure HTTP (not HTTPS) registries.
+  #
+  # ref: https://docs.docker.com/registry/insecure/
+  #
+  extraArgs:
+    - --config-file=/etc/docker-api/daemon.json
+  extraFiles:
+    daemon-json:
+      mountPath: /etc/docker-api/daemon.json
+      data:
+        # debug isn't enabled to avoid overwhelming the reader with info
+        # debug: true
+        insecure-registries: [localhost:5000]