Skip to content
This repository was archived by the owner on Jun 28, 2024. It is now read-only.

Commit 7e4ee91

Browse files
authored
Merge pull request #5812 from gkurz/fix-kubernetes-install
ci: Switch to pkgs.k8s.io
2 parents 40c641c + 0ecd4c6 commit 7e4ee91

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

.ci/install_kubernetes.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ if [ "$ID" == "ubuntu" ]; then
2525
sudo -E apt purge kubelet -y
2626
fi
2727
sudo bash -c "cat <<EOF > /etc/apt/sources.list.d/kubernetes.list
28-
deb http://packages.cloud.google.com/apt/ kubernetes-xenial-unstable main
28+
deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.29/deb/ /
2929
EOF"
30-
3130
chronic sudo -E sed -i 's/^[ \t]*//' /etc/apt/sources.list.d/kubernetes.list
32-
curl -fsSL https://dl.k8s.io/apt/doc/apt-key.gpg | sudo apt-key add -
31+
sudo mkdir -p /etc/apt/keyrings/ # For Ubuntu < 20.04
32+
curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.29/deb/Release.key | sudo gpg --batch --yes --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg -
3333
chronic sudo -E apt update
34-
chronic sudo -E apt install --allow-downgrades -y kubelet="$kubernetes_version" kubeadm="$kubernetes_version" kubectl="$kubernetes_version"
34+
chronic sudo -E apt install --allow-downgrades -y kubelet kubeadm kubectl
3535
elif [[ "$ID" =~ ^(alinux|centos|fedora|rhel)$ ]]; then
3636
if [ "$(command -v kubelet)" != "" ]; then
3737
sudo -E yum autoremove kubelet -y

.ci/setup_env_ubuntu.sh

+3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ source "/etc/os-release" || source "/usr/lib/os-release"
1212
source "${cidir}/lib.sh"
1313

1414
echo "Update apt repositories"
15+
# FIXME: workaround the case where the runner is pre-configured with a
16+
# broken kubernetes repository.
17+
sudo -E rm -f /etc/apt/sources.list.d/kubernetes.list
1518
sudo -E apt update
1619

1720
# Removing man-db, workflow's kept failing, fixes: #4480

0 commit comments

Comments
 (0)