Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Require helm v2.16.0 explicitly and minor CI updates #1911

Merged
merged 3 commits into from
Nov 14, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 12 additions & 15 deletions ci/publish
Original file line number Diff line number Diff line change
Expand Up @@ -11,26 +11,23 @@ set -eux
# the ~/.ssh folder with permissions to push to jupyterhub/helm-chart.
if [[ $GITHUB_REF != refs/tags/* ]]; then
# Using --long, we are ensured to get a build suffix, which ensures we don't
# build the same tag twice. Using --extra-message, we help automation like
# henchbot to submit update PRs to jupyterhub/mybinder.org-deploy.
# build the same tag twice.
#
# ref: https://github.com/jupyterhub/chartpress#usage
# ref: https://github.com/henchbot/mybinder.org-upgrades
# Using --extra-message, we help readers of merged PRs to know what version
# they need to bump to in order to make use of the PR. This is enabled by a
# GitHub notificaiton in the PR like "Github Action user pushed a commit to
# jupyterhub/helm-chart that referenced this pull request..."
#
# NOTE: By crafting a smart commit message for the publication commit to
# jupyterhub/helm-chart, we can make GitHub help us mention the
# publication commit in the PR or commit. This helps users realize
# what version they need to upgrade to etc in order to be able to
# benefit from the merged PR in a development release.
# ref: https://github.com/jupyterhub/chartpress#usage
#
# GitHub merge commits contain a PR reference like #123. `sed` looks
# NOTE: GitHub merge commits contain a PR reference like #123. `sed` looks
# to extract either a PR reference like #123 or fall back to create a
# commit hash reference like @123abcd. Combined with TRAVIS_REPO_SLUG
# we craft a commit message like jupyterhub/binderhub#123 or
# jupyterhub/binderhub@123abcd which will be understood as a reference
# by GitHub.
# commit hash reference like @123abcd. Combined with GITHUB_REPOSITORY
# we craft a commit message like jupyterhub/zero-to-jupyterhub-k8s#123
# or jupyterhub/zero-to-jupyterhub-k8s@123abcd which will be
# understood as a reference by GitHub.
PR_OR_HASH=$(git log -1 --pretty=%h-%B | head -n1 | sed 's/^.*\(#[0-9]*\).*/\1/' | sed 's/^\([0-9a-f]*\)-.*/@\1/')
EXTRA_MESSAGE="${GITHUB_REPOSITORY}${PR_OR_HASH}"
EXTRA_MESSAGE="${GITHUB_REPOSITORY}${PR_OR_HASH} ${LATEST_COMMIT_TITLE}"
chartpress --push --publish-chart --long --extra-message "${EXTRA_MESSAGE}"
else
# Setting a tag explicitly enforces a rebuild if this tag had already been
Expand Down
4 changes: 2 additions & 2 deletions jupyterhub/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ home: https://z2jh.jupyter.org
sources:
- https://github.com/jupyterhub/zero-to-jupyterhub-k8s
icon: https://jupyter.org/assets/hublogo.svg
kubeVersion: '>=1.11.0-0'
tillerVersion: '>=2.11.0-0'
kubeVersion: '>=1.14.0-0'
tillerVersion: '>=2.16.0-0'
maintainers:
# Since it is a requirement of Artifact Hub to have specific maintainers
# listed, we have added some below, but in practice the entire JupyterHub team
Expand Down
2 changes: 1 addition & 1 deletion tools/templates/lint-and-validate.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def lint(yamllint_config, values, kubernetes_versions, output_dir, debug):
print("### Linting started")
print("### 1/4 - helm lint: lint helm templates")
helm_lint_cmd = [
'helm', 'lint', '../../jupyterhub',
'helm', 'lint', '--strict', '../../jupyterhub',
'--values', values,
]
if debug:
Expand Down