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

Fix Vagrant kube-up - missed file watch on systemd stops kubelet starting on initial kube-up #10492

Merged
merged 1 commit into from
Jul 1, 2015

Conversation

derekwaynecarr
Copy link
Member

The Kubelet was not starting because service.running phase of Kubelet was executing before the service file was authored to disk when on systemd environment.

Fixes #10522

@derekwaynecarr
Copy link
Member Author

RIght now vagrant kube-up is broken without this fix. So while we iterate on #10488, it would be good if we can merge this change. fyi @justinsb

@derekwaynecarr derekwaynecarr changed the title Missing file watch on systemd stops kubelet starting on kube-up Fix Vagrant kube-up - missed file watch on systemd stops kubelet starting on initial kube-up Jun 29, 2015
@k8s-bot
Copy link

k8s-bot commented Jun 29, 2015

GCE e2e build/test failed for commit 5122ea42f45e04d1e0573f8fc3fcd8f3d6230de4.

@justinsb
Copy link
Member

LGTM; I'll have a merge conflict but no big deal. As I commented on #10488, I worry that we have deeper issues with Salt & systemd (saltstack/salt#16778), but we should express our dependencies (as in this PR) even if Salt isn't doing the right thing.

@derekwaynecarr derekwaynecarr force-pushed the add_watch_service_file branch from 5122ea4 to de78898 Compare July 1, 2015 13:59
@derekwaynecarr
Copy link
Member Author

@zmerlynn - can you look at this today? it is blocking basic creation of kube cluster.

@zmerlynn
Copy link
Member

zmerlynn commented Jul 1, 2015

@derekwaynecarr: Absolutely, when I saw that I screwed up it not making 0.20.2, I hung my head in shame. But we may actually have a 0.20.3.

@zmerlynn
Copy link
Member

zmerlynn commented Jul 1, 2015

LGTM

@zmerlynn zmerlynn added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 1, 2015
@zmerlynn
Copy link
Member

zmerlynn commented Jul 1, 2015

@dchen1107 for rubber stamp

@k8s-bot
Copy link

k8s-bot commented Jul 1, 2015

GCE e2e build/test passed for commit de78898.

@zmerlynn
Copy link
Member

zmerlynn commented Jul 1, 2015

Cherrypick for 0.20. #10409

@dchen1107
Copy link
Member

LGTM.

Thanks for fixing it.

@dchen1107
Copy link
Member

@thockin second TL approval, please?

@thockin
Copy link
Member

thockin commented Jul 1, 2015

LGTM

zmerlynn added a commit that referenced this pull request Jul 1, 2015
Fix Vagrant kube-up - missed file watch on systemd stops kubelet starting on initial kube-up
@zmerlynn zmerlynn merged commit 3094c16 into kubernetes:master Jul 1, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm "Looks good to me", indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants