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(dataplane): ignored listeners with ignored labels in selector (backport of #8463) #8543

Closed
wants to merge 1 commit into from

Conversation

kumahq[bot]
Copy link
Contributor

@kumahq kumahq bot commented Dec 5, 2023

Automatic cherry-pick of #8463 for branch release-2.1

Generated by action

cherry-picked commit 2c973d7
⚠️ ⚠️ ⚠️ Conflicts happened when cherry-picking! ⚠️ ⚠️ ⚠️

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

You are currently cherry-picking commit 2c973d798.
  (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:   api/mesh/v1alpha1/dataplane.proto
	modified:   api/mesh/v1alpha1/dataplane_helpers.go
	modified:   api/mesh/v1alpha1/dataplane_helpers_test.go
	modified:   docs/generated/kuma-cp.md
	modified:   docs/generated/raw/kuma-cp.yaml
	modified:   docs/generated/raw/protos/Dataplane.json
	modified:   docs/generated/raw/protos/DataplaneOverview.json
	modified:   docs/generated/resources/proxy_dataplane.md
	modified:   pkg/config/app/kuma-cp/kuma-cp.defaults.yaml
	modified:   pkg/config/plugins/runtime/k8s/config.go
	modified:   pkg/config/plugins/runtime/k8s/testdata/default-config.golden.yaml
	modified:   pkg/core/managers/apis/dataplane/dataplane_manager.go
	modified:   pkg/core/managers/apis/dataplane/dataplane_manager_test.go
	modified:   pkg/core/resources/apis/mesh/dataplane_overview_helpers.go
	modified:   pkg/hds/tracker/callbacks.go
	modified:   pkg/plugins/runtime/k8s/controllers/pod_controller.go
	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/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/15.dataplane.yaml
	modified:   pkg/plugins/runtime/k8s/controllers/testdata/16.dataplane.yaml
	modified:   pkg/plugins/runtime/k8s/controllers/testdata/17.dataplane.yaml
	modified:   pkg/plugins/runtime/k8s/controllers/testdata/19.dataplane.yaml
	new file:   pkg/plugins/runtime/k8s/controllers/testdata/23.dataplane.yaml
	new file:   pkg/plugins/runtime/k8s/controllers/testdata/23.pod.yaml
	new file:   pkg/plugins/runtime/k8s/controllers/testdata/23.services-for-pod.yaml
	modified:   pkg/plugins/runtime/k8s/util/util.go
	modified:   pkg/plugins/runtime/k8s/util/util_test.go
	new file:   test/e2e_env/kubernetes/graceful/change_service.go
	modified:   test/framework/deployments/testserver/kubernetes.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   api/mesh/v1alpha1/dataplane.pb.go
	both modified:   pkg/config/loader_test.go
	both modified:   pkg/insights/resyncer.go
	deleted by us:   pkg/plugins/policies/core/matchers/dataplane.go
	deleted by us:   pkg/plugins/policies/core/matchers/testdata/matchedpolicies/fromrules/multiple-policies-lexicog-order.golden.yaml
	deleted by us:   pkg/plugins/policies/core/rules/testdata/rules/from/mtp-overrides-faulty.golden.yaml
	deleted by us:   pkg/plugins/policies/core/rules/testdata/rules/from/mtp-overrides.golden.yaml
	deleted by us:   pkg/plugins/policies/core/rules/testdata/rules/from/mtp-single-shadow-deny.golden.yaml
	deleted by us:   pkg/plugins/policies/core/rules/testdata/rules/from/single-mtp-from-overiding-one-another.golden.yaml
	added by them:   pkg/plugins/policies/matchers/testdata/match/dataplanepolicies/07.dataplane.yaml
	added by them:   pkg/plugins/policies/matchers/testdata/match/dataplanepolicies/07.golden.yaml
	added by them:   pkg/plugins/policies/matchers/testdata/match/dataplanepolicies/07.policies.yaml
	both modified:   pkg/plugins/runtime/k8s/controllers/inbound_converter.go
	both modified:   pkg/plugins/runtime/k8s/plugin.go
	both modified:   test/e2e_env/kubernetes/kubernetes_suite_test.go
	both modified:   test/framework/config.go
	both modified:   test/framework/deployments/testserver/deployment.go

…8463)

Signed-off-by: Jakub Dyszkiewicz <jakub.dyszkiewicz@gmail.com>
@lahabana lahabana deleted the chore/backport-release-2.1-8463 branch December 17, 2023 19:37
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.

None yet

1 participant