Skip to content

Commit bc9f05f

Browse files
Revert "E2E: don’t stop/start kubelet before kubeadm runs"
This reverts commit e42b27d.
1 parent 205c2bf commit bc9f05f

12 files changed

+25
-0
lines changed

templates/test/ci/cluster-template-prow-ci-version-windows-containerd-2022.yaml

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

templates/test/ci/cluster-template-prow-ci-version.yaml

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

templates/test/ci/patches/control-plane-kubeadm-boostrap-ci-version.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
$${SUDO} ctr -n k8s.io images tag $$IMAGE_REGISTRY_PREFIX/$$CI_CONTAINER-amd64:"$${CI_VERSION//+/_}" gcr.io/k8s-staging-ci-images/$$CI_CONTAINER:"$${CI_VERSION//+/_}"
5555
done
5656
fi
57+
systemctl restart kubelet
5758
fi
5859
echo "* checking binary versions"
5960
echo "ctr version: " $(ctr version)

templates/test/ci/prow-ci-version/patches/kubeadm-bootstrap.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
$${SUDO} ctr -n k8s.io images tag $$IMAGE_REGISTRY_PREFIX/$$CI_CONTAINER-amd64:"$${CI_VERSION//+/_}" gcr.io/k8s-staging-ci-images/$$CI_CONTAINER:"$${CI_VERSION//+/_}"
5555
done
5656
fi
57+
systemctl restart kubelet
5758
fi
5859
echo "* checking binary versions"
5960
echo "ctr version: " $(ctr version)

templates/test/ci/prow-machine-pool-ci-version/patches/machine-pool-ci-version.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ spec:
6363
$${SUDO} ctr -n k8s.io images tag $$IMAGE_REGISTRY_PREFIX/$$CI_CONTAINER-amd64:"$${CI_VERSION//+/_}" gcr.io/k8s-staging-ci-images/$$CI_CONTAINER:"$${CI_VERSION//+/_}"
6464
done
6565
fi
66+
systemctl restart kubelet
6667
fi
6768
echo "* checking binary versions"
6869
echo "ctr version: " $(ctr version)

templates/test/dev/cluster-template-custom-builds-machine-pool.yaml

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

templates/test/dev/cluster-template-custom-builds.yaml

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

templates/test/dev/custom-builds-machine-pool/patches/custom-builds.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,13 @@ spec:
1616
set -o pipefail
1717
set -o errexit
1818
19+
systemctl stop kubelet
1920
declare -a BINARIES=("kubeadm" "kubectl" "kubelet")
2021
for BINARY in "$${BINARIES[@]}"; do
2122
echo "* installing package: $${BINARY} ${KUBE_GIT_VERSION}"
2223
curl --retry 10 --retry-delay 5 "https://${AZURE_STORAGE_ACCOUNT}.blob.core.windows.net/${JOB_NAME}/${KUBE_GIT_VERSION}/bin/linux/amd64/$${BINARY}" --output "/usr/bin/$${BINARY}"
2324
done
25+
systemctl restart kubelet
2426
2527
echo "kubeadm version: $(kubeadm version -o=short)"
2628
echo "kubectl version: $(kubectl version --client=true --short=true)"

templates/test/dev/custom-builds/patches/kubeadm-bootstrap.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,13 @@
88
set -o pipefail
99
set -o errexit
1010
11+
systemctl stop kubelet
1112
declare -a BINARIES=("kubeadm" "kubectl" "kubelet")
1213
for BINARY in "$${BINARIES[@]}"; do
1314
echo "* installing package: $${BINARY} ${KUBE_GIT_VERSION}"
1415
curl --retry 10 --retry-delay 5 "https://${AZURE_STORAGE_ACCOUNT}.blob.core.windows.net/${JOB_NAME}/${KUBE_GIT_VERSION}/bin/linux/amd64/$${BINARY}" --output "/usr/bin/$${BINARY}"
1516
done
17+
systemctl restart kubelet
1618
1719
echo "kubeadm version: $(kubeadm version -o=short)"
1820
echo "kubectl version: $(kubectl version --client=true --short=true)"

0 commit comments

Comments
 (0)