Rename cri sock #1175
Rename cri sock #1175
Conversation
mogren
force-pushed
the
rename-cri-sock
branch
from
5298477 to
86a94d7
Compare
mogren
force-pushed
the
rename-cri-sock
branch
from
86a94d7 to
19d52c3
Compare
| ], | ||
| }, | ||
| }, | ||
| containers: objectValues(self.containers_), | ||
| volumes: [ | ||
| {name: "cni-bin-dir", hostPath: {path: "/opt/cni/bin"}}, | ||
| {name: "cni-net-dir", hostPath: {path: "/etc/cni/net.d"}}, | ||
| {name: "dockershim", hostPath: {path: "/var/run/dockershim.sock"}}, | ||
| {name: "cri-sock", hostPath: {path: "/var/run/dockershim.sock"}}, |
There was a problem hiding this comment.
Should we just keep it as dockershim and update the readme with clear comments or have another sample config with cri sock?
There was a problem hiding this comment.
The point here is that it's not docker specific, it's "any CRI socket" that we mount inside the pod. That's why we want to rename it.
There was a problem hiding this comment.
Considering that Kubernetes is deprecating Docker, should this be merged? Would make make it easier to understand what changes are require for compatibility with containerd or cri-o.
It may be a good idea to also remove mentions to dockerSocketPath at same time:
amazon-vpc-cni-k8s/pkg/cri/cri.go
Lines 54 to 57 in 1c1d4b9
mogren
force-pushed
the
rename-cri-sock
branch
2 times, most recently
from
69dac30 to
a7f81a2
Compare
mogren
force-pushed
the
rename-cri-sock
branch
4 times, most recently
from
b003163 to
9883f62
Compare
mogren
force-pushed
the
rename-cri-sock
branch
2 times, most recently
from
47ba0a8 to
d1af209
Compare
mogren
force-pushed
the
rename-cri-sock
branch
from
d1af209 to
d101bdf
Compare
mogren
force-pushed
the
rename-cri-sock
branch
from
d101bdf to
339caa1
Compare
|
This pull request is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 14 days |
|
Pull request closed due to inactivity. |
|
Hi @jayanthvn, is there any chance of reopening this PR? We're not using dockershim. It would be great to be able to use the published manifests without additional patches. |
Issue #, if available: #783
Description of changes:
dockershim.socktocri.sockto make it more obvious where to change when using another container runtime.By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.