diff --git a/.github/workflows/test-chart.yaml b/.github/workflows/test-chart.yaml index 319e1d315c..9cb5b4ad8d 100644 --- a/.github/workflows/test-chart.yaml +++ b/.github/workflows/test-chart.yaml @@ -137,7 +137,7 @@ jobs: --set hub.image.name=quay.io/jupyterhub/k8s-hub-slim --set prePuller.hook.enabled=true --set prePuller.hook.pullOnlyOnChanges=true - - k3s-channel: v1.28 # also test hub.existingSecret + - k3s-channel: v1.29 # also test hub.existingSecret test: install local-chart-extra-args: >- --set hub.existingSecret=test-hub-existing-secret @@ -160,7 +160,7 @@ jobs: # information from # https://hub.jupyter.org/helm-chart/info.json # - - k3s-channel: v1.27 + - k3s-channel: v1.28 test: upgrade upgrade-from: stable upgrade-from-extra-args: >- @@ -173,7 +173,7 @@ jobs: --set hub.db.type=sqlite-pvc --set singleuser.storage.type=dynamic create-k8s-test-resources: true - - k3s-channel: v1.26 + - k3s-channel: v1.27 test: upgrade upgrade-from: dev upgrade-from-extra-args: >- @@ -183,7 +183,7 @@ jobs: local-chart-extra-args: >- --set hub.db.type=sqlite-pvc --set singleuser.storage.type=dynamic - - k3s-channel: v1.25 + - k3s-channel: v1.26 test: upgrade # We're testing hub.db.upgrade with PostgreSQL so this version must be old # enough to require a DB upgrade diff --git a/docs/source/changelog.md b/docs/source/changelog.md index 02cf5d9e97..17f050d8c1 100644 --- a/docs/source/changelog.md +++ b/docs/source/changelog.md @@ -13,6 +13,7 @@ changes in pull requests], this list should be updated. [breaking changes in pull requests]: https://github.com/jupyterhub/zero-to-jupyterhub-k8s/pulls?q=is%3Apr+is%3Aclosed+label%3Abreaking - Drop support for k8s 1.24, require k8s 1.25+ [#3319](https://github.com/jupyterhub/zero-to-jupyterhub-k8s/pull/3319) ([@consideRatio](https://github.com/consideRatio), [@manics](https://github.com/manics)) +- Drop support for k8s 1.25, require k8s 1.26+ [#3403](https://github.com/jupyterhub/zero-to-jupyterhub-k8s/pull/3403) ([@consideRatio](https://github.com/consideRatio), [@manics](https://github.com/manics)) - user-scheduler: update to use kube-scheduler 1.28, from 1.26 - require k8s 1.24+ [#3312](https://github.com/jupyterhub/zero-to-jupyterhub-k8s/pull/3312) ([@consideRatio](https://github.com/consideRatio), [@manics](https://github.com/manics)) ## 3.3 diff --git a/jupyterhub/Chart.yaml b/jupyterhub/Chart.yaml index 743fcb6d75..6ad48fc20f 100644 --- a/jupyterhub/Chart.yaml +++ b/jupyterhub/Chart.yaml @@ -8,7 +8,7 @@ keywords: [jupyter, jupyterhub, z2jh] home: https://z2jh.jupyter.org sources: [https://github.com/jupyterhub/zero-to-jupyterhub-k8s] icon: https://hub.jupyter.org/helm-chart/images/hublogo.svg -kubeVersion: ">=1.25.0-0" +kubeVersion: ">=1.26.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