From 368190ad12b17f87ee64f9f0eb7d3894b99a22a0 Mon Sep 17 00:00:00 2001 From: Paco Xu Date: Tue, 17 May 2022 16:21:44 +0800 Subject: [PATCH 1/3] add v1.24 support --- .github/workflows/verify.yml | 85 ++++++++++++++++++++++++++++++++++++ README.md | 1 + releases.yml | 12 +++++ 3 files changed, 98 insertions(+) diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index 78c7e74205..efbd20073c 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -35,6 +35,34 @@ jobs: run: | make verify-patch-format + Test-v1-24-5-lts-0: + needs: Patch + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Cache + uses: actions/cache@v2 + env: + cache-name: src + with: + path: | + src + key: ${{ runner.os }}-build-${{ env.cache-name }}-v1-24-5-lts-0 + restore-keys: | + ${{ runner.os }}-build-${{ env.cache-name }} + - name: Install dependent + run: | + make dependent + - name: Checkout to v1.24.5-lts.0 + run: | + make v1.24.5-lts.0 + - name: Install etcd + run: | + make install-etcd + - name: Test + run: | + make test + Test-v1-23-8-lts-1: needs: Patch runs-on: ubuntu-latest @@ -63,6 +91,34 @@ jobs: run: | make test + Test-Cmd-v1-24-5-lts-0: + needs: Patch + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Cache + uses: actions/cache@v2 + env: + cache-name: src + with: + path: | + src + key: ${{ runner.os }}-build-${{ env.cache-name }}-v1-24-5-lts-0 + restore-keys: | + ${{ runner.os }}-build-${{ env.cache-name }} + - name: Install dependent + run: | + make dependent + - name: Checkout to v1.24.5-lts.0 + run: | + make v1.24.5-lts.0 + - name: Install etcd + run: | + make install-etcd + - name: Test cmd + run: | + make test-cmd + Test-Cmd-v1-23-8-lts-1: needs: Patch runs-on: ubuntu-latest @@ -91,6 +147,35 @@ jobs: run: | make test-cmd + Test-Integration-v1-24-5-lts-0: + needs: Patch + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Cache + uses: actions/cache@v2 + env: + cache-name: src + with: + path: | + src + /tmp/kubernetes-lts/ + key: ${{ runner.os }}-build-${{ env.cache-name }}-v1-24-5-lts-0 + restore-keys: | + ${{ runner.os }}-build-${{ env.cache-name }} + - name: Install dependent + run: | + make dependent + - name: Checkout to v1.24.5-lts.0 + run: | + make v1.24.5-lts.0 + - name: Install etcd + run: | + make install-etcd + - name: Test integration + run: | + make test-integration + Test-Integration-v1-23-8-lts-1: needs: Patch runs-on: ubuntu-latest diff --git a/README.md b/README.md index 8c3d57f7c6..21d890f5fd 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,7 @@ KLTS, known as Kubernetes Long Term Support, provides free maintenance support f Below lists the status of each release image and package and you can click any to learn the detailed logs. | |Images|Packages| |-|-|-| +|v1.24.5|[![v1.24.5-lts.0](https://img.shields.io/github/workflow/status/klts-io/kubernetes-lts/Releases%20Images/v1.24.5-lts.0?label=v1.24.5-lts.0%20Releases%20Images)](https://klts.io/docs/kubernetes/releases/v1.24/v1.24.5-lts.0/)|[![v1.24.5-lts.0](https://img.shields.io/github/workflow/status/klts-io/kubernetes-lts/Releases%20Packages/v1.24.5-lts.0?label=v1.24.5-lts.0%20Releases%20Packages)](https://klts.io/docs/kubernetes/releases/v1.24/v1.24.5-lts.0/)| |v1.23.8|[![v1.23.8-lts.1](https://img.shields.io/github/workflow/status/klts-io/kubernetes-lts/Releases%20Images/v1.23.8-lts.1?label=v1.23.8-lts.1%20Releases%20Images)](https://klts.io/docs/kubernetes/releases/v1.23/v1.23.8-lts.1/)|[![v1.23.8-lts.1](https://img.shields.io/github/workflow/status/klts-io/kubernetes-lts/Releases%20Packages/v1.23.8-lts.1?label=v1.23.8-lts.1%20Releases%20Packages)](https://klts.io/docs/kubernetes/releases/v1.23/v1.23.8-lts.1/)| |v1.22.11|[![v1.22.11-lts.1](https://img.shields.io/github/workflow/status/klts-io/kubernetes-lts/Releases%20Images/v1.22.11-lts.1?label=v1.22.11-lts.1%20Releases%20Images)](https://klts.io/docs/kubernetes/releases/v1.22/v1.22.11-lts.1/)|[![v1.22.11-lts.1](https://img.shields.io/github/workflow/status/klts-io/kubernetes-lts/Releases%20Packages/v1.22.11-lts.1?label=v1.22.11-lts.1%20Releases%20Packages)](https://klts.io/docs/kubernetes/releases/v1.22/v1.22.11-lts.1/)| |v1.21.14|[![v1.21.14-lts.1](https://img.shields.io/github/workflow/status/klts-io/kubernetes-lts/Releases%20Images/v1.21.14-lts.1?label=v1.21.14-lts.1%20Releases%20Images)](https://klts.io/docs/kubernetes/releases/v1.21/v1.21.14-lts.1/)|[![v1.21.14-lts.1](https://img.shields.io/github/workflow/status/klts-io/kubernetes-lts/Releases%20Packages/v1.21.14-lts.1?label=v1.21.14-lts.1%20Releases%20Packages)](https://klts.io/docs/kubernetes/releases/v1.21/v1.21.14-lts.1/)| diff --git a/releases.yml b/releases.yml index 6361cf68fa..6027f82f2e 100644 --- a/releases.yml +++ b/releases.yml @@ -2,6 +2,11 @@ base: https://github.com/kubernetes/kubernetes releases: + - name: v1.24.5-lts.0 + base_release: v1.24.5-ci + must: true + patches: [] + - name: v1.23.8-lts.1 base_release: v1.23.8-ci must: true @@ -164,6 +169,13 @@ releases: # TODO: Need to upgrade go version greater than 1.9 to remove this - k8s.io/kubernetes/pkg/kubectl/cmd + - name: v1.24.5-ci + base_release: v1.24.5 + patches: + - fix-run-docker.1.23 + - no-delete-images.1.23 + - fix-etcd-put-key.1.23 + - name: v1.23.8-ci base_release: v1.23.8 patches: From f62cd78d7de219605b860cccf71c7d8bdfa901ae Mon Sep 17 00:00:00 2001 From: Paco Xu Date: Thu, 15 Sep 2022 17:24:20 +0800 Subject: [PATCH 2/3] update v1.23.8 to v1.23.11 --- .github/workflows/verify.yml | 24 ++++++++++++------------ README.md | 2 +- releases.yml | 8 ++++---- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index efbd20073c..98b7b6a71e 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -63,7 +63,7 @@ jobs: run: | make test - Test-v1-23-8-lts-1: + Test-v1-23-11-lts-1: needs: Patch runs-on: ubuntu-latest steps: @@ -75,15 +75,15 @@ jobs: with: path: | src - key: ${{ runner.os }}-build-${{ env.cache-name }}-v1-23-8-lts-1 + key: ${{ runner.os }}-build-${{ env.cache-name }}-v1-23-11-lts-1 restore-keys: | ${{ runner.os }}-build-${{ env.cache-name }} - name: Install dependent run: | make dependent - - name: Checkout to v1.23.8-lts.1 + - name: Checkout to v1.23.11-lts.1 run: | - make v1.23.8-lts.1 + make v1.23.11-lts.1 - name: Install etcd run: | make install-etcd @@ -119,7 +119,7 @@ jobs: run: | make test-cmd - Test-Cmd-v1-23-8-lts-1: + Test-Cmd-v1-23-11-lts-1: needs: Patch runs-on: ubuntu-latest steps: @@ -131,15 +131,15 @@ jobs: with: path: | src - key: ${{ runner.os }}-build-${{ env.cache-name }}-v1-23-8-lts-1 + key: ${{ runner.os }}-build-${{ env.cache-name }}-v1-23-11-lts-1 restore-keys: | ${{ runner.os }}-build-${{ env.cache-name }} - name: Install dependent run: | make dependent - - name: Checkout to v1.23.8-lts.1 + - name: Checkout to v1.23.11-lts.1 run: | - make v1.23.8-lts.1 + make v1.23.11-lts.1 - name: Install etcd run: | make install-etcd @@ -176,7 +176,7 @@ jobs: run: | make test-integration - Test-Integration-v1-23-8-lts-1: + Test-Integration-v1-23-11-lts-1: needs: Patch runs-on: ubuntu-latest steps: @@ -189,15 +189,15 @@ jobs: path: | src /tmp/kubernetes-lts/ - key: ${{ runner.os }}-build-${{ env.cache-name }}-v1-23-8-lts-1 + key: ${{ runner.os }}-build-${{ env.cache-name }}-v1-23-11-lts-1 restore-keys: | ${{ runner.os }}-build-${{ env.cache-name }} - name: Install dependent run: | make dependent - - name: Checkout to v1.23.8-lts.1 + - name: Checkout to v1.23.11-lts.1 run: | - make v1.23.8-lts.1 + make v1.23.11-lts.1 - name: Install etcd run: | make install-etcd diff --git a/README.md b/README.md index 21d890f5fd..51ef4e26f4 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Below lists the status of each release image and package and you can click any t | |Images|Packages| |-|-|-| |v1.24.5|[![v1.24.5-lts.0](https://img.shields.io/github/workflow/status/klts-io/kubernetes-lts/Releases%20Images/v1.24.5-lts.0?label=v1.24.5-lts.0%20Releases%20Images)](https://klts.io/docs/kubernetes/releases/v1.24/v1.24.5-lts.0/)|[![v1.24.5-lts.0](https://img.shields.io/github/workflow/status/klts-io/kubernetes-lts/Releases%20Packages/v1.24.5-lts.0?label=v1.24.5-lts.0%20Releases%20Packages)](https://klts.io/docs/kubernetes/releases/v1.24/v1.24.5-lts.0/)| -|v1.23.8|[![v1.23.8-lts.1](https://img.shields.io/github/workflow/status/klts-io/kubernetes-lts/Releases%20Images/v1.23.8-lts.1?label=v1.23.8-lts.1%20Releases%20Images)](https://klts.io/docs/kubernetes/releases/v1.23/v1.23.8-lts.1/)|[![v1.23.8-lts.1](https://img.shields.io/github/workflow/status/klts-io/kubernetes-lts/Releases%20Packages/v1.23.8-lts.1?label=v1.23.8-lts.1%20Releases%20Packages)](https://klts.io/docs/kubernetes/releases/v1.23/v1.23.8-lts.1/)| +|v1.23.11|[![v1.23.11-lts.1](https://img.shields.io/github/workflow/status/klts-io/kubernetes-lts/Releases%20Images/v1.23.11-lts.1?label=v1.23.11-lts.1%20Releases%20Images)](https://klts.io/docs/kubernetes/releases/v1.23/v1.23.11-lts.1/)|[![v1.23.11-lts.1](https://img.shields.io/github/workflow/status/klts-io/kubernetes-lts/Releases%20Packages/v1.23.11-lts.1?label=v1.23.11-lts.1%20Releases%20Packages)](https://klts.io/docs/kubernetes/releases/v1.23/v1.23.11-lts.1/)| |v1.22.11|[![v1.22.11-lts.1](https://img.shields.io/github/workflow/status/klts-io/kubernetes-lts/Releases%20Images/v1.22.11-lts.1?label=v1.22.11-lts.1%20Releases%20Images)](https://klts.io/docs/kubernetes/releases/v1.22/v1.22.11-lts.1/)|[![v1.22.11-lts.1](https://img.shields.io/github/workflow/status/klts-io/kubernetes-lts/Releases%20Packages/v1.22.11-lts.1?label=v1.22.11-lts.1%20Releases%20Packages)](https://klts.io/docs/kubernetes/releases/v1.22/v1.22.11-lts.1/)| |v1.21.14|[![v1.21.14-lts.1](https://img.shields.io/github/workflow/status/klts-io/kubernetes-lts/Releases%20Images/v1.21.14-lts.1?label=v1.21.14-lts.1%20Releases%20Images)](https://klts.io/docs/kubernetes/releases/v1.21/v1.21.14-lts.1/)|[![v1.21.14-lts.1](https://img.shields.io/github/workflow/status/klts-io/kubernetes-lts/Releases%20Packages/v1.21.14-lts.1?label=v1.21.14-lts.1%20Releases%20Packages)](https://klts.io/docs/kubernetes/releases/v1.21/v1.21.14-lts.1/)| |v1.20.15|[![v1.20.15-lts.2](https://img.shields.io/github/workflow/status/klts-io/kubernetes-lts/Releases%20Images/v1.20.15-lts.2?label=v1.20.15-lts.2%20Releases%20Images)](https://klts.io/docs/kubernetes/releases/v1.20/v1.20.15-lts.2/)|[![v1.20.15-lts.2](https://img.shields.io/github/workflow/status/klts-io/kubernetes-lts/Releases%20Packages/v1.20.15-lts.2?label=v1.20.15-lts.2%20Releases%20Packages)](https://klts.io/docs/kubernetes/releases/v1.20/v1.20.15-lts.2/)| diff --git a/releases.yml b/releases.yml index 6027f82f2e..a03642c51d 100644 --- a/releases.yml +++ b/releases.yml @@ -7,8 +7,8 @@ releases: must: true patches: [] - - name: v1.23.8-lts.1 - base_release: v1.23.8-ci + - name: v1.23.11-lts.1 + base_release: v1.23.11-ci must: true patches: [] @@ -176,8 +176,8 @@ releases: - no-delete-images.1.23 - fix-etcd-put-key.1.23 - - name: v1.23.8-ci - base_release: v1.23.8 + - name: v1.23.11-ci + base_release: v1.23.11 patches: - fix-run-docker.1.23 - no-delete-images.1.23 From 57d1ccb74f3277f9b86b5884c7d32c44b9ca1eed Mon Sep 17 00:00:00 2001 From: Paco Xu Date: Thu, 15 Sep 2022 17:25:15 +0800 Subject: [PATCH 3/3] update v1.22.11 to v1.22.13 - fix patch format in fix-run-docker.1.23.patch --- .github/workflows/verify.yml | 24 ++++++++++++------------ README.md | 2 +- patches/fix-run-docker.1.23.patch | 4 ++-- releases.yml | 8 ++++---- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index 98b7b6a71e..21e2cd33cd 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -205,7 +205,7 @@ jobs: run: | make test-integration - Test-v1-22-11-lts-1: + Test-v1-22-14-lts-1: needs: Patch runs-on: ubuntu-latest steps: @@ -217,15 +217,15 @@ jobs: with: path: | src - key: ${{ runner.os }}-build-${{ env.cache-name }}-v1-22-11-lts-1 + key: ${{ runner.os }}-build-${{ env.cache-name }}-v1-22-14-lts-1 restore-keys: | ${{ runner.os }}-build-${{ env.cache-name }} - name: Install dependent run: | make dependent - - name: Checkout to v1.22.11-lts.1 + - name: Checkout to v1.22.14-lts.1 run: | - make v1.22.11-lts.1 + make v1.22.14-lts.1 - name: Install etcd run: | make install-etcd @@ -233,7 +233,7 @@ jobs: run: | make test - Test-Cmd-v1-22-11-lts-1: + Test-Cmd-v1-22-14-lts-1: needs: Patch runs-on: ubuntu-latest steps: @@ -245,15 +245,15 @@ jobs: with: path: | src - key: ${{ runner.os }}-build-${{ env.cache-name }}-v1-22-11-lts-1 + key: ${{ runner.os }}-build-${{ env.cache-name }}-v1-22-14-lts-1 restore-keys: | ${{ runner.os }}-build-${{ env.cache-name }} - name: Install dependent run: | make dependent - - name: Checkout to v1.22.11-lts.1 + - name: Checkout to v1.22.14-lts.1 run: | - make v1.22.11-lts.1 + make v1.22.14-lts.1 - name: Install etcd run: | make install-etcd @@ -261,7 +261,7 @@ jobs: run: | make test-cmd - Test-Integration-v1-22-11-lts-1: + Test-Integration-v1-22-14-lts-1: needs: Patch runs-on: ubuntu-latest steps: @@ -274,15 +274,15 @@ jobs: path: | src /tmp/kubernetes-lts/ - key: ${{ runner.os }}-build-${{ env.cache-name }}-v1-22-11-lts-1 + key: ${{ runner.os }}-build-${{ env.cache-name }}-v1-22-14-lts-1 restore-keys: | ${{ runner.os }}-build-${{ env.cache-name }} - name: Install dependent run: | make dependent - - name: Checkout to v1.22.11-lts.1 + - name: Checkout to v1.22.14-lts.1 run: | - make v1.22.11-lts.1 + make v1.22.14-lts.1 - name: Install etcd run: | make install-etcd diff --git a/README.md b/README.md index 51ef4e26f4..d778abb92b 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Below lists the status of each release image and package and you can click any t |-|-|-| |v1.24.5|[![v1.24.5-lts.0](https://img.shields.io/github/workflow/status/klts-io/kubernetes-lts/Releases%20Images/v1.24.5-lts.0?label=v1.24.5-lts.0%20Releases%20Images)](https://klts.io/docs/kubernetes/releases/v1.24/v1.24.5-lts.0/)|[![v1.24.5-lts.0](https://img.shields.io/github/workflow/status/klts-io/kubernetes-lts/Releases%20Packages/v1.24.5-lts.0?label=v1.24.5-lts.0%20Releases%20Packages)](https://klts.io/docs/kubernetes/releases/v1.24/v1.24.5-lts.0/)| |v1.23.11|[![v1.23.11-lts.1](https://img.shields.io/github/workflow/status/klts-io/kubernetes-lts/Releases%20Images/v1.23.11-lts.1?label=v1.23.11-lts.1%20Releases%20Images)](https://klts.io/docs/kubernetes/releases/v1.23/v1.23.11-lts.1/)|[![v1.23.11-lts.1](https://img.shields.io/github/workflow/status/klts-io/kubernetes-lts/Releases%20Packages/v1.23.11-lts.1?label=v1.23.11-lts.1%20Releases%20Packages)](https://klts.io/docs/kubernetes/releases/v1.23/v1.23.11-lts.1/)| -|v1.22.11|[![v1.22.11-lts.1](https://img.shields.io/github/workflow/status/klts-io/kubernetes-lts/Releases%20Images/v1.22.11-lts.1?label=v1.22.11-lts.1%20Releases%20Images)](https://klts.io/docs/kubernetes/releases/v1.22/v1.22.11-lts.1/)|[![v1.22.11-lts.1](https://img.shields.io/github/workflow/status/klts-io/kubernetes-lts/Releases%20Packages/v1.22.11-lts.1?label=v1.22.11-lts.1%20Releases%20Packages)](https://klts.io/docs/kubernetes/releases/v1.22/v1.22.11-lts.1/)| +|v1.22.14|[![v1.22.14-lts.1](https://img.shields.io/github/workflow/status/klts-io/kubernetes-lts/Releases%20Images/v1.22.14-lts.1?label=v1.22.14-lts.1%20Releases%20Images)](https://klts.io/docs/kubernetes/releases/v1.22/v1.22.14-lts.1/)|[![v1.22.14-lts.1](https://img.shields.io/github/workflow/status/klts-io/kubernetes-lts/Releases%20Packages/v1.22.14-lts.1?label=v1.22.14-lts.1%20Releases%20Packages)](https://klts.io/docs/kubernetes/releases/v1.22/v1.22.14-lts.1/)| |v1.21.14|[![v1.21.14-lts.1](https://img.shields.io/github/workflow/status/klts-io/kubernetes-lts/Releases%20Images/v1.21.14-lts.1?label=v1.21.14-lts.1%20Releases%20Images)](https://klts.io/docs/kubernetes/releases/v1.21/v1.21.14-lts.1/)|[![v1.21.14-lts.1](https://img.shields.io/github/workflow/status/klts-io/kubernetes-lts/Releases%20Packages/v1.21.14-lts.1?label=v1.21.14-lts.1%20Releases%20Packages)](https://klts.io/docs/kubernetes/releases/v1.21/v1.21.14-lts.1/)| |v1.20.15|[![v1.20.15-lts.2](https://img.shields.io/github/workflow/status/klts-io/kubernetes-lts/Releases%20Images/v1.20.15-lts.2?label=v1.20.15-lts.2%20Releases%20Images)](https://klts.io/docs/kubernetes/releases/v1.20/v1.20.15-lts.2/)|[![v1.20.15-lts.2](https://img.shields.io/github/workflow/status/klts-io/kubernetes-lts/Releases%20Packages/v1.20.15-lts.2?label=v1.20.15-lts.2%20Releases%20Packages)](https://klts.io/docs/kubernetes/releases/v1.20/v1.20.15-lts.2/)| |v1.19.16|[![v1.19.16-lts.3](https://img.shields.io/github/workflow/status/klts-io/kubernetes-lts/Releases%20Images/v1.19.16-lts.3?label=v1.19.16-lts.3%20Releases%20Images)](https://klts.io/docs/kubernetes/releases/v1.19/v1.19.16-lts.3/)|[![v1.19.16-lts.3](https://img.shields.io/github/workflow/status/klts-io/kubernetes-lts/Releases%20Packages/v1.19.16-lts.3?label=v1.19.16-lts.3%20Releases%20Packages)](https://klts.io/docs/kubernetes/releases/v1.19/v1.19.16-lts.3/)| diff --git a/patches/fix-run-docker.1.23.patch b/patches/fix-run-docker.1.23.patch index 8e97a83c44..3feacb6058 100644 --- a/patches/fix-run-docker.1.23.patch +++ b/patches/fix-run-docker.1.23.patch @@ -8,7 +8,7 @@ Subject: [PATCH 1/2] Run docker as root in tests 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/common.sh b/build/common.sh -index ff091090b57..4524083fa8c 100755 +index 151b218fbec..72c3515489d 100755 --- a/build/common.sh +++ b/build/common.sh @@ -490,7 +490,7 @@ function kube::build::run_build_command_ex() { @@ -31,7 +31,7 @@ Subject: [PATCH 2/2] Run docker with device kmsg 1 file changed, 1 insertion(+) diff --git a/build/common.sh b/build/common.sh -index 4524083fa8c..8fcb0410736 100755 +index 72c3515489d..3ffe0ee85af 100755 --- a/build/common.sh +++ b/build/common.sh @@ -492,6 +492,7 @@ function kube::build::run_build_command_ex() { diff --git a/releases.yml b/releases.yml index a03642c51d..d087b505db 100644 --- a/releases.yml +++ b/releases.yml @@ -12,8 +12,8 @@ releases: must: true patches: [] - - name: v1.22.11-lts.1 - base_release: v1.22.11-ci + - name: v1.22.14-lts.1 + base_release: v1.22.14-ci must: true patches: [] @@ -183,8 +183,8 @@ releases: - no-delete-images.1.23 - fix-etcd-put-key.1.23 - - name: v1.22.11-ci - base_release: v1.22.11 + - name: v1.22.14-ci + base_release: v1.22.14 patches: - fix-run-docker.1.23 - no-delete-images.1.23