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(MeshGatewayInstance): don't overwrite annotations/labels in managed Service (backport of #7069) #7080

Merged
merged 2 commits into from
Jun 21, 2023

Conversation

kumahq[bot]
Copy link
Contributor

@kumahq kumahq bot commented Jun 21, 2023

Automatic cherry-pick of #7069 for branch release-2.0

Generated by action

cherry-picked commit 07cf4ca
⚠️ ⚠️ ⚠️ Conflicts happened when cherry-picking! ⚠️ ⚠️ ⚠️

On branch release-2.0
Your branch is up to date with 'origin/release-2.0'.

You are currently cherry-picking commit 07cf4ca21.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   pkg/plugins/runtime/k8s/controllers/gateway_instance_controller.go

no changes added to commit (use "git add" and/or "git commit -a")

Signed-off-by: Mike Beaumont <[email protected]>
@michaelbeaumont michaelbeaumont enabled auto-merge (squash) June 21, 2023 12:40
@michaelbeaumont michaelbeaumont merged commit c92a5af into release-2.0 Jun 21, 2023
@michaelbeaumont michaelbeaumont deleted the chore/backport-release-2.0-7069 branch June 21, 2023 13:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant