From c8e33ba9603fc634b7955a8f63a6687b1a4cffe7 Mon Sep 17 00:00:00 2001 From: Raniere Silva Date: Mon, 12 Jun 2023 11:13:31 +0200 Subject: [PATCH 1/3] Replace config.BinderHub.build_image with config.KubernetesBuildExecutor.build_image because config.BinderHub.build_image is deprecated, see https://binderhub.readthedocs.io/en/latest/reference/app.html#binderhub.app.BinderHub.build_image --- .github/workflows/watch-dependencies.yaml | 4 ++-- docs/source/deployment/how.md | 2 +- mybinder/values.yaml | 2 +- scripts/list_new_commits.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/watch-dependencies.yaml b/.github/workflows/watch-dependencies.yaml index 52ce471ed..93840dd9a 100644 --- a/.github/workflows/watch-dependencies.yaml +++ b/.github/workflows/watch-dependencies.yaml @@ -2,7 +2,7 @@ # ref: https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions # # - Watch the image tag referenced in mybinder/values.yaml under -# binderhub.config.BinderHub.build_image to match the latest image tag for +# binderhub.config.KubernetesBuildExecutor.build_image to match the latest image tag for # quay.io/jupyterhub/repo2docker. # # - Watch the chart versions referenced as dependencies in mybinder/Chart.yaml @@ -37,7 +37,7 @@ jobs: - name: repo2docker registry: quay.io repository: jupyterhub/repo2docker - values_path: binderhub.config.BinderHub.build_image + values_path: binderhub.config.KubernetesBuildExecutor.build_image changelog_url: https://repo2docker.readthedocs.io/en/latest/changelog.html source_url: https://github.com/jupyterhub/repo2docker diff --git a/docs/source/deployment/how.md b/docs/source/deployment/how.md index 1fe20aca1..ef7e18508 100644 --- a/docs/source/deployment/how.md +++ b/docs/source/deployment/how.md @@ -58,7 +58,7 @@ BinderHub to use the newly built image (which is identified by a tag) by editing 1. Merge changes to repo2docker. 2. Wait for the [Publish helm chart and docker images workflow on the main branch](https://github.com/jupyterhub/repo2docker/actions/workflows/release.yml?query=branch%3Amain) to complete successfully. 3. Lookup the latest Repo2docker tag on https://quay.io/repository/jupyterhub/repo2docker?tab=tags -4. In your fork of the mybinder.org-deploy repository, open `mybinder/values.yaml` and change the tag in `binderhub.config.BinderHub.build_image` to the latest tag. +4. In your fork of the mybinder.org-deploy repository, open `mybinder/values.yaml` and change the tag in `binderhub.config.KubernetesBuildExecutor.build_image` to the latest tag. 5. Open a pull request to merge this change into the main branch of the mybinder.org-deploy repository, following the steps in [Deploying a change](deploying-a-change). diff --git a/mybinder/values.yaml b/mybinder/values.yaml index 6c465bb2c..854ed8e68 100644 --- a/mybinder/values.yaml +++ b/mybinder/values.yaml @@ -139,7 +139,6 @@ binderhub: BinderHub: use_registry: true - build_image: quay.io/jupyterhub/repo2docker:2022.10.0-169.g6250c06 per_repo_quota: 100 per_repo_quota_higher: 200 cors_allow_origin: "*" @@ -189,6 +188,7 @@ binderhub: })(); } KubernetesBuildExecutor: + build_image: quay.io/jupyterhub/repo2docker:2022.10.0-169.g6250c06 memory_limit: "3G" memory_request: "1G" diff --git a/scripts/list_new_commits.py b/scripts/list_new_commits.py index fbf71ce46..cfac4f839 100644 --- a/scripts/list_new_commits.py +++ b/scripts/list_new_commits.py @@ -22,7 +22,7 @@ url_helm_chart = "https://raw.githubusercontent.com/jupyterhub/mybinder.org-deploy/HEAD/mybinder/values.yaml" helm_chart = requests.get(url_helm_chart) helm_chart = load(helm_chart.text) -r2d_live = helm_chart["binderhub"]["config"]["BinderHub"]["build_image"].split(":")[-1] +r2d_live = helm_chart["binderhub"]["config"]["KubernetesBuildExecutor"]["build_image"].split(":")[-1] print("Fetching latest commit SHA for BinderHub and repo2docker...") From dc2963095cc5dcdbb416ebe60581574ff00f62b6 Mon Sep 17 00:00:00 2001 From: Raniere Silva Date: Mon, 12 Jun 2023 14:04:58 +0200 Subject: [PATCH 2/3] Run black --- scripts/list_new_commits.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/list_new_commits.py b/scripts/list_new_commits.py index cfac4f839..c32bc435f 100644 --- a/scripts/list_new_commits.py +++ b/scripts/list_new_commits.py @@ -22,7 +22,9 @@ url_helm_chart = "https://raw.githubusercontent.com/jupyterhub/mybinder.org-deploy/HEAD/mybinder/values.yaml" helm_chart = requests.get(url_helm_chart) helm_chart = load(helm_chart.text) -r2d_live = helm_chart["binderhub"]["config"]["KubernetesBuildExecutor"]["build_image"].split(":")[-1] +r2d_live = helm_chart["binderhub"]["config"]["KubernetesBuildExecutor"][ + "build_image" +].split(":")[-1] print("Fetching latest commit SHA for BinderHub and repo2docker...") From b1732f1fc5c8a26559902ecb447206be29aec3ef Mon Sep 17 00:00:00 2001 From: Raniere Silva Date: Mon, 12 Jun 2023 14:05:18 +0200 Subject: [PATCH 3/3] Run black --- secrets/ban.py | Bin 5568 -> 5568 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/secrets/ban.py b/secrets/ban.py index e0a0ddce42a9ceaca0a85f8c12972b71279c62fa..008ea2398226f15ba86051aa7c5c1469f13187a3 100755 GIT binary patch literal 5568 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 OntXrd4W5f(H2oRW_tg&o literal 5568 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