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: set container runtime socket to 'containerd.sock' #2173

Closed
wants to merge 1 commit into from
Closed

kubelet, containerd: set container runtime socket to 'containerd.sock' #2173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion packages/containerd/containerd-config-toml_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/dockershim.sock"
address = "/run/containerd/containerd.sock"

[plugins."io.containerd.grpc.v1.cri"]
enable_selinux = true
Expand Down
2 changes: 1 addition & 1 deletion packages/containerd/containerd-config-toml_k8s_nvidia
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/dockershim.sock"
address = "/run/containerd/containerd.sock"

[plugins."io.containerd.grpc.v1.cri"]
enable_selinux = true
Expand Down
2 changes: 2 additions & 0 deletions packages/containerd/containerd.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ Wants=network-online.target configured.target
Slice=runtime.slice
EnvironmentFile=/etc/network/proxy.env
EnvironmentFile=-/etc/containerd/nvidia.env
# We symlink the containerd socket for IPAMD which looks for dockershim.sock
ExecStartPre=/bin/ln -sf /run/containerd/containerd.sock /run/dockershim.sock
ExecStart=/usr/bin/containerd
Type=notify
Delegate=yes
Expand Down
4 changes: 2 additions & 2 deletions packages/kubernetes-1.19/kubelet-exec-start-conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ ExecStart=/usr/bin/kubelet \
{{/unless}}
--config /etc/kubernetes/kubelet/config \
--container-runtime=remote \
--container-runtime-endpoint=unix:///run/dockershim.sock \
--containerd=/run/dockershim.sock \
--container-runtime-endpoint=unix:///run/containerd/containerd.sock \
--containerd=/run/containerd/containerd.sock \
--network-plugin cni \
--root-dir /var/lib/kubelet \
--cert-dir /var/lib/kubelet/pki \
Expand Down
2 changes: 1 addition & 1 deletion packages/kubernetes-1.19/kubelet.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ EnvironmentFile=/etc/kubernetes/kubelet/env
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 \
--containerd-socket=/run/dockershim.sock \
--containerd-socket=/run/containerd/containerd.sock \
--namespace=k8s.io \
pull-image \
--source=${POD_INFRA_CONTAINER_IMAGE} \
Expand Down
4 changes: 2 additions & 2 deletions packages/kubernetes-1.20/kubelet-exec-start-conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ ExecStart=/usr/bin/kubelet \
{{/unless}}
--config /etc/kubernetes/kubelet/config \
--container-runtime=remote \
--container-runtime-endpoint=unix:///run/dockershim.sock \
--containerd=/run/dockershim.sock \
--container-runtime-endpoint=unix:///run/containerd/containerd.sock \
--containerd=/run/containerd/containerd.sock \
--network-plugin cni \
--root-dir /var/lib/kubelet \
--cert-dir /var/lib/kubelet/pki \
Expand Down
2 changes: 1 addition & 1 deletion packages/kubernetes-1.20/kubelet.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ EnvironmentFile=/etc/kubernetes/kubelet/env
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 \
--containerd-socket=/run/dockershim.sock \
--containerd-socket=/run/containerd/containerd.sock \
--namespace=k8s.io \
pull-image \
--source=${POD_INFRA_CONTAINER_IMAGE} \
Expand Down
4 changes: 2 additions & 2 deletions packages/kubernetes-1.21/kubelet-exec-start-conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ ExecStart=/usr/bin/kubelet \
{{/unless}}
--config /etc/kubernetes/kubelet/config \
--container-runtime=remote \
--container-runtime-endpoint=unix:///run/dockershim.sock \
--containerd=/run/dockershim.sock \
--container-runtime-endpoint=unix:///run/containerd/containerd.sock \
--containerd=/run/containerd/containerd.sock\
--network-plugin cni \
--root-dir /var/lib/kubelet \
--cert-dir /var/lib/kubelet/pki \
Expand Down
2 changes: 1 addition & 1 deletion packages/kubernetes-1.21/kubelet.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ EnvironmentFile=/etc/kubernetes/kubelet/env
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 \
--containerd-socket=/run/dockershim.sock \
--containerd-socket=/run/containerd/containerd.sock\
--namespace=k8s.io \
pull-image \
--source=${POD_INFRA_CONTAINER_IMAGE} \
Expand Down
4 changes: 2 additions & 2 deletions packages/kubernetes-1.22/kubelet-exec-start-conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ ExecStart=/usr/bin/kubelet \
{{/unless}}
--config /etc/kubernetes/kubelet/config \
--container-runtime=remote \
--container-runtime-endpoint=unix:///run/dockershim.sock \
--containerd=/run/dockershim.sock \
--container-runtime-endpoint=unix:///run/containerd/containerd.sock \
--containerd=/run/containerd/containerd.sock \
--network-plugin cni \
--root-dir /var/lib/kubelet \
--cert-dir /var/lib/kubelet/pki \
Expand Down
2 changes: 1 addition & 1 deletion packages/kubernetes-1.22/kubelet.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ EnvironmentFile=/etc/kubernetes/kubelet/env
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 \
--containerd-socket=/run/dockershim.sock \
--containerd-socket=/run/containerd/containerd.sock\
--namespace=k8s.io \
pull-image \
--source=${POD_INFRA_CONTAINER_IMAGE} \
Expand Down