Merge v2.10 into v3.0

2023-11-29 12:20:57 +01:00 · 2023-11-29 12:20:57 +01:00 · e29a142f6a
commit e29a142f6a
parent 35c704ace3 dae0491b61
118 changed files with 1324 additions and 1290 deletions
--- a/pkg/redactor/redactor_config_test.go
+++ b/pkg/redactor/redactor_config_test.go
@ -517,7 +517,7 @@ func TestDo_staticConfiguration(t *testing.T) {
 	}

 	config.EntryPoints = static.EntryPoints{
-		"foobar": {
+		"foobar": &static.EntryPoint{
 			Address: "foo Address",
 			Transport: &static.EntryPointsTransport{
 				LifeCycle: &static.LifeCycle{