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): kds sync on upgrade doubles the number of policies (backport of #9259) #9273

Merged
merged 2 commits into from Feb 15, 2024

Conversation

kumahq[bot]
Copy link
Contributor

@kumahq kumahq bot commented Feb 15, 2024

Automatic cherry-pick of #9259 for branch release-2.6

Generated by action

cherry-picked commit 6353c95
⚠️ ⚠️ ⚠️ Conflicts happened when cherry-picking! ⚠️ ⚠️ ⚠️

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

You are currently cherry-picking commit 6353c954e.
  (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/api-server/api_server_suite_test.go
	modified:   pkg/api-server/circuit_breaker_endpoints_test.go
	modified:   pkg/api-server/fault_injection_endpoints_test.go
	modified:   pkg/api-server/global_secret_endpoints_test.go
	modified:   pkg/api-server/health_check_endpoints_test.go
	modified:   pkg/api-server/resource_endpoints.go
	modified:   pkg/api-server/resource_endpoints_test.go
	modified:   pkg/api-server/secret_endpoints_test.go
	new file:   pkg/api-server/testdata/resource_400onNoOriginLabel.golden.json
	modified:   pkg/api-server/traffic_route_endpoints_test.go
	modified:   pkg/api-server/traffic_trace_endpoints_test.go
	modified:   pkg/core/resources/model/resource.go
	modified:   pkg/kds/context/context.go
	modified:   pkg/plugins/runtime/k8s/plugin.go
	modified:   pkg/plugins/runtime/k8s/webhooks/defaulter.go
	modified:   pkg/plugins/runtime/k8s/webhooks/defaulter_test.go
	new file:   pkg/plugins/runtime/k8s/webhooks/resourceadmissionchecker.go
	modified:   pkg/plugins/runtime/k8s/webhooks/validation.go
	modified:   pkg/plugins/runtime/k8s/webhooks/validation_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   test/e2e/helm/kuma_helm_upgrade_multizone.go

@kumahq kumahq bot requested a review from a team as a code owner February 15, 2024 13:46
@kumahq kumahq bot requested review from jakubdyszkiewicz, Automaat and lobkovilya and removed request for a team February 15, 2024 13:46
@lobkovilya lobkovilya force-pushed the chore/backport-release-2.6-9259 branch from c5182e2 to 9967e8b Compare February 15, 2024 13:52
Make KDS sync rely on `kuma.io/origin: zone` label. We still want `KUMA_MULTIZONE_ZONE_DISABLE_ORIGIN_LABEL_VALIDATION: true` to disable origin label validation. That's why the PR introduces a webhook that automatically adds `kuma.io/origin: zone` after the validation.

Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
@lobkovilya lobkovilya force-pushed the chore/backport-release-2.6-9259 branch from 9967e8b to e18112d Compare February 15, 2024 14:27
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
@lobkovilya lobkovilya merged commit 5453273 into release-2.6 Feb 15, 2024
11 checks passed
@lobkovilya lobkovilya deleted the chore/backport-release-2.6-9259 branch February 15, 2024 16:19
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

3 participants