Skip to content

Commit

Permalink
Merge pull request #2658 from gesiscss/fix-deprecated
Browse files Browse the repository at this point in the history
Fix deprecated warning
  • Loading branch information
consideRatio authored Jun 13, 2023
2 parents 6dbdee6 + b1732f1 commit c1fb09d
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/watch-dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion docs/source/deployment/how.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).

Expand Down
2 changes: 1 addition & 1 deletion mybinder/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: "*"
Expand Down Expand Up @@ -189,6 +188,7 @@ binderhub:
})();
}
KubernetesBuildExecutor:
build_image: quay.io/jupyterhub/repo2docker:2022.10.0-169.g6250c06
memory_limit: "3G"
memory_request: "1G"

Expand Down
4 changes: 3 additions & 1 deletion scripts/list_new_commits.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"]["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...")

Expand Down
Binary file modified secrets/ban.py
Binary file not shown.

0 comments on commit c1fb09d

Please sign in to comment.