kubeadm: use both cni dirs with crio

karmab · Apr 26, 2024 · 6bafce1 · 6bafce1
1 parent e616d9a
commit 6bafce1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/kvirt/cluster/kubeadm/pre_el.sh b/kvirt/cluster/kubeadm/pre_el.sh
@@ -40,6 +40,10 @@ gpgcheck=1
 gpgkey=https://pkgs.k8s.io/addons:/cri-o:/$PROJECT_PATH/rpm/repodata/repomd.xml.key""" >/etc/yum.repos.d/cri-o.repo
 dnf -y install container-selinux cri-o conntrack
 sed -i 's@conmon = .*@conmon = "/bin/conmon"@' /etc/crio/crio.conf
+echo """[crio.network]
+plugin_dirs = [
+  "/opt/cni/bin/", "/usr/libexec/cni"
+]""" > /etc/crio/crio.conf.d/00-plugin-dir.conf
 {% if HTTP_PROXY is defined %}
 mkdir /etc/systemd/system/crio.service.d
 cat > /etc/systemd/system/crio.service.d/http_proxy.conf << EOF

diff --git a/kvirt/cluster/kubeadm/pre_ubuntu.sh b/kvirt/cluster/kubeadm/pre_ubuntu.sh
@@ -30,6 +30,10 @@ echo "deb [signed-by=/etc/apt/keyrings/cri-o-apt-keyring.gpg] https://pkgs.k8s.i
 apt-get update
 apt-get -y install cri-o cri-o-runc software-properties-common
 sed -i 's@conmon = .*@conmon = "/bin/conmon"@' /etc/crio/crio.conf
+echo """[crio.network]
+plugin_dirs = [
+  "/opt/cni/bin/", "/usr/libexec/cni"
+]""" > /etc/crio/crio.conf.d/00-plugin-dir.conf
 {% if HTTP_PROXY is defined %}
 mkdir /etc/systemd/system/crio.service.d
 cat > /etc/systemd/system/crio.service.d/http_proxy.conf << EOF