logs: select manager container when multiple exist #2844
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
48a2aa6 to
34654dd
Compare
|
Any unit tests? |
|
@ebourgeois not within reach of the time I have available now, but could be added by someone else. |
|
Tested this manually with a patched flux deployment with nginx pods. Without this change, it results in: $ flux logs -A
✗ a container name must be specified for pod helm-controller-f6b8574b6-4zvp5, choose one of: [nginx manager]With this change: $ flux logs -A
2022-06-16T18:49:24.764Z info - Metrics server is starting to listen
2022-06-16T18:49:24.764Z info - starting manager
2022-06-16T18:49:24.764Z info - Starting server
2022-06-16T18:49:24.764Z info - Starting server
2022-06-16T18:49:24.870Z info HelmRelease - Starting EventSource
2022-06-16T18:49:24.870Z info HelmRelease - Starting EventSource
2022-06-16T18:49:24.870Z info HelmRelease - Starting Controller
... |
This sets the container to `manager` which is used by all Flux controllers as the container name. The other options I thought about were selecting the first, or doing something with image detection. But both can be sensitive to either users adding their patch as a first entry, or e.g. mirroring the image to a different name. Signed-off-by: Hidde Beydals <hello@hidde.co>
34654dd to
d12e697
Compare
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.
This sets the container to
managerwhich is used by all Fluxcontrollers as the container name.
The other options I thought about were selecting the first, or doing
something with image detection. But both can be sensitive to either
users adding their patch as a first entry, or e.g. mirroring the image
to a different name.
Fixes #2843