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

Still generate docker.service unit, even if unused #3560

Merged
merged 1 commit into from
Jan 25, 2019

Conversation

afbjorklund
Copy link
Collaborator

The dynamically generated docker.service file should still be there,
otherwise the statically provided docker.socket file gets confused.

The dynamically generated docker.service file should still be there,
otherwise the statically provided docker.socket file gets confused.
@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 Jan 20, 2019
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: afbjorklund
To fully approve this pull request, please assign additional approvers.
We suggest the following additional approver: balopat

If they are not already assigned, you can assign the PR to them by writing /assign @balopat in a comment when ready.

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@gbraad
Copy link
Contributor

gbraad commented Jan 20, 2019

otherwise the statically provided docker.socket file gets confused.

who creates this file? Else I would move this out and make this part of the actual service unit instead. This seems like a workaround instead of addressing the actual issue.

@afbjorklund
Copy link
Collaborator Author

afbjorklund commented Jan 20, 2019

It is included in the ISO, they used to both be before the service unit was configurable

Here: 56e250e and 0db44af

@gbraad
Copy link
Contributor

gbraad commented Jan 20, 2019

I would suggest to not use docker.socket as systemd-unit by default, unless Docker is really used as the container runtime... cause I think you are tryin to solve this for when an alternative runtime is used. like cri-o. Right?

@afbjorklund
Copy link
Collaborator Author

Since we are using docker-machine to create the VM, then docker is supposed to always be there when we start - and then we stop it and start the desired runtime before starting up the rest of kubernetes.
The file was there before, but it was removed by mistake in ed8f712 . A better fix would be to move the configuration out of the unit, so that it can be included in the ISO file. For instance to /etc/docker.

@tstromberg tstromberg merged commit 31eb53c into kubernetes:master Jan 25, 2019
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.

4 participants