Skip to content

e2e: keep CRI-O and the kubelet on one Kubernetes minor #55593

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

Open
0intro wants to merge 1 commit into
base: main
Choose a base branch
from
+22 −5
Open

e2e: keep CRI-O and the kubelet on one Kubernetes minor #55593

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
27 changes: 22 additions & 5 deletions test/e2e-framework/components/kubernetes/kubeadm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ const kubeadmContainerdRepoReleasever = "9"
// the current upstream latest release happens to ship.
const kubeadmFlannelVersion = "v0.28.5"

// kubeadmMinorFile carries the Kubernetes minor from the CRI-O install step to
// the kubelet install step, which run as separate remote commands on the node.
const kubeadmMinorFile = "/etc/kubeadm-e2e-k8s-minor"

// ContainerRuntime selects the CRI installed on the kubeadm node. The Agent
// produces identical SBOMs across runtimes; only the install steps and the CRI
// socket differ.
Expand Down Expand Up @@ -151,13 +155,21 @@ systemctl restart containerd`, kubeadmContainerdRepoReleasever)
// newest stream that exists. The repo is $basearch (no $releasever), so
// one repo serves RHEL 9 and 10, and CRI-O defaults to the systemd
// cgroup driver, matching the kubelet.
//
// CRI-O releases track the Kubernetes minor they ship for, so the stream
// that was found also decides the cluster version: it is recorded in
// kubeadmMinorFile for the kubelet install below, which keeps the pair on
// one minor. A kubelet talking to a CRI-O two minors older brings pods up
// as far as Init:ImagePullBackOff and no further.
runtimeScript = fmt.Sprintf(`kmaj=$(echo %[1]s | cut -d. -f1); kmin=$(echo %[1]s | cut -d. -f2)
crio_ver=""
for d in 0 1 2 3 4; do
cand="v${kmaj}.$((kmin-d))"
if curl -fsSL -o /dev/null "https://pkgs.k8s.io/addons:/cri-o:/stable:/${cand}/rpm/repodata/repomd.xml"; then crio_ver="$cand"; break; fi
done
test -n "$crio_ver" || { echo "no CRI-O stable stream available at or below v%[1]s"; exit 1; }
printf '%%s' "${crio_ver#v}" >%[2]s
echo "CRI-O ${crio_ver} selected, pinning Kubernetes to ${crio_ver#v}"
cat >/etc/yum.repos.d/cri-o.repo <<EOF
[cri-o]
name=CRI-O
Expand All @@ -178,7 +190,7 @@ location = "mirror.gcr.io"
EOF
# Drop CRI-O's packaged CNI bridge so flannel owns pod networking (the containerd path has none).
rm -f /etc/cni/net.d/*crio* || true
systemctl enable --now crio`, minor)
systemctl enable --now crio`, minor, kubeadmMinorFile)
}

runtimeInstall, err := runner.Command(namer.ResourceName(runtimeName), &command.Args{
Expand All @@ -191,17 +203,22 @@ systemctl enable --now crio`, minor)

tools, err := runner.Command(namer.ResourceName("kubeadm-tools"), &command.Args{
Sudo: true,
Create: rootScript(fmt.Sprintf(`cat >/etc/yum.repos.d/kubernetes.repo <<'EOF'
// The CRI-O install pins the minor it found in kubeadmMinorFile, so the
// kubelet follows the runtime onto one minor. The containerd path writes
// no such file and installs the requested minor.
Create: rootScript(fmt.Sprintf(`minor=%[1]s
if [ -s %[2]s ]; then minor=$(cat %[2]s); fi
cat >/etc/yum.repos.d/kubernetes.repo <<EOF
[kubernetes]
name=Kubernetes
baseurl=https://pkgs.k8s.io/core:/stable:/v%[1]s/rpm/
baseurl=https://pkgs.k8s.io/core:/stable:/v${minor}/rpm/
enabled=1
gpgcheck=1
gpgkey=https://pkgs.k8s.io/core:/stable:/v%[1]s/rpm/repodata/repomd.xml.key
gpgkey=https://pkgs.k8s.io/core:/stable:/v${minor}/rpm/repodata/repomd.xml.key
exclude=kubelet kubeadm kubectl cri-tools
EOF
dnf install -y kubelet kubeadm kubectl cri-tools --disableexcludes=kubernetes
systemctl enable --now kubelet`, minor)),
systemctl enable --now kubelet`, minor, kubeadmMinorFile)),
}, utils.MergeOptions(opts, utils.PulumiDependsOn(runtimeInstall))...)
if err != nil {
return err
Expand Down
Loading