@@ -405,6 +405,13 @@ jobs:
405405 run : |
406406 set -Eeuxo pipefail
407407
408+ # the Microsoft repo's kubelet does not provide /etc/systemd/system/kubelet.service.d/10-kubeadm.conf
409+ # [Service]
410+ # EnvironmentFile=-/var/lib/kubelet/kubeadm-flags.env
411+ # ExecStart=/usr/bin/kubelet $KUBELET_KUBEADM_ARGS
412+ sudo ls /etc/apt/sources.list.d/
413+ sudo rm /etc/apt/sources.list.d/microsoft-prod.list
414+
408415 sudo apt-get update
409416 sudo apt-get install -y software-properties-common curl
410417
@@ -446,6 +453,7 @@ jobs:
446453
447454 sudo cp ci/cached-builds/crio.conf /etc/crio/crio.conf.d/
448455
456+ sudo systemctl daemon-reload
449457 sudo systemctl start crio.service
450458 env :
451459 # TODO(jdanek): install also "cri-tools=${CRIO_VERSION}.*" when updating to 1.33
@@ -455,6 +463,10 @@ jobs:
455463 # This is not a supported version skew and may lead to a malfunctional cluster.
456464 # Kubelet version: "1.33.0" Control plane version: "1.30.12"
457465 KUBERNETES_VERSION : 1.33
466+ # Also update version in kubeadm.yaml
467+
468+ - run : sudo crictl info
469+ if : ${{ steps.have-tests.outputs.tests == 'true' }}
458470
459471 - name : Show crio debug data (on failure)
460472 if : ${{ failure() && steps.have-tests.outputs.tests == 'true' }}
@@ -491,6 +503,8 @@ jobs:
491503 sudo iptables -P FORWARD ACCEPT
492504 sudo iptables -t nat -A POSTROUTING -s 10.85.0.0/16 -o eth0 -j MASQUERADE
493505
506+ sudo kubeadm reset -f --cri-socket=unix:///var/run/crio/crio.sock
507+
494508 # https://kubernetes.io/docs/setup/production-environment/tools/kubeadm/create-cluster-kubeadm
495509 sudo kubeadm init --config=ci/cached-builds/kubeadm.yaml
496510
@@ -503,6 +517,15 @@ jobs:
503517 run : |
504518 set -Eeuxo pipefail
505519
520+ # [kubelet-start] Writing kubelet environment file with flags to file "/var/lib/kubelet/kubeadm-flags.env"
521+ sudo cat /var/lib/kubelet/kubeadm-flags.env || true
522+ # [kubelet-start] Writing kubelet configuration to file "/var/lib/kubelet/config.yaml"
523+ sudo cat /var/lib/kubelet/config.yaml || true
524+
525+ sudo systemctl cat kubelet.service || true
526+
527+ sudo cat /etc/systemd/system/kubelet.service.d/10-kubeadm.conf || true
528+
506529 sudo systemctl status kubelet || true
507530 sudo journalctl -xeu kubelet
508531
0 commit comments