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

fix(kuma-cp): deep copy tags when gen. outbounds (backport #5070) #5072

Merged
merged 4 commits into from
Sep 29, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 28, 2022

This is an automatic backport of pull request #5070 done by Mergify.
Cherry-pick of 81ccca0 has failed:

On branch mergify/bp/release-1.7/pr-5070
Your branch is up to date with 'origin/release-1.7'.

You are currently cherry-picking commit 81ccca0f6.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   pkg/xds/sync/proxy_builder_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   pkg/xds/topology/outbound.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

It fixes potential data race (iterating and writing to tags map)

Signed-off-by: Bart Smykla <bartek@smykla.com>

Signed-off-by: Bart Smykla <bartek@smykla.com>
(cherry picked from commit 81ccca0)

# Conflicts:
#	pkg/xds/topology/outbound.go
@mergify mergify bot requested a review from a team as a code owner September 28, 2022 11:07
@mergify mergify bot added the conflicts label Sep 28, 2022
Signed-off-by: Bart Smykla <bartek@smykla.com>
Copy link
Contributor

@bartsmykla bartsmykla left a comment

Choose a reason for hiding this comment

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

lgtm

@bartsmykla
Copy link
Contributor

@Mergifyio refresh

@mergify
Copy link
Contributor Author

mergify bot commented Sep 28, 2022

refresh

✅ Pull request refreshed

Signed-off-by: Bart Smykla <bartek@smykla.com>
Ubuntu 21.04 is EOL and the CI was broken

Signed-off-by: Bart Smykla <bartek@smykla.com>
@bartsmykla bartsmykla enabled auto-merge (squash) September 29, 2022 03:18
@bartsmykla bartsmykla merged commit 6adb5d7 into release-1.7 Sep 29, 2022
@bartsmykla bartsmykla deleted the mergify/bp/release-1.7/pr-5070 branch September 29, 2022 03:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant