Merge pull request #49 from lima-vm/cni-plugins

Add LIMA_INSTALL_CNI_PLUGINS option

Author: jandubois

edition/min

@@ -1,6 +1,7 @@
 export LIMA_INSTALL_BINFMT_MISC=false
 export LIMA_INSTALL_CA_CERTIFICATES=false
 export LIMA_INSTALL_CLOUD_INIT=false
+export LIMA_INSTALL_CNI_PLUGINS=false
 export LIMA_INSTALL_DOCKER=false
 export LIMA_INSTALL_K3S=false
 export LIMA_INSTALL_IPTABLES=false

edition/rd

@@ -1,6 +1,7 @@
 source edition/min
 LIMA_INSTALL_BINFMT_MISC=true
 LIMA_INSTALL_CA_CERTIFICATES=true
+LIMA_INSTALL_CNI_PLUGINS=true
 LIMA_INSTALL_DOCKER=true
 LIMA_INSTALL_IPTABLES=true
 LIMA_INSTALL_LIMA_INIT=true

genapkovl-lima.sh

@@ -199,6 +199,10 @@ if [ "${LIMA_INSTALL_CA_CERTIFICATES}" == "true" ]; then
     echo "ca-certificates" >> "$tmp"/etc/apk/world
 fi
 
+if [ "${LIMA_INSTALL_CNI_PLUGINS}" == "true" ]; then
+    echo "cni-plugins" >> "$tmp"/etc/apk/world
+fi
+
 if [ "${LIMA_INSTALL_K3S}" == "true" ]; then
     echo "k3s" >> "$tmp"/etc/apk/world
     rc_add k3s default
@@ -221,10 +225,12 @@ if [ "${LIMA_INSTALL_NERDCTL}" == "true" ]; then
         cp "${tmp}/nerdctl/bin/${bin}" "${tmp}/usr/local/bin/${bin}"
         chmod u+s "${tmp}/usr/local/bin/${bin}"
     done
-    mkdir -p "${tmp}/usr/local/libexec/cni"
-    for plugin in bridge portmap firewall tuning isolation host-local; do
-        cp "${tmp}/nerdctl/libexec/cni/${plugin}" "${tmp}/usr/local/libexec/cni/${plugin}"
-    done
+    if [ "${LIMA_INSTALL_CNI_PLUGINS}" != "true" ]; then
+        mkdir -p "${tmp}/usr/local/libexec/cni"
+        for plugin in bridge portmap firewall tuning isolation host-local; do
+            cp "${tmp}/nerdctl/libexec/cni/${plugin}" "${tmp}/usr/local/libexec/cni/${plugin}"
+        done
+    fi
 fi
 
 if [ "${LIMA_INSTALL_SSHFS}" == "true" ]; then

mkimg.lima.sh

@@ -20,6 +20,9 @@ profile_lima() {
         if [ "${LIMA_INSTALL_CLOUD_INIT}" == "true" ]; then
             apks="$apks cloud-init"
         fi
+        if [ "${LIMA_INSTALL_CNI_PLUGINS}" == "true" ]; then
+            apks="$apks cni-plugins"
+        fi
         if [ "${LIMA_INSTALL_DOCKER}" == "true" ]; then
             apks="$apks libseccomp runc containerd tini-static device-mapper-libs"
             apks="$apks docker-engine docker-openrc docker-cli docker"