Don't use conmon, crun and containers-common

Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
cri-o · Sep 22, 2023 · 6a1be95 · 6a1be95
1 parent 01057fb
commit 6a1be95
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 12 deletions.
diff --git a/README.md b/README.md
@@ -101,11 +101,8 @@ EOF
 
 # Install official package dependencies
 dnf install -y \
-    conmon \
     conntrack \
     container-selinux \
-    containers-common \
-    crun \
     ebtables \
     ethtool \
     iproute \

diff --git a/test/rpm/Dockerfile b/test/rpm/Dockerfile
@@ -20,12 +20,7 @@ gpgcheck=1\n\
 gpgkey=https://pkgs.k8s.io/addons:/cri-o:/$PROJECT_PATH:/build/rpm/repodata/repomd.xml.key\n\
 " > /etc/yum.repos.d/cri-o.repo
 
-RUN dnf install -y \
-    conmon \
-    containers-common \
-    crun \
-    iptables \
-    kubernetes-cni
+RUN dnf install -y iptables
 
 RUN dnf install -y --repo cri-o --repo kubernetes \
     cri-o \

diff --git a/test/rpm/Vagrantfile b/test/rpm/Vagrantfile
@@ -49,11 +49,8 @@ EOF
 
       # Official package dependencies
       dnf install -y \
-        conmon \
         conntrack \
         container-selinux \
-        containers-common \
-        crun \
         ebtables \
         ethtool \
         iproute \