Skip to content

[WIP] 🌱 e2e: fix debian_injection_script for kubernetes v1.35 which removed kubelet's pod-infra-container-image flag #5778

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
chrischdi wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −0
Open

[WIP] 🌱 e2e: fix debian_injection_script for kubernetes v1.35 which removed kubelet's pod-infra-container-image flag #5778

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
6 changes: 6 additions & 0 deletions test/helpers/kubernetesversions/data/debian_injection_script.envsubst.sh.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,12 @@ if [[ "$${KUBERNETES_VERSION}" != "" ]]; then
$${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
$${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "gcr.io/k8s-staging-ci-images/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
done

# TODO: remove once we use k8s v1.35 image-builder templates.
# Note: This is a temporary fix to ensure the flag --pod-infra-container-image is not set which was removed in k8s v1.35 and deprecated for a long time.
echo "Clearing --pod-infra-container-image in /etc/sysconfig/kubelet and/or /etc/default/kubelet if they exist"
sed -i -E 's/--pod-infra-container-image[= ][a-zA-Z0-9._/-]+(:[a-zA-Z0-9._-]+ *)?//' /etc/sysconfig/kubelet || true
sed -i -E 's/--pod-infra-container-image[= ][a-zA-Z0-9._/-]+(:[a-zA-Z0-9._-]+ *)?//' /etc/default/kubelet || true
fi
echo "* checking binary versions"
echo "ctr version: " "$(ctr version)"
Expand Down