Use default containerd socket path (#724)

* Use default containerd socket path * Create symlink so aws-node can talk to containerd
awslabs · Sep 17, 2021 · 9576786 · 9576786
1 parent d03b2ac
commit 9576786
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/files/bootstrap.sh b/files/bootstrap.sh
@@ -412,6 +412,7 @@ if [[ "$CONTAINER_RUNTIME" = "containerd" ]]; then
     sudo mv /etc/eks/containerd/kubelet-containerd.service /etc/systemd/system/kubelet.service
     sudo chown root:root /etc/systemd/system/kubelet.service
     sudo chown root:root /etc/systemd/system/sandbox-image.service
+    ln -sf /run/containerd/containerd.sock /run/dockershim.sock
     systemctl daemon-reload
     systemctl enable containerd
     systemctl restart containerd

diff --git a/files/containerd-config.toml b/files/containerd-config.toml
@@ -3,7 +3,7 @@ root = "/var/lib/containerd"
 state = "/run/containerd"
 
 [grpc]
-address = "/run/dockershim.sock"
+address = "/run/containerd/containerd.sock"
 
 [plugins."io.containerd.grpc.v1.cri".containerd]
 default_runtime_name = "runc"

diff --git a/files/kubelet-containerd.service b/files/kubelet-containerd.service
@@ -10,7 +10,7 @@ ExecStart=/usr/bin/kubelet --cloud-provider aws \
     --config /etc/kubernetes/kubelet/kubelet-config.json \
     --kubeconfig /var/lib/kubelet/kubeconfig \
     --container-runtime remote \
-    --container-runtime-endpoint unix:///run/dockershim.sock \
+    --container-runtime-endpoint unix:///run/containerd/containerd.sock \
     --network-plugin cni $KUBELET_ARGS $KUBELET_EXTRA_ARGS
 
 Restart=on-failure