contrib/vagrant: only ssh to k8s1 if vagrant up suceeded #10049
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
|
Release note label not set, please set the appropriate release note. |
aanm
added
release-note/misc
rolinh
reviewed
Feb 4, 2020
In case `vagrant up` returned with non-zero status (e.g. due to being canceled or the initial box download failing), the script would still attempt to `vagrant ssh` to k8s1 and print a message in case $K8S is non-zero. Fix this by only executing `vagrant ssh k8s1` if `vagrant up` was successful. Also fix indentation. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
rolinh
approved these changes
Feb 4, 2020
|
test-me-please |
aanm
added
the
dont-merge/wait-until-release
aanm
removed
the
dont-merge/wait-until-release
aanm
approved these changes
Feb 18, 2020
pchaigno
added a commit
that referenced
this pull request
Feb 21, 2020
Pull request #10049 changed the way K8S is checked in the start.sh script to try and enable the "K8S=0" syntax to disable the Kubernetes build. This change results in the following warning when K8S is unset: ./contrib/vagrant/start.sh: line 607: [: : integer expression expected This commit reverts that specific change. K8S should be 1 or unset to enable or disable the Kubernetes build respectively. Signed-off-by: Paul Chaignon <paul@cilium.io>
aanm
pushed a commit
that referenced
this pull request
Feb 21, 2020
Pull request #10049 changed the way K8S is checked in the start.sh script to try and enable the "K8S=0" syntax to disable the Kubernetes build. This change results in the following warning when K8S is unset: ./contrib/vagrant/start.sh: line 607: [: : integer expression expected This commit reverts that specific change. K8S should be 1 or unset to enable or disable the Kubernetes build respectively. Signed-off-by: Paul Chaignon <paul@cilium.io>
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.
In case
vagrant upreturned with non-zero status (e.g. due to beingcanceled or the initial box download failing), the script would still
attempt to
vagrant sshto k8s1 and print a message in case $K8S isnon-zero. Fix this by only executing
vagrant ssh k8s1ifvagrant upwas successful. Also fix indentation.
Signed-off-by: Tobias Klauser tklauser@distanz.ch
This change is