Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Feb 27, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91810c8
kubelet, containerd: replace 'containerd.sock' with 'dockershim.sock'
etungsten Feb 27, 2020
ed00d96
Update changelog v0.3.0 to include ctr runtime endpoint socket change
etungsten Feb 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion packages/containerd/containerd-config-toml_aws-k8s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions packages/kubernetes/kubelet.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down