I ran through https://docs.google.com/document/d/19Q4AzWLD5jd2FNaPyKy2xdTN4JIGUUpvwDwg0tcBkyc/edit# and was able to successfully upgrade my nodes when using upgrade.sh from this branch.

@saad-ali @davidopp

Can you add a comment explaining that you're doing this because sed doesn't work the expected way on Mac?

In the shell code?

yes

comment and extra check added to match https://github.com/kubernetes/kubernetes/blob/master/hack/make-rules/test-cmd.sh#L177

@jessfraz this looks broken in the 1.4 release branch as well (https://github.com/kubernetes/kubernetes/blob/release-1.4/cluster/gce/util.sh#L1713) so I'll create a cherry pick for both 1.5 and 1.4 once it merges.

LGTM

@zmerlynn - can you look at the kops error?

@k8s-bot aws e2e test this

@roberthbailey: It's either the same low-grade flake I've been chasing, or it's a residual issue off this morning. I'll try to watch this space.

Marking P0 because this is blocking manual upgrade testing on Mac.

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

Automatic merge from submit-queue

Commit found in the "release-1.5" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked.

Commit found in the "release-1.4" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked.