Revert "Support calico with containerd 1.6"

This reverts commit 4616160.
mheler · Aug 28, 2023 · c3bfba2 · c3bfba2
1 parent 29906e0
commit c3bfba2
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/magnum/drivers/common/templates/kubernetes/fragments/install-cri.sh b/magnum/drivers/common/templates/kubernetes/fragments/install-cri.sh
@@ -29,13 +29,9 @@ if [ "${CONTAINER_RUNTIME}" = "containerd"  ] ; then
         exit 1
     fi
     $ssh_cmd tar xzvf /srv/magnum/cri-containerd.tar.gz -C / --no-same-owner --touch --no-same-permissions
-
-    # NOTE(dalees): We need to set CNI bin_dir to match where Calico and cri-containerd.tar.gz writes (/usr is mounted readonly).
-    sed -i 's#bin_dir = "/usr/libexec/cni/"#bin_dir = "/opt/cni/bin/"#' /etc/containerd/config.toml
-
     $ssh_cmd systemctl daemon-reload
     $ssh_cmd systemctl enable containerd
-    $ssh_cmd systemctl restart containerd
+    $ssh_cmd systemctl start containerd
 else
     # CONTAINER_RUNTIME=host-docker
     $ssh_cmd systemctl disable docker