[e2e] Centralize Kubernetes version#713
Merged
imeoer merged 2 commits intocontainerd:mainfrom Feb 11, 2026
Merged
Conversation
Pin kubectl and kind node image to a single KUBE_VERSION variable in kind.sh instead of fetching the latest version dynamically from dl.k8s.io/release/stable.txt at build time, which sometimes break CI. Restore the --config flag on `kind create cluster` that was lost in commit 1535ce6 when the workflow was refactored from inline steps to kind.sh, and pass --image from the centralized version. Remove the duplicated image: field from kind.yaml since it is now controlled by the CLI flag.
6194321 to
7266319
Compare
Use containerdConfigPatches instead of replacing the entire containerd config. The custom config was missing critical settings like SystemdCgroup, preventing pods from starting. Wait for the API server healthz after kubelet restart in the CRI auth path.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Overview
Please briefly describe the changes your pull request makes.
Pin kubectl and kind node image to a single KUBE_VERSION variable in kind.sh instead of fetching the latest version dynamically from dl.k8s.io/release/stable.txt at build time, which sometimes break CI like here.
Also try to address some of the other flakiness of the e2e k8s jobs I've seen.
Related Issues
Please link to the relevant issue. For example:
Fix #123orRelated #456.Change Details
Please describe your changes in detail:
Hardcode the version with a new KUBE_VER in the Dockerfile
Restore the --config flag on
kind create clusterthat was lost in commit 1535ce6 when the workflow was refactored from inline steps to kind.sh, and pass --image from the centralized version.Remove the duplicated image: field from kind.yaml since it is now controlled by the CLI flag.
Use containerdConfigPatches instead of replacing the entire containerd config
Wait for the API server healthz after kubelet restart in the CRI auth path.
Test Results
If you have any relevant screenshots or videos that can help illustrate your changes, please add them here.
To illustrate the the kind config file wasn't used before:
- kind logs from before this PR showing the node image version used is 1.30.0 and not 1.30.2
Change Type
Please select the type of change your pull request relates to:
Self-Checklist
Before submitting a pull request, please ensure you have completed the following: