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

First hack at upgrade script for GCE #6427

Merged
merged 2 commits into from
Apr 6, 2015

Conversation

zmerlynn
Copy link
Member

@zmerlynn zmerlynn commented Apr 3, 2015

Address #6075: Shoot the master VM while saving the master-pd. This
takes a couple of minor changes to configure-vm.sh, some of which also
would be necessary for reboot. In particular, I changed it so that the
kube-token instance metadata is no longer required after inception;
instead, we mount the master-pd and see if we've already created the
known tokens file before blocking on the instance metadata.

Also partially addresses #6099 in bash by refactoring the kube-push
path.

@zmerlynn
Copy link
Member Author

zmerlynn commented Apr 3, 2015

cc @mbforbes

@@ -82,6 +73,19 @@ for k,v in yaml.load(sys.stdin).iteritems():
fi
}

function maybe-get-kube-token() {
Copy link
Contributor

Choose a reason for hiding this comment

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

I think ensure- is the convention for these semantics? I think it's also a little clearer.

Copy link
Member Author

Choose a reason for hiding this comment

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

Done

@mbforbes
Copy link
Contributor

mbforbes commented Apr 4, 2015

Thanks, Zach. Looking good mod comments; ping me when you've addressed them. Will be great to get to start testing this out (& I can hack on the nodes part as soon as this is in).

Address kubernetes#6075: Shoot the master VM while saving the master-pd. This
takes a couple of minor changes to configure-vm.sh, some of which also
would be necessary for reboot. In particular, I changed it so that the
kube-token instance metadata is no longer required after inception;
instead, we mount the master-pd and see if we've already created the
known tokens file before blocking on the instance metadata.

Also partially addresses kubernetes#6099 in bash by refactoring the kube-push
path.
@zmerlynn
Copy link
Member Author

zmerlynn commented Apr 5, 2015

PTAL. I think I addressed your comments, except the refactoring of the master init and the bangs.

@zmerlynn
Copy link
Member Author

zmerlynn commented Apr 6, 2015

I played around with that refactor and agree it looks fine. So, yes, TOTAL PTAL.

@zmerlynn
Copy link
Member Author

zmerlynn commented Apr 6, 2015

(I kept it on a separate commit for easier reviewability, though.)

@mbforbes mbforbes added lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed area/upgrade labels Apr 6, 2015
@rjnagal
Copy link
Contributor

rjnagal commented Apr 6, 2015

LGTM

rjnagal added a commit that referenced this pull request Apr 6, 2015
First hack at upgrade script for GCE
@rjnagal rjnagal merged commit 1ecb926 into kubernetes:master Apr 6, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/upgrade 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.

4 participants