cli: support url with addon-config flag#4666
Merged
Pothulapati merged 2 commits intomainfrom Jul 2, 2020
Merged
Conversation
Signed-off-by: Tarun Pothulapati <[email protected]>
zaharidichev
approved these changes
Jun 25, 2020
Member
zaharidichev
left a comment
zaharidichev
left a comment
There was a problem hiding this comment.
LGTM, just a minor suggestion
cli/cmd/install.go
Outdated
| // Read a resource file from a path or URL | ||
| func readFile(path string) ([]byte, error) { | ||
| if isValidURL(path) { | ||
| resp, err := http.Get(path) |
Member
There was a problem hiding this comment.
I wonder whether we can extract the logic that is here https://github.com/linkerd/linkerd2/blob/main/cli/cmd/inject_util.go#L152 into something that we can reuse right here.
Contributor
There was a problem hiding this comment.
That's a good idea. Sounds like we might even be able to reuse the entire read() function.
ihcsim
reviewed
Jun 25, 2020
cli/cmd/install.go
Outdated
| // Read a resource file from a path or URL | ||
| func readFile(path string) ([]byte, error) { | ||
| if isValidURL(path) { | ||
| resp, err := http.Get(path) |
Contributor
There was a problem hiding this comment.
That's a good idea. Sounds like we might even be able to reuse the entire read() function.
Signed-off-by: Tarun Pothulapati <[email protected]>
ihcsim
approved these changes
Jun 26, 2020
Merged
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Fixes #4664
This PR makes
--addon-configto also read from URL's.Adds a new readFile func which can read from a file path or a url
To Test:
/bin/go-run cli install --ignore-cluster --addon-config https://gist.githubusercontent.com/Pothulapati/b8ed9472dac445f50b104365a54f8c37/raw/d84d52329f5941edacdd809958a3cfbc17a077b6/addon-config.yaml | code -Signed-off-by: Tarun Pothulapati [email protected]