diff --git a/.ci/install_kubernetes.sh b/.ci/install_kubernetes.sh index 1b3a93b80..058666ef7 100755 --- a/.ci/install_kubernetes.sh +++ b/.ci/install_kubernetes.sh @@ -25,11 +25,10 @@ if [ "$ID" == "ubuntu" ]; then sudo -E apt purge kubelet -y fi sudo bash -c "cat < /etc/apt/sources.list.d/kubernetes.list - deb http://packages.cloud.google.com/apt/ kubernetes-xenial-unstable main + deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.29/deb/ / EOF" - chronic sudo -E sed -i 's/^[ \t]*//' /etc/apt/sources.list.d/kubernetes.list - curl -fsSL https://dl.k8s.io/apt/doc/apt-key.gpg | sudo apt-key add - + curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.29/deb/Release.key | sudo gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg chronic sudo -E apt update chronic sudo -E apt install --allow-downgrades -y kubelet="$kubernetes_version" kubeadm="$kubernetes_version" kubectl="$kubernetes_version" elif [[ "$ID" =~ ^(alinux|centos|fedora|rhel)$ ]]; then diff --git a/.ci/setup_env_ubuntu.sh b/.ci/setup_env_ubuntu.sh index e2b3cb8c0..878ac3b45 100755 --- a/.ci/setup_env_ubuntu.sh +++ b/.ci/setup_env_ubuntu.sh @@ -12,6 +12,8 @@ source "/etc/os-release" || source "/usr/lib/os-release" source "${cidir}/lib.sh" echo "Update apt repositories" +# FIXME: workaround for https://github.com/kata-containers/tests/issues/5811 +sudo -E rm -f /etc/apt/sources.list.d/kubernetes.list sudo -E apt update # Removing man-db, workflow's kept failing, fixes: #4480