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

feat(kmesh-cp) add kubernetes tags automatically (backport #3439) #3485

Merged
merged 1 commit into from
Dec 13, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 13, 2021

This is an automatic backport of pull request #3439 done by Mergify.
Cherry-pick of 19b4a04 has failed:

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

You are currently cherry-picking commit 19b4a049.
  (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/plugins/runtime/k8s/controllers/pod_controller_test.go
	modified:   pkg/plugins/runtime/k8s/controllers/pod_converter_test.go
	modified:   pkg/plugins/runtime/k8s/controllers/testdata/01.dataplane.yaml
	modified:   pkg/plugins/runtime/k8s/controllers/testdata/02.dataplane.yaml
	modified:   pkg/plugins/runtime/k8s/controllers/testdata/03.dataplane.yaml
	modified:   pkg/plugins/runtime/k8s/controllers/testdata/04.dataplane.yaml
	modified:   pkg/plugins/runtime/k8s/controllers/testdata/05.dataplane.yaml
	modified:   pkg/plugins/runtime/k8s/controllers/testdata/06.dataplane.yaml
	modified:   pkg/plugins/runtime/k8s/controllers/testdata/07.dataplane.yaml
	modified:   pkg/plugins/runtime/k8s/controllers/testdata/08.dataplane.yaml
	modified:   pkg/plugins/runtime/k8s/controllers/testdata/09.dataplane.yaml
	modified:   pkg/plugins/runtime/k8s/controllers/testdata/10.dataplane.yaml
	modified:   pkg/plugins/runtime/k8s/controllers/testdata/11.dataplane.yaml
	modified:   pkg/plugins/runtime/k8s/controllers/testdata/12.dataplane.yaml
	modified:   pkg/plugins/runtime/k8s/controllers/testdata/13.dataplane.yaml
	modified:   pkg/plugins/runtime/k8s/controllers/testdata/14.dataplane.yaml
	modified:   pkg/plugins/runtime/k8s/controllers/testdata/15.dataplane.yaml
	modified:   test/e2e/trafficpermission/hybrid/traffic_permission_hybrid.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   pkg/plugins/runtime/k8s/controllers/inbound_converter.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

@mergify mergify bot requested a review from a team as a code owner December 13, 2021 10:08
@mergify mergify bot added the conflicts label Dec 13, 2021
Signed-off-by: Jakub Dyszkiewicz <jakub.dyszkiewicz@gmail.com>
@lahabana lahabana merged commit c46535c into release-1.4 Dec 13, 2021
@lahabana lahabana deleted the mergify/bp/release-1.4/pr-3439 branch December 13, 2021 12:56
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.

2 participants