-
Notifications
You must be signed in to change notification settings - Fork 4.9k
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.
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
Change the cri-o socket location to upstream default #2262
Conversation
Can one of the admins verify this patch? |
@minikube-bot ok to test |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm
@vbatts do you mind reviewing this PR! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Note that this will probably "break" if minikube and the ISO mismatch - the old iso will still have the version of crio.conf that's listening on /var/run/crio.sock instead of the new location.
If that's a problem, we could add a symlink. What do you think?
@dlorenc how do I create the symlink? I mean where should this happen? |
Hmm, we might be able to do it with a static rootfs overlay here: https://github.com/kubernetes/minikube/tree/master/deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/var If you make a relative symlink there, I think it should just work. It would have the drawback of existing before the actual socket (and being a dead link), but would be simple. The other approach would be to add an |
possibly. but /run and /var/run are often mounted tmpfs. So anything added
to the rootfs will be clobbered.
…On Mon, Dec 11, 2017 at 11:13 AM dlorenc ***@***.***> wrote:
@dlorenc <https://github.com/dlorenc> how do I create the symlink? I mean
where should this happen?
Hmm, we might be able to do it with a static rootfs overlay here:
https://github.com/kubernetes/minikube/tree/master/deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/var
If you make a relative symlink there, I *think* it should just work. It
would have the drawback of existing before the actual socket (and being a
dead link), but would be simple.
The other approach would be to add an ln -s command as ExecStartPost in
the unit file.
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#2262 (comment)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AAEF6SJOy606tfepb8hYjrn2VkNt97Dwks5s_VSVgaJpZM4QzZ9f>
.
|
Right now the cri-o socket is placed in `/var/run/crio.sock`, this commit changes it to `/var/run/crio/crio.sock` which is similar to upstream. Signed-off-by: Suraj Deshmukh <surajd.service@gmail.com>
7dcdbc1
to
74fcf32
Compare
@@ -0,0 +1 @@ | |||
crio/crio.sock |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@dlorenc I have made the changes PTAL!
Right now the cri-o socket is placed in
/var/run/crio.sock
, thiscommit changes it to
/var/run/crio/crio.sock
which is similar toupstream.
Fixes #2261