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.

Sign up for GitHub

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

bump kubernetes version v1.24~1.28 #191

Merged
merged 9 commits into from
Nov 15, 2024
Merged

bump kubernetes version v1.24~1.28 #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8cb5f1f
bump kubernetes version v1.25~1.28
pacoxu Nov 12, 2024
1b56b67
update v1.22~v1.23
pacoxu Nov 12, 2024
541f2e5
add v1.25-v1.28 github actions
pacoxu Nov 12, 2024
b8d3759
fix CI failure
pacoxu Nov 12, 2024
922d086
fix v1.26 update-codegen
pacoxu Nov 12, 2024
513a49a
config Github submit user
pacoxu Nov 13, 2024
01ef815
fix test-cmd kubeadm build
pacoxu Nov 13, 2024
556548b
format patch update-kube-proxy-iptables.1.18.patch
pacoxu Nov 13, 2024
c0cb6c1
gen .make/go-pkgdeps.mk
pacoxu Nov 14, 2024
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
559 changes: 487 additions & 72 deletions .github/workflows/verify.yml
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 7 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,13 @@ 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://github.com/klts-io/kubernetes-lts/actions/workflows/releases-images.yml/badge.svg?tag=v1.24.5-lts.0)](https://klts.io/docs/kubernetes/releases/v1.24/v1.24.5-lts.0/)|[![v1.24.5-lts.0](https://github.com/klts-io/kubernetes-lts/actions/workflows/releases-package.yml/badge.svg?tag=v1.24.5-lts.0)](https://klts.io/docs/kubernetes/releases/v1.24/v1.24.5-lts.0/)|
|v1.23.8|[![v1.23.8-lts.1](https://github.com/klts-io/kubernetes-lts/actions/workflows/releases-images.yml/badge.svg?tag=v1.23.8-lts.1)](https://klts.io/docs/kubernetes/releases/v1.23/v1.23.8-lts.1/)|[![v1.23.8-lts.1](https://github.com/klts-io/kubernetes-lts/actions/workflows/releases-package.yml/badge.svg?tag=v1.23.8-lts.1)](https://klts.io/docs/kubernetes/releases/v1.23/v1.23.8-lts.1/)|
|v1.22.11|[![v1.22.11-lts.1](https://github.com/klts-io/kubernetes-lts/actions/workflows/releases-images.yml/badge.svg?tag=v1.22.11-lts.1)](https://klts.io/docs/kubernetes/releases/v1.22/v1.22.11-lts.1/)|[![v1.22.11-lts.1](https://github.com/klts-io/kubernetes-lts/actions/workflows/releases-package.yml/badge.svg?tag=v1.22.11-lts.1)](https://klts.io/docs/kubernetes/releases/v1.22/v1.22.11-lts.1/)|
|v1.28.15|[![v1.28.15-lts.0](https://github.com/klts-io/kubernetes-lts/actions/workflows/releases-images.yml/badge.svg?tag=v1.28.15-lts.0)](https://klts.io/docs/kubernetes/releases/v1.24/v1.28.15-lts.0/)|[![v1.28.15-lts.0](https://github.com/klts-io/kubernetes-lts/actions/workflows/releases-package.yml/badge.svg?tag=v1.28.15-lts.0)](https://klts.io/docs/kubernetes/releases/v1.24/v1.28.15-lts.0/)|
|v1.27.16|[![v1.27.16-lts.0](https://github.com/klts-io/kubernetes-lts/actions/workflows/releases-images.yml/badge.svg?tag=v1.27.16-lts.0)](https://klts.io/docs/kubernetes/releases/v1.24/v1.27.16-lts.0/)|[![v1.27.16-lts.0](https://github.com/klts-io/kubernetes-lts/actions/workflows/releases-package.yml/badge.svg?tag=v1.27.16-lts.0)](https://klts.io/docs/kubernetes/releases/v1.24/v1.27.16-lts.0/)|
|v1.26.15|[![v1.26.15-lts.0](https://github.com/klts-io/kubernetes-lts/actions/workflows/releases-images.yml/badge.svg?tag=v1.26.15-lts.0)](https://klts.io/docs/kubernetes/releases/v1.24/v1.26.15-lts.0/)|[![v1.26.15-lts.0](https://github.com/klts-io/kubernetes-lts/actions/workflows/releases-package.yml/badge.svg?tag=v1.26.15-lts.0)](https://klts.io/docs/kubernetes/releases/v1.24/v1.26.15-lts.0/)|
|v1.25.16|[![v1.25.16-lts.0](https://github.com/klts-io/kubernetes-lts/actions/workflows/releases-images.yml/badge.svg?tag=v1.25.16-lts.0)](https://klts.io/docs/kubernetes/releases/v1.24/v1.25.16-lts.0/)|[![v1.25.16-lts.0](https://github.com/klts-io/kubernetes-lts/actions/workflows/releases-package.yml/badge.svg?tag=v1.25.16-lts.0)](https://klts.io/docs/kubernetes/releases/v1.24/v1.25.16-lts.0/)|
|v1.24.17|[![v1.24.17-lts.0](https://github.com/klts-io/kubernetes-lts/actions/workflows/releases-images.yml/badge.svg?tag=v1.24.17-lts.0)](https://klts.io/docs/kubernetes/releases/v1.24/v1.24.17-lts.0/)|[![v1.24.17-lts.0](https://github.com/klts-io/kubernetes-lts/actions/workflows/releases-package.yml/badge.svg?tag=v1.24.17-lts.0)](https://klts.io/docs/kubernetes/releases/v1.24/v1.24.17-lts.0/)|
|v1.23.17|[![v1.23.17-lts.1](https://github.com/klts-io/kubernetes-lts/actions/workflows/releases-images.yml/badge.svg?tag=v1.23.17-lts.1)](https://klts.io/docs/kubernetes/releases/v1.23/v1.23.17-lts.1/)|[![v1.23.17-lts.1](https://github.com/klts-io/kubernetes-lts/actions/workflows/releases-package.yml/badge.svg?tag=v1.23.17-lts.1)](https://klts.io/docs/kubernetes/releases/v1.23/v1.23.17-lts.1/)|
|v1.22.17|[![v1.22.17-lts.1](https://github.com/klts-io/kubernetes-lts/actions/workflows/releases-images.yml/badge.svg?tag=v1.22.17-lts.1)](https://klts.io/docs/kubernetes/releases/v1.22/v1.22.17-lts.1/)|[![v1.22.17-lts.1](https://github.com/klts-io/kubernetes-lts/actions/workflows/releases-package.yml/badge.svg?tag=v1.22.17-lts.1)](https://klts.io/docs/kubernetes/releases/v1.22/v1.22.17-lts.1/)|
|v1.21.14|[![v1.21.14-lts.1](https://github.com/klts-io/kubernetes-lts/actions/workflows/releases-images.yml/badge.svg?tag=v1.21.14-lts.1)](https://klts.io/docs/kubernetes/releases/v1.21/v1.21.14-lts.1/)|[![v1.21.14-lts.1](https://github.com/klts-io/kubernetes-lts/actions/workflows/releases-package.yml/badge.svg?tag=v1.21.14-lts.1)](https://klts.io/docs/kubernetes/releases/v1.21/v1.21.14-lts.1/)|
|v1.20.15|[![v1.20.15-lts.2](https://github.com/klts-io/kubernetes-lts/actions/workflows/releases-images.yml/badge.svg?tag=v1.20.15-lts.2)](https://klts.io/docs/kubernetes/releases/v1.20/v1.20.15-lts.2/)|[![v1.20.15-lts.2](https://github.com/klts-io/kubernetes-lts/actions/workflows/releases-package.yml/badge.svg?tag=v1.20.15-lts.2)](https://klts.io/docs/kubernetes/releases/v1.20/v1.20.15-lts.2/)|
|v1.19.16|[![v1.19.16-lts.3](https://github.com/klts-io/kubernetes-lts/actions/workflows/releases-images.yml/badge.svg?tag=v1.19.16-lts.3)](https://klts.io/docs/kubernetes/releases/v1.19/v1.19.16-lts.3/)|[![v1.19.16-lts.3](https://github.com/klts-io/kubernetes-lts/actions/workflows/releases-package.yml/badge.svg?tag=v1.19.16-lts.3)](https://klts.io/docs/kubernetes/releases/v1.19/v1.19.16-lts.3/)|
Expand Down
16 changes: 16 additions & 0 deletions hack/gen_verify_workflows.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ jobs:
path: |
src
key: \${{ runner.os }}-build-\${{ env.cache-name }}
- name: Config Github
run: |
git config --global user.email "[email protected]"
git config --global user.name "GitHub"
- name: Install dependent
run: |
make dependent
Expand Down Expand Up @@ -62,6 +66,10 @@ for release in ${RELEASES}; do
key: \${{ runner.os }}-build-\${{ env.cache-name }}-${name}
restore-keys: |
\${{ runner.os }}-build-\${{ env.cache-name }}
- name: Config Github
run: |
git config --global user.email "[email protected]"
git config --global user.name "GitHub"
- name: Install dependent
run: |
make dependent
Expand Down Expand Up @@ -90,6 +98,10 @@ for release in ${RELEASES}; do
key: \${{ runner.os }}-build-\${{ env.cache-name }}-${name}
restore-keys: |
\${{ runner.os }}-build-\${{ env.cache-name }}
- name: Config Github
run: |
git config --global user.email "[email protected]"
git config --global user.name "GitHub"
- name: Install dependent
run: |
make dependent
Expand Down Expand Up @@ -119,6 +131,10 @@ for release in ${RELEASES}; do
key: \${{ runner.os }}-build-\${{ env.cache-name }}-${name}
restore-keys: |
\${{ runner.os }}-build-\${{ env.cache-name }}
- name: Config Github
run: |
git config --global user.email "[email protected]"
git config --global user.name "GitHub"
- name: Install dependent
run: |
make dependent
Expand Down
11 changes: 9 additions & 2 deletions hack/test_cmd.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,22 @@ set -o nounset
set -o pipefail

source "kit/helper.sh"
export KUBE_ROOT=$(dirname "$(readlink -f "$0")")/..
export TERM=linux
echo "KUBE_ROOT directory: $KUBE_ROOT"
cd "${WORKDIR}"

# Kubeadm was added for testing in 1.19 and later
for n in {1..5}; do
echo "+++ Test retry ${n}"
./build/shell.sh -c '

# before v1.25
make generated_files kubeadm
# after v1.26
./build/run.sh make all WHAT=cmd/kubeadm

mkdir -p _output/local/go/bin/ && cp _output/dockerized/bin/linux/amd64/kubeadm _output/local/go/bin/
./hack/install-etcd.sh
PATH=$(pwd)/third_party/etcd:${PATH} make test-cmd
TERM=linux PATH=$(pwd)/third_party/etcd:${PATH} make test-cmd
' 2>&1 | grep -v -E '^I\w+ ' && exit 0
done
15 changes: 13 additions & 2 deletions hack/test_integration.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,31 @@ set -o nounset
set -o pipefail

source "kit/helper.sh"
export KUBE_ROOT=$(dirname "$(readlink -f "$0")")/..
export TERM=linux
echo "KUBE_ROOT directory: $KUBE_ROOT"
cd "${WORKDIR}"
echo "WORKDIR directory: $WORKDIR"

TMPFILE="${TMPDIR}/test-integration.log"

# Etcd was added for testing in 1.21 and later
function test-integration() {
./build/shell.sh -c '
./hack/install-etcd.sh
PATH=$(pwd)/third_party/etcd:${PATH} make test-integration
# generate .make/go-pkgdeps.mk
go install ./cmd/...

# run test-integration
KUBE_RUN_COPY_OUTPUT=y TERM=linux PATH=$(pwd)/third_party/etcd:${PATH} DBG_CODEGEN=1 make test-integration
'
}

test-integration 2>&1 | tee "${TMPFILE}" | grep -v -E '^I\w+ ' && exit 0

echo "-------print TMPFILE:"
cat "${TMPFILE}"
echo "-------TMPFILE end."

RETRY_CASES=$(cat "${TMPFILE}" | grep -E '^FAIL\s+k8s.io/kubernetes' | awk '{print $2}' || echo "")

TAG=$(helper::workdir::version)
Expand Down
Loading
Loading