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.

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

Merged
merged 1 commit into from
Jan 4, 2018

Conversation

surajssd
Copy link
Member

@surajssd surajssd commented Dec 2, 2017

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.

Fixes #2261

@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Dec 2, 2017
@minikube-bot
Copy link
Collaborator

Can one of the admins verify this patch?

@r2d4
Copy link
Contributor

r2d4 commented Dec 2, 2017

@minikube-bot ok to test

Copy link
Contributor

@r2d4 r2d4 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@surajssd
Copy link
Member Author

surajssd commented Dec 3, 2017

@vbatts do you mind reviewing this PR!

Copy link
Contributor

@dlorenc dlorenc left a 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?

@surajssd
Copy link
Member Author

@dlorenc how do I create the symlink? I mean where should this happen?

@dlorenc
Copy link
Contributor

dlorenc commented Dec 11, 2017

@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.

@vbatts
Copy link
Contributor

vbatts commented Dec 11, 2017 via email

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>
@@ -0,0 +1 @@
crio/crio.sock
Copy link
Member Author

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!

@dlorenc dlorenc merged commit 5d7d751 into kubernetes:master Jan 4, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants