Merge pull request #796 from bottlerocket-os/change-socks

kubelet, containerd: replace 'containerd.sock' with 'dockershim.sock'

CHANGELOG.md

@@ -40,6 +40,7 @@ This is not done lightly, but had to be done to accommodate all we've learned du
 * Update dependencies of Rust packages ([#738], [#730]).
 * Rename `moondog` to `early-boot-config` ([#757]).
 * Update admin and control containers to v0.4.0 ([#789]).
+* Update container runtime socket path to more common `/run/dockershim.sock` ([#796])
 
 ## Documentation
 
@@ -144,6 +145,7 @@ This is not done lightly, but had to be done to accommodate all we've learned du
 [#788]: https://github.com/bottlerocket-os/bottlerocket/pull/788
 [#789]: https://github.com/bottlerocket-os/bottlerocket/pull/789
 [#790]: https://github.com/bottlerocket-os/bottlerocket/pull/790
+[#796]: https://github.com/bottlerocket-os/bottlerocket/pull/796
 
 # v0.2.1 (2020-01-20)
 

packages/containerd/containerd-config-toml_aws-k8s

@@ -10,7 +10,7 @@ disabled_plugins = [
 ]
 
 [grpc]
-address = "/run/containerd/containerd.sock"
+address = "/run/dockershim.sock"
 
 [plugins."io.containerd.grpc.v1.cri"]
 enable_selinux = true

packages/kubernetes/kubelet.service

@@ -12,14 +12,14 @@ ExecStartPre=/sbin/iptables -P FORWARD ACCEPT
 # Pull the pause container image before starting `kubelet` so `containerd/cri` wouldn't have to
 ExecStartPre=/usr/bin/host-ctr -source ${POD_INFRA_CONTAINER_IMAGE} \
     -pull-image-only \
-    -containerd-socket /run/containerd/containerd.sock \
+    -containerd-socket /run/dockershim.sock \
     -namespace k8s.io
 ExecStart=/usr/bin/kubelet \
     --cloud-provider aws \
     --config /etc/kubernetes/kubelet/config \
     --kubeconfig /etc/kubernetes/kubelet/kubeconfig \
     --container-runtime=remote \
-    --container-runtime-endpoint=unix:///run/containerd/containerd.sock \
+    --container-runtime-endpoint=unix:///run/dockershim.sock \
     --network-plugin cni \
     --root-dir /var/lib/kubelet \
     --cert-dir /var/lib/kubelet/pki \