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): pass context via snapshot reconciler to generateCerts (backport of #7231) #7251

Merged
merged 1 commit into from Jul 14, 2023

Conversation

kumahq[bot]
Copy link
Contributor

@kumahq kumahq bot commented Jul 13, 2023

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

Generated by action

cherry-picked commit df9c5f9
⚠️ ⚠️ ⚠️ 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 df9c5f925.
  (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/policies/meshfaultinjection/plugin/v1alpha1/plugin_test.go
	modified:   pkg/plugins/policies/meshratelimit/plugin/v1alpha1/plugin_test.go
	modified:   pkg/test/xds/secrets.go
	modified:   pkg/xds/generator/admin_proxy_generator.go
	modified:   pkg/xds/generator/admin_proxy_generator_test.go
	modified:   pkg/xds/generator/core/resource_generator.go
	modified:   pkg/xds/generator/direct_access_proxy_generator_test.go
	modified:   pkg/xds/generator/dns_generator.go
	modified:   pkg/xds/generator/dns_generator_test.go
	modified:   pkg/xds/generator/egress/external_services_generator.go
	modified:   pkg/xds/generator/egress/generator.go
	modified:   pkg/xds/generator/egress/generator_test.go
	modified:   pkg/xds/generator/egress/internal_services_generator.go
	modified:   pkg/xds/generator/inbound_proxy_generator.go
	modified:   pkg/xds/generator/inbound_proxy_generator_test.go
	modified:   pkg/xds/generator/ingress_generator_test.go
	modified:   pkg/xds/generator/outbound_proxy_generator_test.go
	modified:   pkg/xds/generator/probe_generator.go
	modified:   pkg/xds/generator/probe_generator_test.go
	modified:   pkg/xds/generator/prometheus_endpoint_generator_test.go
	modified:   pkg/xds/generator/proxy_template.go
	modified:   pkg/xds/generator/proxy_template_profile_source_test.go
	modified:   pkg/xds/generator/proxy_template_test.go
	modified:   pkg/xds/generator/secrets/generator.go
	modified:   pkg/xds/generator/secrets/generator_test.go
	modified:   pkg/xds/generator/tracing_proxy_generator.go
	modified:   pkg/xds/generator/tracing_proxy_generator_test.go
	modified:   pkg/xds/generator/transparent_proxy_generator_test.go
	modified:   pkg/xds/secrets/secrets.go
	modified:   pkg/xds/secrets/secrets_test.go
	modified:   pkg/xds/server/v3/snapshot_generator_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   pkg/plugins/policies/meshaccesslog/plugin/v1alpha1/plugin_test.go
	both modified:   pkg/plugins/policies/meshcircuitbreaker/plugin/v1alpha1/plugin_test.go
	both modified:   pkg/plugins/policies/meshhealthcheck/plugin/v1alpha1/plugin_test.go
	deleted by us:   pkg/plugins/policies/meshloadbalancingstrategy/plugin/v1alpha1/plugin_test.go
	both modified:   pkg/plugins/policies/meshretry/plugin/v1alpha1/plugin_test.go
	both modified:   pkg/plugins/policies/meshtimeout/plugin/v1alpha1/plugin_test.go
	both modified:   pkg/plugins/runtime/gateway/gateway_route_generator_test.go
	both modified:   pkg/plugins/runtime/gateway/generator.go
	both modified:   pkg/plugins/runtime/gateway/listener_generator_test.go
	both modified:   pkg/xds/generator/direct_access_proxy_generator.go
	both modified:   pkg/xds/generator/ingress_generator.go
	both modified:   pkg/xds/generator/outbound_proxy_generator.go
	both modified:   pkg/xds/generator/prometheus_endpoint_generator.go
	both modified:   pkg/xds/generator/transparent_proxy_generator.go
	both modified:   pkg/xds/server/v3/reconcile.go
	both modified:   pkg/xds/server/v3/reconcile_test.go
	both modified:   pkg/xds/sync/dataplane_watchdog.go
	both modified:   pkg/xds/sync/dataplane_watchdog_test.go
	both modified:   pkg/xds/sync/interfaces.go

…7231)

Signed-off-by: Mike Beaumont <mjboamail@gmail.com>
@michaelbeaumont michaelbeaumont merged commit 55132e0 into release-2.1 Jul 14, 2023
6 checks passed
@michaelbeaumont michaelbeaumont deleted the chore/backport-release-2.1-7231 branch July 14, 2023 10:00
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