Skip to content

Commit

Permalink
Merge pull request kata-containers#5812 from gkurz/fix-kubernetes-ins…
Browse files Browse the repository at this point in the history
…tall

ci: Switch to pkgs.k8s.io
  • Loading branch information
gkurz authored Mar 6, 2024
2 parents 40c641c + 0ecd4c6 commit 7e4ee91
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
8 changes: 4 additions & 4 deletions .ci/install_kubernetes.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ if [ "$ID" == "ubuntu" ]; then
sudo -E apt purge kubelet -y
fi
sudo bash -c "cat <<EOF > /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 -
sudo mkdir -p /etc/apt/keyrings/ # For Ubuntu < 20.04
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 -
chronic sudo -E apt update
chronic sudo -E apt install --allow-downgrades -y kubelet="$kubernetes_version" kubeadm="$kubernetes_version" kubectl="$kubernetes_version"
chronic sudo -E apt install --allow-downgrades -y kubelet kubeadm kubectl
elif [[ "$ID" =~ ^(alinux|centos|fedora|rhel)$ ]]; then
if [ "$(command -v kubelet)" != "" ]; then
sudo -E yum autoremove kubelet -y
Expand Down
3 changes: 3 additions & 0 deletions .ci/setup_env_ubuntu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ source "/etc/os-release" || source "/usr/lib/os-release"
source "${cidir}/lib.sh"

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

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

0 comments on commit 7e4ee91

Please sign in to comment.