baalajimaestro/traefik
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge current v2.11 into v3.0

Browse source
This commit is contained in:
mmatur 2024-01-23 09:32:28 +01:00
parent f9831f5b1b 177c4b0ed1
commit 9843757834
No known key found for this signature in database
GPG key ID: 2FFE42FC256CFF8E
1 changed files with 36 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
pkg/server/configurationwatcher_test.go
View file

@ -23,7 +23,7 @@ type mockProvider struct {
throttleDuration time.Duration throttleDuration time.Duration
} }
func (p *mockProvider) Provide(configurationChan chan<- dynamic.Message, pool *safe.Pool) error { func (p *mockProvider) Provide(configurationChan chan<- dynamic.Message, _ *safe.Pool) error {
wait := p.wait wait := p.wait
if wait == 0 { if wait == 0 {
wait = 20 * time.Millisecond wait = 20 * time.Millisecond
@ -48,7 +48,7 @@ func (p *mockProvider) Provide(configurationChan chan<- dynamic.Message, pool *s
} }
// ThrottleDuration returns the throttle duration. // ThrottleDuration returns the throttle duration.
func (p mockProvider) ThrottleDuration() time.Duration { func (p *mockProvider) ThrottleDuration() time.Duration {
return p.throttleDuration return p.throttleDuration
} }
@ -123,7 +123,7 @@ func TestWaitForRequiredProvider(t *testing.T) {
config := &dynamic.Configuration{ config := &dynamic.Configuration{
HTTP: th.BuildConfiguration( HTTP: th.BuildConfiguration(
th.WithRouters(th.WithRouter("foo")), th.WithRouters(th.WithRouter("foo", th.WithEntryPoints("ep"))),
th.WithLoadBalancerServices(th.WithService("bar")), th.WithLoadBalancerServices(th.WithService("bar")),
), ),
} }
@ -167,19 +167,19 @@ func TestIgnoreTransientConfiguration(t *testing.T) {
config := &dynamic.Configuration{ config := &dynamic.Configuration{
HTTP: th.BuildConfiguration( HTTP: th.BuildConfiguration(
th.WithRouters(th.WithRouter("foo")), th.WithRouters(th.WithRouter("foo", th.WithEntryPoints("ep"))),
th.WithLoadBalancerServices(th.WithService("bar")), th.WithLoadBalancerServices(th.WithService("bar")),
), ),
} }
config2 := &dynamic.Configuration{ config2 := &dynamic.Configuration{
HTTP: th.BuildConfiguration( HTTP: th.BuildConfiguration(
th.WithRouters(th.WithRouter("baz")), th.WithRouters(th.WithRouter("baz", th.WithEntryPoints("ep"))),
th.WithLoadBalancerServices(th.WithService("toto")), th.WithLoadBalancerServices(th.WithService("toto")),
), ),
} }
watcher := NewConfigurationWatcher(routinesPool, &mockProvider{}, []string{"defaultEP"}, "") watcher := NewConfigurationWatcher(routinesPool, &mockProvider{}, []string{}, "")
publishedConfigCount := 0 publishedConfigCount := 0
var lastConfig dynamic.Configuration var lastConfig dynamic.Configuration
@ -210,17 +210,20 @@ func TestIgnoreTransientConfiguration(t *testing.T) {
Configuration: config, Configuration: config,
} }
close(blockConfConsumer) // give some time before closing the channel.
// give some time so that the configuration can be processed
time.Sleep(20 * time.Millisecond) time.Sleep(20 * time.Millisecond)
// after 20 milliseconds we should have 1 configs published close(blockConfConsumer)
// give some time so that the configuration can be processed.
time.Sleep(20 * time.Millisecond)
// after 20 milliseconds we should have 1 config published.
assert.Equal(t, 1, publishedConfigCount, "times configs were published") assert.Equal(t, 1, publishedConfigCount, "times configs were published")
expected := dynamic.Configuration{ expected := dynamic.Configuration{
HTTP: th.BuildConfiguration( HTTP: th.BuildConfiguration(
th.WithRouters(th.WithRouter("foo@mock", th.WithEntryPoints("defaultEP"))), th.WithRouters(th.WithRouter("foo@mock", th.WithEntryPoints("ep"))),
th.WithLoadBalancerServices(th.WithService("bar@mock")), th.WithLoadBalancerServices(th.WithService("bar@mock")),
th.WithMiddlewares(), th.WithMiddlewares(),
), ),
@ -258,7 +261,7 @@ func TestListenProvidersThrottleProviderConfigReload(t *testing.T) {
ProviderName: "mock", ProviderName: "mock",
Configuration: &dynamic.Configuration{ Configuration: &dynamic.Configuration{
HTTP: th.BuildConfiguration( HTTP: th.BuildConfiguration(
th.WithRouters(th.WithRouter("foo"+strconv.Itoa(i))), th.WithRouters(th.WithRouter("foo"+strconv.Itoa(i), th.WithEntryPoints("ep"))),
th.WithLoadBalancerServices(th.WithService("bar")), th.WithLoadBalancerServices(th.WithService("bar")),
), ),
}, },
@ -318,7 +321,7 @@ func TestListenProvidersSkipsSameConfigurationForProvider(t *testing.T) {
ProviderName: "mock", ProviderName: "mock",
Configuration: &dynamic.Configuration{ Configuration: &dynamic.Configuration{
HTTP: th.BuildConfiguration( HTTP: th.BuildConfiguration(
th.WithRouters(th.WithRouter("foo")), th.WithRouters(th.WithRouter("foo", th.WithEntryPoints("ep"))),
th.WithLoadBalancerServices(th.WithService("bar")), th.WithLoadBalancerServices(th.WithService("bar")),
), ),
}, },
@ -350,14 +353,14 @@ func TestListenProvidersDoesNotSkipFlappingConfiguration(t *testing.T) {
configuration := &dynamic.Configuration{ configuration := &dynamic.Configuration{
HTTP: th.BuildConfiguration( HTTP: th.BuildConfiguration(
th.WithRouters(th.WithRouter("foo")), th.WithRouters(th.WithRouter("foo", th.WithEntryPoints("ep"))),
th.WithLoadBalancerServices(th.WithService("bar")), th.WithLoadBalancerServices(th.WithService("bar")),
), ),
} }
transientConfiguration := &dynamic.Configuration{ transientConfiguration := &dynamic.Configuration{
HTTP: th.BuildConfiguration( HTTP: th.BuildConfiguration(
th.WithRouters(th.WithRouter("bad")), th.WithRouters(th.WithRouter("bad", th.WithEntryPoints("ep"))),
th.WithLoadBalancerServices(th.WithService("bad")), th.WithLoadBalancerServices(th.WithService("bad")),
), ),
} }
@ -372,7 +375,7 @@ func TestListenProvidersDoesNotSkipFlappingConfiguration(t *testing.T) {
}, },
} }
watcher := NewConfigurationWatcher(routinesPool, pvd, []string{"defaultEP"}, "") watcher := NewConfigurationWatcher(routinesPool, pvd, []string{}, "")
var lastConfig dynamic.Configuration var lastConfig dynamic.Configuration
watcher.AddListener(func(conf dynamic.Configuration) { watcher.AddListener(func(conf dynamic.Configuration) {
@ -389,7 +392,7 @@ func TestListenProvidersDoesNotSkipFlappingConfiguration(t *testing.T) {
expected := dynamic.Configuration{ expected := dynamic.Configuration{
HTTP: th.BuildConfiguration( HTTP: th.BuildConfiguration(
th.WithRouters(th.WithRouter("foo@mock", th.WithEntryPoints("defaultEP"))), th.WithRouters(th.WithRouter("foo@mock", th.WithEntryPoints("ep"))),
th.WithLoadBalancerServices(th.WithService("bar@mock")), th.WithLoadBalancerServices(th.WithService("bar@mock")),
th.WithMiddlewares(), th.WithMiddlewares(),
), ),
@ -419,14 +422,14 @@ func TestListenProvidersIgnoreSameConfig(t *testing.T) {
configuration := &dynamic.Configuration{ configuration := &dynamic.Configuration{
HTTP: th.BuildConfiguration( HTTP: th.BuildConfiguration(
th.WithRouters(th.WithRouter("foo")), th.WithRouters(th.WithRouter("foo", th.WithEntryPoints("ep"))),
th.WithLoadBalancerServices(th.WithService("bar")), th.WithLoadBalancerServices(th.WithService("bar")),
), ),
} }
transientConfiguration := &dynamic.Configuration{ transientConfiguration := &dynamic.Configuration{
HTTP: th.BuildConfiguration( HTTP: th.BuildConfiguration(
th.WithRouters(th.WithRouter("bad")), th.WithRouters(th.WithRouter("bad", th.WithEntryPoints("ep"))),
th.WithLoadBalancerServices(th.WithService("bad")), th.WithLoadBalancerServices(th.WithService("bad")),
), ),
} }
@ -452,7 +455,7 @@ func TestListenProvidersIgnoreSameConfig(t *testing.T) {
err := providerAggregator.AddProvider(pvd) err := providerAggregator.AddProvider(pvd)
assert.NoError(t, err) assert.NoError(t, err)
watcher := NewConfigurationWatcher(routinesPool, providerAggregator, []string{"defaultEP"}, "") watcher := NewConfigurationWatcher(routinesPool, providerAggregator, []string{}, "")
var configurationReloads int var configurationReloads int
var lastConfig dynamic.Configuration var lastConfig dynamic.Configuration
@ -479,7 +482,7 @@ func TestListenProvidersIgnoreSameConfig(t *testing.T) {
expected := dynamic.Configuration{ expected := dynamic.Configuration{
HTTP: th.BuildConfiguration( HTTP: th.BuildConfiguration(
th.WithRouters(th.WithRouter("foo@mock", th.WithEntryPoints("defaultEP"))), th.WithRouters(th.WithRouter("foo@mock", th.WithEntryPoints("ep"))),
th.WithLoadBalancerServices(th.WithService("bar@mock")), th.WithLoadBalancerServices(th.WithService("bar@mock")),
th.WithMiddlewares(), th.WithMiddlewares(),
), ),
@ -509,7 +512,7 @@ func TestListenProvidersIgnoreSameConfig(t *testing.T) {
func TestApplyConfigUnderStress(t *testing.T) { func TestApplyConfigUnderStress(t *testing.T) {
routinesPool := safe.NewPool(context.Background()) routinesPool := safe.NewPool(context.Background())
watcher := NewConfigurationWatcher(routinesPool, &mockProvider{}, []string{"defaultEP"}, "") watcher := NewConfigurationWatcher(routinesPool, &mockProvider{}, []string{}, "")
routinesPool.GoCtx(func(ctx context.Context) { routinesPool.GoCtx(func(ctx context.Context) {
i := 0 i := 0
@ -519,7 +522,7 @@ func TestApplyConfigUnderStress(t *testing.T) {
return return
case watcher.allProvidersConfigs <- dynamic.Message{ProviderName: "mock", Configuration: &dynamic.Configuration{ case watcher.allProvidersConfigs <- dynamic.Message{ProviderName: "mock", Configuration: &dynamic.Configuration{
HTTP: th.BuildConfiguration( HTTP: th.BuildConfiguration(
th.WithRouters(th.WithRouter("foo"+strconv.Itoa(i))), th.WithRouters(th.WithRouter("foo"+strconv.Itoa(i), th.WithEntryPoints("ep"))),
th.WithLoadBalancerServices(th.WithService("bar")), th.WithLoadBalancerServices(th.WithService("bar")),
), ),
}}: }}:
@ -554,28 +557,28 @@ func TestListenProvidersIgnoreIntermediateConfigs(t *testing.T) {
configuration := &dynamic.Configuration{ configuration := &dynamic.Configuration{
HTTP: th.BuildConfiguration( HTTP: th.BuildConfiguration(
th.WithRouters(th.WithRouter("foo")), th.WithRouters(th.WithRouter("foo", th.WithEntryPoints("ep"))),
th.WithLoadBalancerServices(th.WithService("bar")), th.WithLoadBalancerServices(th.WithService("bar")),
), ),
} }
transientConfiguration := &dynamic.Configuration{ transientConfiguration := &dynamic.Configuration{
HTTP: th.BuildConfiguration( HTTP: th.BuildConfiguration(
th.WithRouters(th.WithRouter("bad")), th.WithRouters(th.WithRouter("bad", th.WithEntryPoints("ep"))),
th.WithLoadBalancerServices(th.WithService("bad")), th.WithLoadBalancerServices(th.WithService("bad")),
), ),
} }
transientConfiguration2 := &dynamic.Configuration{ transientConfiguration2 := &dynamic.Configuration{
HTTP: th.BuildConfiguration( HTTP: th.BuildConfiguration(
th.WithRouters(th.WithRouter("bad2")), th.WithRouters(th.WithRouter("bad2", th.WithEntryPoints("ep"))),
th.WithLoadBalancerServices(th.WithService("bad2")), th.WithLoadBalancerServices(th.WithService("bad2")),
), ),
} }
finalConfiguration := &dynamic.Configuration{ finalConfiguration := &dynamic.Configuration{
HTTP: th.BuildConfiguration( HTTP: th.BuildConfiguration(
th.WithRouters(th.WithRouter("final")), th.WithRouters(th.WithRouter("final", th.WithEntryPoints("ep"))),
th.WithLoadBalancerServices(th.WithService("final")), th.WithLoadBalancerServices(th.WithService("final")),
), ),
} }
@ -595,7 +598,7 @@ func TestListenProvidersIgnoreIntermediateConfigs(t *testing.T) {
err := providerAggregator.AddProvider(pvd) err := providerAggregator.AddProvider(pvd)
assert.NoError(t, err) assert.NoError(t, err)
watcher := NewConfigurationWatcher(routinesPool, providerAggregator, []string{"defaultEP"}, "") watcher := NewConfigurationWatcher(routinesPool, providerAggregator, []string{}, "")
var configurationReloads int var configurationReloads int
var lastConfig dynamic.Configuration var lastConfig dynamic.Configuration
@ -614,7 +617,7 @@ func TestListenProvidersIgnoreIntermediateConfigs(t *testing.T) {
expected := dynamic.Configuration{ expected := dynamic.Configuration{
HTTP: th.BuildConfiguration( HTTP: th.BuildConfiguration(
th.WithRouters(th.WithRouter("final@mock", th.WithEntryPoints("defaultEP"))), th.WithRouters(th.WithRouter("final@mock", th.WithEntryPoints("ep"))),
th.WithLoadBalancerServices(th.WithService("final@mock")), th.WithLoadBalancerServices(th.WithService("final@mock")),
th.WithMiddlewares(), th.WithMiddlewares(),
), ),
@ -646,7 +649,7 @@ func TestListenProvidersPublishesConfigForEachProvider(t *testing.T) {
configuration := &dynamic.Configuration{ configuration := &dynamic.Configuration{
HTTP: th.BuildConfiguration( HTTP: th.BuildConfiguration(
th.WithRouters(th.WithRouter("foo")), th.WithRouters(th.WithRouter("foo", th.WithEntryPoints("ep"))),
th.WithLoadBalancerServices(th.WithService("bar")), th.WithLoadBalancerServices(th.WithService("bar")),
), ),
} }
@ -658,7 +661,7 @@ func TestListenProvidersPublishesConfigForEachProvider(t *testing.T) {
}, },
} }
watcher := NewConfigurationWatcher(routinesPool, pvd, []string{"defaultEP"}, "") watcher := NewConfigurationWatcher(routinesPool, pvd, []string{}, "")
var publishedProviderConfig dynamic.Configuration var publishedProviderConfig dynamic.Configuration
@ -677,8 +680,8 @@ func TestListenProvidersPublishesConfigForEachProvider(t *testing.T) {
expected := dynamic.Configuration{ expected := dynamic.Configuration{
HTTP: th.BuildConfiguration( HTTP: th.BuildConfiguration(
th.WithRouters( th.WithRouters(
th.WithRouter("foo@mock", th.WithEntryPoints("defaultEP")), th.WithRouter("foo@mock", th.WithEntryPoints("ep")),
th.WithRouter("foo@mock2", th.WithEntryPoints("defaultEP")), th.WithRouter("foo@mock2", th.WithEntryPoints("ep")),
), ),
th.WithLoadBalancerServices( th.WithLoadBalancerServices(
th.WithService("bar@mock"), th.WithService("bar@mock"),