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

Automated cherry pick of #23776 #23938

Conversation

zmerlynn
Copy link
Member

@zmerlynn zmerlynn commented Apr 6, 2016

Cherry pick of #23776 on release-1.2.

justinsb added 2 commits April 6, 2016 13:10
format-disks used to run with non-strict bash semantics, but this changed in
1.2 as we now merge it into the GCE script, so pipefail and errexit are both
set.

However, the way we list the ephemeral disks, by piping to grep, would cause an
exit code of 2 if there were no ephemeral disks.

Tolerate failure here by add `|| true`.  The metadata service call is unlikely
to fail, so we continue to ignore that possibility.
We rename it to EPHEMERAL_BLOCK_DEVICE_MAPPINGS, and we also change the value
so that it starts with a `,`, instead of always inserting a comma before it.
In this way the value can be empty.

Also, if the user sets the (currently experimental) KUBE_AWS_STORAGE
environment variable to be "ebs", then we will not mount any instance storage
which will cause the machines to use EBS storage instead.
@googlebot
Copy link

We found a Contributor License Agreement for you (the sender of this pull request) and all commit authors, but as best as we can tell these commits were authored by someone else. If that's the case, please add them to this pull request and have them confirm that they're okay with these commits being contributed to Google. If we're mistaken and you did author these commits, just reply here to confirm.

@roberthbailey roberthbailey added lgtm "Looks good to me", indicates that a PR is ready to be merged. cla: human-approved labels Apr 6, 2016
@k8s-github-robot
Copy link

Labelling this PR as size/S

@k8s-github-robot k8s-github-robot added this to the v1.2 milestone Apr 6, 2016
@k8s-github-robot k8s-github-robot added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Apr 6, 2016
@k8s-github-robot
Copy link

Removing LGTM because the release note process has not been followed.
One of the following labels is required "release-note", "release-note-none", or "release-note-action-required"
Please see: https://github.com/kubernetes/kubernetes/blob/master/docs/proposals/release-notes.md

@k8s-github-robot k8s-github-robot added release-note-label-needed and removed lgtm "Looks good to me", indicates that a PR is ready to be merged. labels Apr 6, 2016
@zmerlynn zmerlynn added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-label-needed labels Apr 6, 2016
@zmerlynn zmerlynn assigned roberthbailey and unassigned eparis Apr 6, 2016
@zmerlynn zmerlynn added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 6, 2016
@k8s-bot
Copy link

k8s-bot commented Apr 6, 2016

GCE e2e build/test passed for commit 55d9dec.

@zmerlynn zmerlynn merged commit 63e2af2 into kubernetes:release-1.2 Apr 6, 2016
shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
…ck-of-#23776-upstream-release-1.2

Automated cherry pick of kubernetes#23776
shouhong pushed a commit to shouhong/kubernetes that referenced this pull request Feb 14, 2017
…ck-of-#23776-upstream-release-1.2

Automated cherry pick of kubernetes#23776
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. 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.

8 participants