kuma-dp: improve envoy binary lookup #268
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
dhruv
approved these changes
Sep 17, 2019
gszr
force-pushed
the
fix/envoy-path
branch
2 times, most recently
from
f530a84 to
223377f
Compare
- Search in configured path - Fallback to same directory as kuma-dp
gszr
force-pushed
the
fix/envoy-path
branch
from
223377f to
91604a9
Compare
dhruv
approved these changes
Sep 17, 2019
yskopets
reviewed
Sep 18, 2019
| @@ -38,6 +41,49 @@ type Envoy struct { | |||
| opts Opts | |||
| } | |||
|
|
|||
| func getSelfPath() (string, error) { | |||
There was a problem hiding this comment.
getSelfDir() seems to be a more accurate name
There was a problem hiding this comment.
The string returned by this function is the actual full path of the binary, so it's more accurate to call it "path".
| } | ||
| } | ||
|
|
||
| return "", errors.New("could not find binary") |
There was a problem hiding this comment.
can we change the message to .Errorf("could not find Envoy binary at any of the following locations: %v", candidatePaths) ?
| resolvedPath, err := lookupEnvoyPath(binaryPathConfig) | ||
| if err != nil { | ||
| runLog.Error(err, "Envoy binary not found; make sure it is in PATH or in the same directory as "+os.Args[0]) | ||
| return nil |
There was a problem hiding this comment.
At the moment, if envoy binary is not found, konvoy-dp exists with status code 0 and prints nothing on the console.
You should return the error instead of logging it.
| @@ -51,6 +97,13 @@ func (e *Envoy) Run(stop <-chan struct{}) error { | |||
| ctx, cancel := context.WithCancel(context.Background()) | |||
| defer cancel() | |||
|
|
|||
| binaryPathConfig := e.opts.Config.DataplaneRuntime.BinaryPath | |||
| resolvedPath, err := lookupEnvoyPath(binaryPathConfig) | |||
| if err != nil { | |||
There was a problem hiding this comment.
Can we have a unit test for this ?
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.
Summary
Fixes #249