AWS kube-up: tolerate a lack of ephemeral volumes #23776
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.
|
Labelling this PR as size/S |
k8s-github-robot
added
size/S
|
GCE e2e build/test passed for commit f43f398. |
|
@justinsb, I have tested this PR with release 1.2.1, it works great using a cluster composed of 1 master and 2 host nodes all m3.medium. Thanks a lot! |
|
I'm marking this as a cherrypick-candidate, because it is not very invasive, and because we've had user friction with:
|
|
Removing label |
eparis
added
lgtm
|
Automatic merge from submit-queue |
roberthbailey
added
the
cherry-pick-approved
zmerlynn
added a commit
that referenced
this pull request
Apr 6, 2016
…76-upstream-release-1.2 Automated cherry pick of #23776
|
@eparis: Any idea why |
|
@zmerlynn no, I have no idea. It looks like it should have been found/automatically cleaned up. I'll try to put it on my list of things to looks at. |
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Some users have requested the ability to not use ephemeral volumes (local instance storage), but this also highlighted the fact that we likely fail to start on instance types with no instance storage (e.g. the c4 class instances).
Confirming this fix, and then going to confirm that e.g. c4 is broken. If so this will be a cherry-pick candidate.