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(xds): eds deadlock on initial fetch timeout (backport of #11602) #11605

Merged
merged 1 commit into from
Oct 1, 2024

Conversation

kumahq[bot]
Copy link
Contributor

@kumahq kumahq bot commented Oct 1, 2024

Automatic cherry-pick of #11602 for branch release-2.7

Generated by action

cherry-picked commit a9bf4b8
⚠️ ⚠️ ⚠️ Conflicts happened when cherry-picking! ⚠️ ⚠️ ⚠️

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

You are currently cherry-picking commit a9bf4b8c8.
  (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/meshaccesslog/plugin/v1alpha1/testdata/basic-gateway.gateway.cluster.golden.yaml
	modified:   pkg/plugins/policies/meshaccesslog/plugin/v1alpha1/testdata/basic-gateway.gateway.listener.golden.yaml
	modified:   pkg/plugins/policies/meshfaultinjection/plugin/v1alpha1/testdata/gateway_basic_listener.golden.yaml
	modified:   pkg/plugins/policies/meshhealthcheck/plugin/v1alpha1/testdata/basic-meshhttproute.gateway_cluster.golden.yaml
	modified:   pkg/plugins/policies/meshhealthcheck/plugin/v1alpha1/testdata/basic.gateway_cluster.golden.yaml
	modified:   pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/basic.clusters.golden.yaml
	modified:   pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/default-meshservice.clusters.golden.yaml
	modified:   pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/default-route.clusters.golden.yaml
	modified:   pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/gateway-listener-different-hostnames-specific.clusters.golden.yaml
	modified:   pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/gateway-listener-different-hostnames-specific.listeners.golden.yaml
	modified:   pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/gateway-listener-specific.clusters.golden.yaml
	modified:   pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/gateway-listener-specific.listeners.golden.yaml
	modified:   pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/gateway.clusters.golden.yaml
	modified:   pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/gateway.listeners.golden.yaml
	modified:   pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/grpc-service.clusters.golden.yaml
	modified:   pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/headers-match.clusters.golden.yaml
	modified:   pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/match-priority.clusters.golden.yaml
	modified:   pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/mixed-tcp-and-http-outbounds.clusters.golden.yaml
	modified:   pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/request-header-modifiers.clusters.golden.yaml
	modified:   pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/request-mirror.clusters.golden.yaml
	modified:   pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/request-redirect.clusters.golden.yaml
	modified:   pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/response-header-modifiers.clusters.golden.yaml
	modified:   pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/url-rewrite.clusters.golden.yaml
	modified:   pkg/plugins/policies/meshloadbalancingstrategy/plugin/v1alpha1/testdata/basic.clusters.golden.yaml
	modified:   pkg/plugins/policies/meshloadbalancingstrategy/plugin/v1alpha1/testdata/basic.gateway.clusters.golden.yaml
	modified:   pkg/plugins/policies/meshloadbalancingstrategy/plugin/v1alpha1/testdata/basic.gateway.listeners.golden.yaml
	modified:   pkg/plugins/policies/meshloadbalancingstrategy/plugin/v1alpha1/testdata/egress.clusters.golden.yaml
	modified:   pkg/plugins/policies/meshloadbalancingstrategy/plugin/v1alpha1/testdata/egress_basic.clusters.golden.yaml
	modified:   pkg/plugins/policies/meshloadbalancingstrategy/plugin/v1alpha1/testdata/locality_aware.gateway.clusters.golden.yaml
	modified:   pkg/plugins/policies/meshloadbalancingstrategy/plugin/v1alpha1/testdata/locality_aware.gateway.listeners.golden.yaml
	modified:   pkg/plugins/policies/meshloadbalancingstrategy/plugin/v1alpha1/testdata/locality_aware_basic.clusters.golden.yaml
	modified:   pkg/plugins/policies/meshloadbalancingstrategy/plugin/v1alpha1/testdata/locality_aware_basic_egress_enabled.clusters.golden.yaml
	modified:   pkg/plugins/policies/meshloadbalancingstrategy/plugin/v1alpha1/testdata/locality_aware_cross_zone.clusters.golden.yaml
	modified:   pkg/plugins/policies/meshloadbalancingstrategy/plugin/v1alpha1/testdata/locality_aware_no_cross_zone.clusters.golden.yaml
	modified:   pkg/plugins/policies/meshloadbalancingstrategy/plugin/v1alpha1/testdata/locality_aware_split.clusters.golden.yaml
	modified:   pkg/plugins/policies/meshloadbalancingstrategy/plugin/v1alpha1/testdata/no-cross-zone.gateway.clusters.golden.yaml
	modified:   pkg/plugins/policies/meshloadbalancingstrategy/plugin/v1alpha1/testdata/no-cross-zone.gateway.listeners.golden.yaml
	modified:   pkg/plugins/policies/meshratelimit/plugin/v1alpha1/testdata/basic.gateway.listener.golden.yaml
	modified:   pkg/plugins/policies/meshratelimit/plugin/v1alpha1/testdata/http-route.gateway.listener.golden.yaml
	modified:   pkg/plugins/policies/meshretry/plugin/v1alpha1/testdata/gateway.http.listeners.golden.yaml
	modified:   pkg/plugins/policies/meshretry/plugin/v1alpha1/testdata/per-route-configuration.gateway.http.listeners.golden.yaml
	modified:   pkg/plugins/policies/meshtcproute/plugin/v1alpha1/testdata/basic-no-policies.clusters.golden.yaml
	modified:   pkg/plugins/policies/meshtcproute/plugin/v1alpha1/testdata/gateway.clusters.golden.yaml
	modified:   pkg/plugins/policies/meshtcproute/plugin/v1alpha1/testdata/kafka.clusters.golden.yaml
	modified:   pkg/plugins/policies/meshtcproute/plugin/v1alpha1/testdata/meshhttproute-clash-http-destination.clusters.golden.yaml
	modified:   pkg/plugins/policies/meshtcproute/plugin/v1alpha1/testdata/meshhttproute-clash-tcp-destination.clusters.golden.yaml
	modified:   pkg/plugins/policies/meshtcproute/plugin/v1alpha1/testdata/redirect-traffic.clusters.golden.yaml
	modified:   pkg/plugins/policies/meshtcproute/plugin/v1alpha1/testdata/split-traffic.clusters.golden.yaml
	modified:   pkg/plugins/policies/meshtimeout/plugin/testdata/basic.gateway.cluster.golden.yaml
	modified:   pkg/plugins/policies/meshtimeout/plugin/testdata/basic.gateway.listener.golden.yaml
	modified:   pkg/plugins/policies/meshtimeout/plugin/testdata/no-default-idle-timeout.gateway.cluster.golden.yaml
	modified:   pkg/plugins/policies/meshtimeout/plugin/testdata/no-default-idle-timeout.gateway.listener.golden.yaml
	modified:   pkg/plugins/policies/meshtimeout/plugin/testdata/no-route-level-timeouts.gateway.cluster.golden.yaml
	modified:   pkg/plugins/policies/meshtimeout/plugin/testdata/no-route-level-timeouts.gateway.listener.golden.yaml
	modified:   pkg/plugins/policies/meshtimeout/plugin/testdata/route-level-timeouts.gateway.cluster.golden.yaml
	modified:   pkg/plugins/policies/meshtimeout/plugin/testdata/route-level-timeouts.gateway.listener.golden.yaml
	modified:   pkg/plugins/policies/meshtrace/plugin/v1alpha1/testdata/simple-gateway.listeners.golden.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/01-gateway-listener.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/02-gateway-listener.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/03-gateway-listener.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/04-gateway-listener.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/05-gateway-listener.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/http/01-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/http/02-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/http/03-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/http/04-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/http/05-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/http/06-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/http/07-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/http/08-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/http/09-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/http/10-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/http/11-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/http/12-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/http/13-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/http/14-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/http/15-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/http/16-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/http/17-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/http/18-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/http/19-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/http/20-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/http/21-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/http/22-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/http/23-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/http/24-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/http/25-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/http/26-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/http/cross-mesh-gateway.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/http/drop-prefix-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/http/external-service-with-timeout-no-egress.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/http/external-service-without-default-traffic-permission.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/http/http-tcp-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/http/no-timeout.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/http/response-header-set-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/http/retry-policy.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/http/rewrite-prefix-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/http/rewrite-prefix-root-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/http/rewrite-prefix-trailing-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/http/sni-isolation-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/http/unresolved-backend.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/https/01-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/https/02-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/https/03-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/https/04-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/https/05-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/https/06-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/https/07-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/https/08-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/https/09-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/https/10-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/https/11-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/https/12-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/https/13-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/https/14-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/https/15-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/https/16-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/https/17-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/https/18-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/https/19-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/https/20-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/https/21-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/https/22-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/https/23-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/https/24-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/https/25-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/https/26-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/https/cross-mesh-gateway.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/https/drop-prefix-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/https/external-service-with-timeout-no-egress.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/https/external-service-without-default-traffic-permission.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/https/http-tcp-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/https/no-timeout.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/https/response-header-set-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/https/retry-policy.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/https/rewrite-prefix-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/https/rewrite-prefix-root-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/https/rewrite-prefix-trailing-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/https/sni-isolation-gateway-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/https/unresolved-backend.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/tcp/tcp-route.yaml
	modified:   pkg/plugins/runtime/gateway/testdata/tls/tcp-route.yaml
	modified:   pkg/xds/envoy/clusters/v3/circuit_breaker_configurer_test.go
	modified:   pkg/xds/envoy/clusters/v3/client_side_mtls_configurer_test.go
	modified:   pkg/xds/envoy/clusters/v3/eds_cluster_configurer.go
	modified:   pkg/xds/envoy/clusters/v3/eds_cluster_configurer_test.go
	modified:   pkg/xds/envoy/clusters/v3/health_check_configurer_test.go
	modified:   pkg/xds/envoy/clusters/v3/lb_configurer_test.go
	modified:   pkg/xds/envoy/clusters/v3/lb_subset_configurer_test.go
	modified:   pkg/xds/envoy/clusters/v3/outlier_detection_configurer_test.go
	modified:   pkg/xds/envoy/clusters/v3/timeout_configurer_test.go
	modified:   pkg/xds/envoy/listeners/v3/http_route_configurer.go
	modified:   pkg/xds/envoy/listeners/v3/http_route_configurer_test.go
	modified:   pkg/xds/generator/egress/testdata/02.internalservice-only.golden.yaml
	modified:   pkg/xds/generator/egress/testdata/03.mixed-services.golden.yaml
	modified:   pkg/xds/generator/egress/testdata/05.mixed-services-with-custom-trafficpermissions.golden.yaml
	modified:   pkg/xds/generator/egress/testdata/06.mixed-services-with-external-in-other-zone.golden.yaml
	modified:   pkg/xds/generator/egress/testdata/subsets-with-meshhttproute.golden.yaml
	modified:   pkg/xds/generator/egress/testdata/traffic-by-default-meshhttproute.golden.yaml
	modified:   pkg/xds/generator/testdata/ingress/01.envoy.golden.yaml
	modified:   pkg/xds/generator/testdata/ingress/03.envoy.golden.yaml
	modified:   pkg/xds/generator/testdata/ingress/04.envoy.golden.yaml
	modified:   pkg/xds/generator/testdata/ingress/05.envoy.golden.yaml
	modified:   pkg/xds/generator/testdata/ingress/meshgateway.envoy.golden.yaml
	modified:   pkg/xds/generator/testdata/ingress/virtual-outbound.envoy.golden.yaml
	modified:   pkg/xds/generator/testdata/ingress/with-meshhttproute-subset.envoy.golden.yaml
	modified:   pkg/xds/generator/testdata/ingress/with-meshhttproute.envoy.golden.yaml
	modified:   pkg/xds/generator/testdata/ingress/with-meshtcproute-subset.envoy.golden.yaml
	modified:   pkg/xds/generator/testdata/outbound-proxy/03.envoy.golden.yaml
	modified:   pkg/xds/generator/testdata/outbound-proxy/04.envoy.golden.yaml
	modified:   pkg/xds/generator/testdata/outbound-proxy/09.envoy.golden.yaml
	modified:   pkg/xds/generator/testdata/outbound-proxy/10.envoy.golden.yaml
	modified:   pkg/xds/generator/testdata/outbound-proxy/cluster-dots.envoy.golden.yaml
	modified:   pkg/xds/generator/testdata/profile-source/1-envoy-config.golden.yaml
	modified:   pkg/xds/generator/testdata/profile-source/2-envoy-config.golden.yaml
	modified:   pkg/xds/generator/testdata/profile-source/3-envoy-config.golden.yaml
	modified:   pkg/xds/generator/testdata/profile-source/4-envoy-config.golden.yaml

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   pkg/plugins/policies/meshcircuitbreaker/plugin/v1alpha1/testdata/basic.gateway_cluster.golden.yaml
	deleted by us:   pkg/plugins/policies/meshcircuitbreaker/plugin/v1alpha1/testdata/real-MeshService-targeted-to-real-MeshService.gateway_cluster.golden.yaml
	deleted by us:   pkg/plugins/policies/meshhealthcheck/plugin/v1alpha1/testdata/real-mesh-service-meshhttproute.gateway_cluster.golden.yaml
	deleted by us:   pkg/plugins/policies/meshhealthcheck/plugin/v1alpha1/testdata/real-mesh-service-target-real-mesh-service-meshhttproute.gateway_cluster.golden.yaml
	deleted by us:   pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/basic-real-meshservice-labels.clusters.golden.yaml
	deleted by us:   pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/basic-real-meshservice.clusters.golden.yaml
	deleted by us:   pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/default-meshexternalservice.clusters.golden.yaml
	deleted by us:   pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/default-meshmultizoneservice.clusters.golden.yaml
	deleted by us:   pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/default-route-outbound-with-tags-with-mtls.clusters.golden.yaml
	deleted by us:   pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/gateway-default-meshexternalservice.clusters.golden.yaml
	deleted by us:   pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/gateway-real-mesh-service.clusters.golden.yaml
	deleted by us:   pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/gateway-real-mesh-service.listeners.golden.yaml
	deleted by us:   pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/httproute-meshexternalservice.clusters.golden.yaml
	deleted by us:   pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/meshexternalservice-with-tls-and-custom-settings.clusters.golden.yaml
	deleted by us:   pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/meshexternalservice-with-tls-and-skipall.clusters.golden.yaml
	deleted by us:   pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/meshexternalservice-with-tls.clusters.golden.yaml
	deleted by us:   pkg/plugins/policies/meshloadbalancingstrategy/plugin/v1alpha1/testdata/real-MeshService-targeted-to-real-MeshService.gateway.clusters.golden.yaml
	deleted by us:   pkg/plugins/policies/meshloadbalancingstrategy/plugin/v1alpha1/testdata/real-MeshService-targeted-to-real-MeshService.gateway.listeners.golden.yaml
	deleted by us:   pkg/plugins/policies/meshtcproute/plugin/v1alpha1/testdata/basic-real-meshservice.clusters.golden.yaml
	deleted by us:   pkg/plugins/policies/meshtcproute/plugin/v1alpha1/testdata/default-meshexternalservice.clusters.golden.yaml
	deleted by us:   pkg/plugins/policies/meshtcproute/plugin/v1alpha1/testdata/tcproute-meshexternalservice.clusters.golden.yaml
	deleted by us:   pkg/plugins/policies/meshtls/plugin/v1alpha1/testdata/gateway-tls-version-and-cipher-meshservice.clusters.golden.yaml
	deleted by us:   pkg/plugins/policies/meshtls/plugin/v1alpha1/testdata/gateway-tls-version-and-cipher-meshservice.listeners.golden.yaml
	deleted by us:   pkg/plugins/policies/meshtls/plugin/v1alpha1/testdata/gateway-tls-version-and-cipher.clusters.golden.yaml
	deleted by us:   pkg/plugins/policies/meshtls/plugin/v1alpha1/testdata/gateway-tls-version-and-cipher.listeners.golden.yaml
	both modified:   pkg/xds/envoy/clusters/v3/client_side_tls_configurer_test.go
	deleted by us:   pkg/xds/generator/testdata/ingress/mesh-service.envoy.golden.yaml

@kumahq kumahq bot requested a review from a team as a code owner October 1, 2024 11:12
@kumahq kumahq bot requested review from slonka and bartsmykla and removed request for a team October 1, 2024 11:12
@slonka slonka self-assigned this Oct 1, 2024
@slonka slonka force-pushed the chore/backport-release-2.7-11602 branch from 3998b5a to 3c4369c Compare October 1, 2024 13:14
@slonka slonka removed the conflict label Oct 1, 2024
@lukidzi lukidzi merged commit f63ca4a into release-2.7 Oct 1, 2024
15 checks passed
@lukidzi lukidzi deleted the chore/backport-release-2.7-11602 branch October 1, 2024 14:10
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