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

Use same addons script for init.d and systemd. #6384

Merged
merged 1 commit into from
Apr 2, 2015

Conversation

erictune
Copy link
Member

@erictune erictune commented Apr 2, 2015

No description provided.

@erictune
Copy link
Member Author

erictune commented Apr 2, 2015

Testing with kube-up.sh in progress.

@zmerlynn zmerlynn self-assigned this Apr 2, 2015
@zmerlynn
Copy link
Member

zmerlynn commented Apr 2, 2015

cc @derekwaynecarr, you may want to test this too

@derekwaynecarr
Copy link
Member

I just merged #6382 which fixed vagrant after yesterday's changes with etcd in pod. If it's not urgent, I cannot test this until early next week (out tomorrow).

# $2 count of tries to start the addon.
# $3 delay in seconds between two consecutive tries
function start_addon() {
addon=$1;
Copy link
Member

Choose a reason for hiding this comment

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

Make these locals in this PR and save some time in the other? :)

@zmerlynn
Copy link
Member

zmerlynn commented Apr 2, 2015

LGTM except minor nit (and obviously testing)

@erictune
Copy link
Member Author

erictune commented Apr 2, 2015

Tested by running kube-up and verifying all addons started.

@erictune
Copy link
Member Author

erictune commented Apr 2, 2015

Not going to fix nit since I already tested it and don't want to wait for another round of testing.

@zmerlynn
Copy link
Member

zmerlynn commented Apr 2, 2015

K. :)

zmerlynn added a commit that referenced this pull request Apr 2, 2015
Use same addons script for init.d and systemd.
@zmerlynn zmerlynn merged commit c627a35 into kubernetes:master Apr 2, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants