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

V1.22 v1.23 patches #174

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
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
77 changes: 53 additions & 24 deletions .github/workflows/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
run: |
make test

Test-v1-23-8-lts-1:
Test-Cmd-v1-24-5-lts-0:
needs: Patch
runs-on: ubuntu-latest
steps:
Expand All @@ -75,15 +75,43 @@ jobs:
with:
path: |
src
key: ${{ runner.os }}-build-${{ env.cache-name }}-v1-23-8-lts-1
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.23.8-lts.1
- name: Checkout to v1.24.5-lts.0
run: |
make v1.23.8-lts.1
make v1.24.5-lts.0
- name: Install etcd
run: |
make install-etcd
- name: Test cmd
run: |
make test-cmd

Test-Cmd-v1-23-11-lts-1:
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-23-11-lts-1
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}
- name: Install dependent
run: |
make dependent
- name: Checkout to v1.23.11-lts.1
run: |
make v1.23.11-lts.1
- name: Install etcd
run: |
make install-etcd
Expand Down Expand Up @@ -119,7 +147,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:
Expand All @@ -131,22 +159,23 @@ 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
- name: Test cmd
run: |
make test-cmd


Test-Integration-v1-24-5-lts-0:
needs: Patch
runs-on: ubuntu-latest
Expand Down Expand Up @@ -176,7 +205,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:
Expand All @@ -189,23 +218,23 @@ 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
- name: Test integration
run: |
make test-integration

Test-v1-22-11-lts-1:
Test-v1-22-14-lts-1:
needs: Patch
runs-on: ubuntu-latest
steps:
Expand All @@ -217,23 +246,23 @@ 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
- name: Test
run: |
make test

Test-Cmd-v1-22-11-lts-1:
Test-Cmd-v1-22-14-lts-1:
needs: Patch
runs-on: ubuntu-latest
steps:
Expand All @@ -245,23 +274,23 @@ 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
- name: Test cmd
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:
Expand All @@ -274,15 +303,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
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ 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.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.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.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/)|
Expand Down
4 changes: 2 additions & 2 deletions patches/fix-run-docker.1.23.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -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() {
Expand Down
16 changes: 8 additions & 8 deletions releases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ 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: []

- 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: []

Expand Down Expand Up @@ -176,15 +176,15 @@ 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
- 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
Expand Down