Skip to content

Commit

Permalink
ci: allow Podman and CRI-O side by side
Browse files Browse the repository at this point in the history
The issue with the conflict got resolved and we can now use both tools
side by side.

Signed-off-by: Sascha Grunert <[email protected]>
  • Loading branch information
saschagrunert authored and k8s-ci-robot committed Sep 17, 2024
1 parent 5f08136 commit 963726b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 10 deletions.
6 changes: 1 addition & 5 deletions hack/ci/Vagrantfile-debian
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ Vagrant.configure("2") do |config|
echo "deb [signed-by=/etc/apt/keyrings/cri-o-apt-keyring.gpg] https://pkgs.k8s.io/addons:/cri-o:/prerelease:/main/deb/ /" | tee /etc/apt/sources.list.d/cri-o.list
apt-get update
apt-get install -y \
cri-o \
kubelet \
kubeadm \
kubectl \
Expand All @@ -76,12 +77,7 @@ Vagrant.configure("2") do |config|
# Load the prebuilt container image
podman load -i /vagrant/image.tar
# Remove podman, this package conflicts with CRI-O
apt-get remove --purge -y podman
apt-get autoremove -y
# Setup CRI-O
apt-get install -y cri-o
systemctl enable --now crio
/vagrant/hack/ci/install-kubernetes.sh
Expand Down
6 changes: 1 addition & 5 deletions hack/ci/Vagrantfile-ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ Vagrant.configure("2") do |config|
apt-get update
apt-get install -y \
build-essential \
cri-o \
kubelet \
kubeadm \
kubectl \
Expand All @@ -55,18 +56,13 @@ Vagrant.configure("2") do |config|
# Load the prebuilt container image
podman load -i /vagrant/image.tar
# Remove podman, this package conflicts with CRI-O
apt-get remove --purge -y podman
apt-get autoremove -y
# Baseprofile recording requires cosign
COSIGN_VERSION=v2.2.1
COSIGN_BINARY=/usr/bin/cosign
curl -sSfL --retry 5 --retry-delay 3 "https://github.com/sigstore/cosign/releases/download/$COSIGN_VERSION/cosign-linux-amd64" -o "$COSIGN_BINARY"
chmod +x "$COSIGN_BINARY"
# Setup CRI-O
apt-get install -y cri-o
systemctl enable --now crio
# Disable kernel print rate limiting for syslog messaging
Expand Down

0 comments on commit 963726b

Please sign in to comment.