From d43bfb431a2958b099e97e57518d006f39bb5b82 Mon Sep 17 00:00:00 2001 From: Erik Sundell Date: Mon, 23 Sep 2024 08:14:05 +0200 Subject: [PATCH 1/3] Drop support for k8s 1.26 --- .github/workflows/test-chart.yaml | 8 ++++---- jupyterhub/Chart.yaml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test-chart.yaml b/.github/workflows/test-chart.yaml index 9cb5b4ad8d..be23d8e695 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.29 # also test hub.existingSecret + - k3s-channel: v1.30 # 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.28 + - k3s-channel: v1.29 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.27 + - k3s-channel: v1.28 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.26 + - k3s-channel: v1.27 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/jupyterhub/Chart.yaml b/jupyterhub/Chart.yaml index fdb7d11687..03dd85bf22 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.26.0-0" +kubeVersion: ">=1.27.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 From c6fa4d50a990a8eb8ad41069d9d7289d306cb32d Mon Sep 17 00:00:00 2001 From: Erik Sundell Date: Mon, 23 Sep 2024 08:20:53 +0200 Subject: [PATCH 2/3] Drop support for k8s 1.27 --- .github/workflows/test-chart.yaml | 8 ++++---- jupyterhub/Chart.yaml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test-chart.yaml b/.github/workflows/test-chart.yaml index be23d8e695..6885fe7be2 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.30 # also test hub.existingSecret + - k3s-channel: v1.31 # 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.29 + - k3s-channel: v1.30 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.28 + - k3s-channel: v1.29 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.27 + - k3s-channel: v1.28 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/jupyterhub/Chart.yaml b/jupyterhub/Chart.yaml index 03dd85bf22..c6b40c5900 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.27.0-0" +kubeVersion: ">=1.28.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 From 4868879f7db4afdd63bca04d4dfca372651fbad7 Mon Sep 17 00:00:00 2001 From: Erik Sundell Date: Mon, 23 Sep 2024 08:30:23 +0200 Subject: [PATCH 3/3] docs: update unreleased changelog entry --- docs/source/changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/changelog.md b/docs/source/changelog.md index 4285bd2a9b..e47c218d12 100644 --- a/docs/source/changelog.md +++ b/docs/source/changelog.md @@ -13,7 +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 - Update jupyterhub from 4.1.6 to 5.1.0 [#3405](https://github.com/jupyterhub/zero-to-jupyterhub-k8s/pull/3405), [#3416](https://github.com/jupyterhub/zero-to-jupyterhub-k8s/pull/3416), [#3425](https://github.com/jupyterhub/zero-to-jupyterhub-k8s/pull/3425), [#3472](https://github.com/jupyterhub/zero-to-jupyterhub-k8s/pull/3472) -- Drop support for k8s 1.23, require k8s 1.26+ [#3312](https://github.com/jupyterhub/zero-to-jupyterhub-k8s/pull/3312), [#3403](https://github.com/jupyterhub/zero-to-jupyterhub-k8s/pull/3403), [#3319](https://github.com/jupyterhub/zero-to-jupyterhub-k8s/pull/3319) +- Drop support for k8s 1.23-1.27, require k8s 1.28+ [#3312](https://github.com/jupyterhub/zero-to-jupyterhub-k8s/pull/3312), [#3403](https://github.com/jupyterhub/zero-to-jupyterhub-k8s/pull/3403), [#3319](https://github.com/jupyterhub/zero-to-jupyterhub-k8s/pull/3319), [#3508](https://github.com/jupyterhub/zero-to-jupyterhub-k8s/pull/3508) - user-scheduler: update to use kube-scheduler 1.28, from 1.26 [#3312](https://github.com/jupyterhub/zero-to-jupyterhub-k8s/pull/3312) ## 3.3