Fix local-cluster-up on Mac and discovery on all systems #38389
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
Contributor
sttts
commented
Dec 8, 2016
sttts
commented
- use cfssl on the host, not from Docker. Solves a number of permission problem with selinux and Mac
- fix discovery startup
k8s-ci-robot
added
the
cncf-cla: yes
|
This change is |
sttts
changed the title
sttts
force-pushed
the
sttts-local-cluster-up-on-mac
branch
from
c356a58
to
c5b6628
Compare
|
roll in #38359 too |
|
Actually, lets just make the whole thing switchable on |
k8s-github-robot
added
size/S
0xmichalis
reviewed
Dec 8, 2016
| @@ -147,6 +147,14 @@ function test_docker { | |||
| fi | |||
| } | |||
|
|
|||
| function test_cfssl { | |||
There was a problem hiding this comment.
Should be test_cfssl_installed
0xmichalis
reviewed
Dec 8, 2016
| @@ -147,6 +147,14 @@ function test_docker { | |||
| fi | |||
| } | |||
|
|
|||
| function test_cfssl { | |||
| if ! cfssl &>/dev/null || ! cfssljson &>/dev/null; then | |||
There was a problem hiding this comment.
cfssljson seems to hang for me (probably because it waits for something in stdin). How about using which or something else to verify the binary exists?
sttts
force-pushed
the
sttts-local-cluster-up-on-mac
branch
from
c5b6628
to
49e9247
Compare
sttts
force-pushed
the
sttts-local-cluster-up-on-mac
branch
from
49e9247
to
983fc20
Compare
k8s-github-robot
added
size/M
0xmichalis
added
release-note-none
|
LGTM, unbreaks hack/local-up-cluster.sh on master |
|
@deads2k do you want something more here? |
0xmichalis
added
the
priority/critical-urgent
deads2k
added
lgtm
this looks fine. |
|
Automatic merge from submit-queue |
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.