Add support for json output in inject and uninject commands #12600
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
Signed-off-by: Alex Leong <[email protected]>
alpeb
reviewed
May 17, 2024
cli/cmd/inject_util.go
Outdated
Comment on lines
273
to
275
| type lineReader struct { | ||
| reader *bufio.Reader | ||
| } |
There was a problem hiding this comment.
From what I can see, this reader only admits a single-line json, which is very limiting. Instead, how about assuming first the input is json, try unmarhalling, and if that fails, fallback to using the yaml reader?
There was a problem hiding this comment.
The only reason we needed to be able to handle json input here at all is because we perform an uninject step before injecting and the uninject was producing json output when -o json was specified (which meant that we needed to handle json input during inject).
I've updated this so that the uninject that happens as a first step to inject will always produce yaml as its (intermediate) output so that we don't need to add json input support at all.
Signed-off-by: Alex Leong <[email protected]>
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.
We add support for the
--output/-oflag inlinkerd injectandlinkerd uninjectcommands. The supported output formats are yaml (default) and json. Kubectl is able to accept both of these formats which means thatlinkerd injectandlinkerd uninjectoutput can be piped into kubectl regardless of which output format is used.