fix(kamel log): Use integration name for looking up containers #348
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
oscerd
approved these changes
Jan 21, 2019
|
@rhuss seems ok, did you test against knative ? |
lburgazzoli
reviewed
Jan 21, 2019
pkg/util/log/annotation_scraper.go
Outdated
| labelSelector string | ||
| podScrapers sync.Map | ||
| counter uint64 | ||
| } | ||
|
|
||
| // NewSelectorScraper creates a new SelectorScraper | ||
| func NewSelectorScraper(client kubernetes.Interface, namespace string, labelSelector string) *SelectorScraper { | ||
| func NewSelectorScraper(client kubernetes.Interface, namespace string, integrationName string, labelSelector string) *SelectorScraper { |
There was a problem hiding this comment.
if possible I would not use the name integration in this package
There was a problem hiding this comment.
Ok, what's about defaultContainerName ?
|
Yes, I have knative installed locally in minikube. |
|
Le me fix the build issue. |
|
can you squash the commits ? |
rhuss
force-pushed
the
pr/347/kamel-log-fix
branch
from
5426ac3
to
d6447fa
Compare
|
@lburgazzoli not sure about the build error. Seems to be unrelated to this PR ? |
Use integration name for looking up containers as a fallback if no container could be found. If no container could be identified even with the integration name, use the first container for the log, assuming its the "main" container. Fixes apache#347
|
looks like you need to rebase from master |
rhuss
force-pushed
the
pr/347/kamel-log-fix
branch
from
d6447fa
to
52fbe11
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.
Use integration name for looking up containers as a fallback if no
container could be found.
If no container could be identified even with the integration name,
use the first container for the log, assuming its the "main" container.
Fixes #347