Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

accesslog: fallback to meshconfig when built-in provider's format is unset #40851

Merged
merged 2 commits into from
Sep 21, 2022

Conversation

zirain
Copy link
Member

@zirain zirain commented Sep 7, 2022

Please provide a description of this PR:

this's a follow up of #39521 (comment)

cc @douglas-reid @ramaraochavali

@zirain zirain requested a review from a team as a code owner September 7, 2022 09:04
@istio-testing istio-testing added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Sep 7, 2022
Copy link
Member

@GregHanson GregHanson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Release note looks good

@zirain
Copy link
Member Author

zirain commented Sep 14, 2022

/retest

@istio-testing istio-testing merged commit e062bfd into istio:master Sep 21, 2022
@istio-testing
Copy link
Collaborator

In response to a cherrypick label: #40851 failed to apply on top of branch "release-1.15":

Applying: accesslog: fallback to meshconfig when built-in provider's format is unset
Using index info to reconstruct a base tree...
M	pilot/pkg/model/telemetry_logging.go
M	pilot/pkg/model/telemetry_logging_test.go
Falling back to patching base and 3-way merge...
Auto-merging pilot/pkg/model/telemetry_logging_test.go
Auto-merging pilot/pkg/model/telemetry_logging.go
CONFLICT (content): Merge conflict in pilot/pkg/model/telemetry_logging.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 accesslog: fallback to meshconfig when built-in provider's format is unset
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

@istio-testing
Copy link
Collaborator

In response to a cherrypick label: new issue created for failed cherrypick: #41085

@zirain zirain deleted the accesslog-fallback branch September 21, 2022 06:56
zirain added a commit to zirain/istio that referenced this pull request Sep 21, 2022
…unset (istio#40851)

* accesslog: fallback to meshconfig when built-in provider's format is unset

* add release-notes
istio-testing pushed a commit that referenced this pull request Sep 21, 2022
…unset (#40851) (#41087)

* accesslog: fallback to meshconfig when built-in provider's format is unset

* add release-notes
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/perf and scalability size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants