Merge branch v2.11 into v3.1

2024-09-16 16:24:08 +02:00 · 2024-09-16 16:24:08 +02:00 · 093989fc14
commit 093989fc14
parent 8c977b8f8c 06d7fab820
66 changed files with 904 additions and 136 deletions
--- a/pkg/provider/docker/config_test.go
+++ b/pkg/provider/docker/config_test.go
@ -3976,7 +3976,7 @@ func TestDynConfBuilder_getIPAddress_swarm(t *testing.T) {
 		networks map[string]*network.Summary
 	}{
 		{
-			service:  swarmService(withEndpointSpec(modeDNSSR)),
+			service:  swarmService(withEndpointSpec(modeDNSRR)),
 			expected: "",
 			networks: map[string]*network.Summary{},
 		},