Add enable-docker-bridge bootstrap argument #187
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
nckturner
reviewed
Feb 15, 2019
| @@ -142,6 +149,12 @@ Environment='KUBELET_EXTRA_ARGS=$KUBELET_EXTRA_ARGS' | |||
| EOF | |||
| fi | |||
|
|
|||
| if [[ "$ENABLE_DOCKER_BRIDGE" = "true" ]]; then | |||
| # Enabling live-restore prevents docker from recreating the default bridge network | |||
| jq '.bridge="docker0" | ."live-restore"=false' /etc/docker/daemon.json | tee /etc/docker/daemon.json | |||
There was a problem hiding this comment.
Can you reword the comment to agree with the state we are setting here? E.g. "Disabling..."
* Updated changelog git command
micahhausler
force-pushed
the
enable-bridge-option
branch
from
f24d1b4 to
5b96c22
Compare
nckturner
approved these changes
Feb 15, 2019
msvechla
reviewed
Feb 19, 2019
| @@ -51,6 +52,11 @@ while [[ $# -gt 0 ]]; do | |||
| shift | |||
| shift | |||
| ;; | |||
| --enable-docker-bridge) | |||
| ENABLE_DOCKER_BIDGE=$2 | |||
There was a problem hiding this comment.
There is a typo here, I just spent an hour debugging this! Can you please release a hotfix for this?
There was a problem hiding this comment.
Yeah, this is a bit unfortunate.
0xAhmed
reviewed
Feb 19, 2019
| if [[ "$ENABLE_DOCKER_BRIDGE" = "true" ]]; then | ||
| # Enabling the docker bridge network. We have to disable live-restore as it | ||
| # prevents docker from recreating the default bridge network on restart | ||
| jq '.bridge="docker0" | ."live-restore"=false' /etc/docker/daemon.json | tee /etc/docker/daemon.json |
There was a problem hiding this comment.
Passing --enable-docker-bridge true appears to override /etc/docker/daemon.json leaving it empty 🤔. I believe tee can cause unexpected results when used in combination with jq.
There was a problem hiding this comment.
I noticed that as well, this should be fixed in addition to the typo
5 tasks
5 tasks
2 tasks
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.
Issue #, if available:
Fixes #183
Description of changes:
The default will be to leave the bridge network disabled, but users can now add
--enable-docker-bridge trueas a bootstrap argument in order to preserve the old behavior.By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.