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

Jump to bottom

add kindest/node:1.31.0 for e2e #4089

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

add kindest/node:1.31.0 for e2e #4089

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 3 additions & 13 deletions .github/workflows/auto-diff-k8s-ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ env:
PR_REVIWER: weizhoublue, ty-dc
# The range of K8s versions that matrix tests expect to run. All distributions larger than it will be picked to run.
MINIMUM_K8S_VERSION: v1.21
# TODO（ty-dc）, refer: https://github.com/spidernet-io/spiderpool/issues/3937
# Currently using kind/node v1.31, it is not possible to setup kind cluster
PENDING_K8S_VERSION: v1.31
K8S_MATRIX_FILE_PATH: .github/workflows/auto-diff-k8s-ci.yaml

on:
Expand Down Expand Up @@ -139,15 +136,8 @@ jobs:
git_status=$(git status --porcelain)
echo "git status: ${git_status}"
if [[ -n "$git_status" ]]; then
git_diff_version=$(git diff ${{ env.K8S_MATRIX_FILE_PATH }} | grep ${{ env.PENDING_K8S_VERSION }})
# Avoid submitting PRs every day after checking for changes.
if [[ -n "$git_diff_version" ]]; then
echo "SKIP_CREATE_PR=true" >> $GITHUB_ENV
echo "The .github/workflows/auto-diff-k8s-ci.yaml of Spiderpool has changed."
else
echo "SKIP_CREATE_PR=false" >> $GITHUB_ENV
echo "The .github/workflows/auto-diff-k8s-ci.yaml of Spiderpool has changed."
fi
echo "The .github/workflows/auto-diff-k8s-ci.yaml of Spiderpool has changed."
echo "SKIP_CREATE_PR=false" >> $GITHUB_ENV
else
echo "The .github/workflows/auto-diff-k8s-ci.yaml of Spiderpool has not changed."
echo "SKIP_CREATE_PR=true" >> $GITHUB_ENV
Expand Down Expand Up @@ -186,7 +176,7 @@ jobs:
matrix:
# Synchronise with the latest releases of each version
# If a new version of kind/node is released, it will be updated automatically.
version: [v1.28.13, v1.29.8, v1.30.4, v1.27.16, v1.26.15, v1.25.16, v1.23.17, v1.24.17, v1.22.17]
version: [v1.28.13, v1.29.8, v1.30.4, v1.27.16, v1.26.15, v1.25.16, v1.31.0, v1.23.17, v1.24.17, v1.22.17]
needs: [call_build_ci_image, get_ref, call_release_chart]
uses: ./.github/workflows/e2e-init.yaml
with:
Expand Down
6 changes: 6 additions & 0 deletions test/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,14 @@ setup_kind:
echo "the following features are only fully supported in versions higher than v1.29.0." ; \
sed -i '$$ a\runtimeConfig: ' $${NEW_KIND_YAML} ; \
sed -i '$$ a\ api/alpha: "true"' $${NEW_KIND_YAML} ; \
if [ $$(echo -e "$(E2E_KIND_IMAGE_TAG)\nv1.31.0" | sort -V | tail -n1) == "$(E2E_KIND_IMAGE_TAG)" ]; then \
sed -i '$$ a\ api/beta: "true"' $${NEW_KIND_YAML} ; \
fi ; \
sed -i '$$ a\featureGates: ' $${NEW_KIND_YAML} ; \
sed -i '$$ a\ MultiCIDRServiceAllocator: true' $${NEW_KIND_YAML} ; \
if [ $$(echo -e "$(E2E_KIND_IMAGE_TAG)\nv1.31.0" | sort -V | tail -n1) == "$(E2E_KIND_IMAGE_TAG)" ]; then \
sed -i '$$ a\ DisableAllocatorDualWrite: true' $${NEW_KIND_YAML} ; \
fi ; \
if [ "${E2E_SPIDERPOOL_ENABLE_DRA}" == "true" ]; then \
sed -i '$$ a\ DynamicResourceAllocation: true' $${NEW_KIND_YAML} ; \
printf 'containerdConfigPatches: \n# Enable CDI as described in https://tags.cncf.io/container-device-interface#containerd-configuration\n- |-\n [plugins."io.containerd.grpc.v1.cri"]\n enable_cdi = true\n ' >> $${NEW_KIND_YAML} ; \
Expand Down
Loading