Merge branch v2.3 into master

integration/access_log_test.go

@@ -12,10 +12,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/containous/traefik/v2/integration/try"
-	"github.com/containous/traefik/v2/pkg/log"
-	"github.com/containous/traefik/v2/pkg/middlewares/accesslog"
 	"github.com/go-check/check"
+	"github.com/traefik/traefik/v2/integration/try"
+	"github.com/traefik/traefik/v2/pkg/log"
+	"github.com/traefik/traefik/v2/pkg/middlewares/accesslog"
 	checker "github.com/vdemeester/shakers"
 )
 

integration/acme_test.go

@@ -10,13 +10,13 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/containous/traefik/v2/integration/try"
-	"github.com/containous/traefik/v2/pkg/config/static"
-	"github.com/containous/traefik/v2/pkg/provider/acme"
-	"github.com/containous/traefik/v2/pkg/testhelpers"
-	"github.com/containous/traefik/v2/pkg/types"
 	"github.com/go-check/check"
 	"github.com/miekg/dns"
+	"github.com/traefik/traefik/v2/integration/try"
+	"github.com/traefik/traefik/v2/pkg/config/static"
+	"github.com/traefik/traefik/v2/pkg/provider/acme"
+	"github.com/traefik/traefik/v2/pkg/testhelpers"
+	"github.com/traefik/traefik/v2/pkg/types"
 	checker "github.com/vdemeester/shakers"
 )
 

integration/consul_catalog_test.go

@@ -6,9 +6,9 @@ import (
 	"os"
 	"time"
 
-	"github.com/containous/traefik/v2/integration/try"
 	"github.com/go-check/check"
 	"github.com/hashicorp/consul/api"
+	"github.com/traefik/traefik/v2/integration/try"
 	checker "github.com/vdemeester/shakers"
 )
 

integration/consul_test.go

@@ -12,10 +12,10 @@ import (
 	"github.com/abronan/valkeyrie"
 	"github.com/abronan/valkeyrie/store"
 	"github.com/abronan/valkeyrie/store/consul"
-	"github.com/containous/traefik/v2/integration/try"
-	"github.com/containous/traefik/v2/pkg/api"
 	"github.com/go-check/check"
 	"github.com/pmezard/go-difflib/difflib"
+	"github.com/traefik/traefik/v2/integration/try"
+	"github.com/traefik/traefik/v2/pkg/api"
 	checker "github.com/vdemeester/shakers"
 )
 

integration/docker_compose_test.go

@@ -7,10 +7,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/containous/traefik/v2/integration/try"
-	"github.com/containous/traefik/v2/pkg/api"
-	"github.com/containous/traefik/v2/pkg/testhelpers"
 	"github.com/go-check/check"
+	"github.com/traefik/traefik/v2/integration/try"
+	"github.com/traefik/traefik/v2/pkg/api"
+	"github.com/traefik/traefik/v2/pkg/testhelpers"
 	checker "github.com/vdemeester/shakers"
 )
 

integration/docker_test.go

@@ -9,19 +9,19 @@ import (
 	"strings"
 	"time"
 
-	"github.com/containous/traefik/v2/integration/try"
 	"github.com/docker/docker/pkg/namesgenerator"
 	"github.com/go-check/check"
 	d "github.com/libkermit/docker"
 	"github.com/libkermit/docker-check"
+	"github.com/traefik/traefik/v2/integration/try"
 	checker "github.com/vdemeester/shakers"
 )
 
 // Images to have or pull before the build in order to make it work.
 // FIXME handle this offline but loading them before build.
 var RequiredImages = map[string]string{
-	"swarm":             "1.0.0",
-	"containous/whoami": "latest",
+	"swarm":          "1.0.0",
+	"traefik/whoami": "latest",
 }
 
 // Docker tests suite.
@@ -129,7 +129,7 @@ func (s *DockerSuite) TestDefaultDockerContainers(c *check.C) {
 
 	req, err := http.NewRequest(http.MethodGet, "http://127.0.0.1:8000/version", nil)
 	c.Assert(err, checker.IsNil)
-	req.Host = fmt.Sprintf("%s.docker.localhost", strings.Replace(name, "_", "-", -1))
+	req.Host = fmt.Sprintf("%s.docker.localhost", strings.ReplaceAll(name, "_", "-"))
 
 	// FIXME Need to wait than 500 milliseconds more (for swarm or traefik to boot up ?)
 	resp, err := try.ResponseUntilStatusCode(req, 1500*time.Millisecond, http.StatusOK)
@@ -163,7 +163,7 @@ func (s *DockerSuite) TestDockerContainersWithTCPLabels(c *check.C) {
 		"traefik.tcp.Services.Super.Loadbalancer.server.port": "8080",
 	}
 
-	s.startContainerWithLabels(c, "containous/whoamitcp", labels, "-name", "my.super.host")
+	s.startContainerWithLabels(c, "traefik/whoamitcp", labels, "-name", "my.super.host")
 
 	// Start traefik
 	cmd, display := s.traefikCmd(withConfigFile(file))

integration/error_pages_test.go

@@ -5,8 +5,8 @@ import (
 	"os"
 	"time"
 
-	"github.com/containous/traefik/v2/integration/try"
 	"github.com/go-check/check"
+	"github.com/traefik/traefik/v2/integration/try"
 	checker "github.com/vdemeester/shakers"
 )
 

integration/etcd_test.go

@@ -12,10 +12,10 @@ import (
 	"github.com/abronan/valkeyrie"
 	"github.com/abronan/valkeyrie/store"
 	etcdv3 "github.com/abronan/valkeyrie/store/etcd/v3"
-	"github.com/containous/traefik/v2/integration/try"
-	"github.com/containous/traefik/v2/pkg/api"
 	"github.com/go-check/check"
 	"github.com/pmezard/go-difflib/difflib"
+	"github.com/traefik/traefik/v2/integration/try"
+	"github.com/traefik/traefik/v2/pkg/api"
 	checker "github.com/vdemeester/shakers"
 )
 

integration/fake_dns_server.go

@@ -5,8 +5,8 @@ import (
 	"net"
 	"os"
 
-	"github.com/containous/traefik/v2/pkg/log"
 	"github.com/miekg/dns"
+	"github.com/traefik/traefik/v2/pkg/log"
 )
 
 type handler struct{}

integration/file_test.go

@@ -5,8 +5,8 @@ import (
 	"os"
 	"time"
 
-	"github.com/containous/traefik/v2/integration/try"
 	"github.com/go-check/check"
+	"github.com/traefik/traefik/v2/integration/try"
 	checker "github.com/vdemeester/shakers"
 )
 

integration/fixtures/k8s/02-services.yml

@@ -4,24 +4,24 @@ metadata:
   name: whoami
   namespace: default
   labels:
-    app: containous
+    app: traefiklabs
     name: whoami
 
 spec:
   replicas: 2
   selector:
     matchLabels:
-      app: containous
+      app: traefiklabs
       task: whoami
   template:
     metadata:
       labels:
-        app: containous
+        app: traefiklabs
         task: whoami
     spec:
       containers:
-        - name: containouswhoami
-          image: containous/whoami
+        - name: whoami
+          image: traefik/whoami
           ports:
             - containerPort: 80
 
@@ -37,7 +37,7 @@ spec:
     - name: http
       port: 80
   selector:
-    app: containous
+    app: traefiklabs
     task: whoami
 
 ---
@@ -47,24 +47,24 @@ metadata:
   name: whoamitcp
   namespace: default
   labels:
-    app: containous
+    app: traefiklabs
     name: whoamitcp
 
 spec:
   replicas: 2
   selector:
     matchLabels:
-      app: containous
+      app: traefiklabs
       task: whoamitcp
   template:
     metadata:
       labels:
-        app: containous
+        app: traefiklabs
         task: whoamitcp
     spec:
       containers:
-        - name: containouswhoamitcp
-          image: containous/whoamitcp
+        - name: whoamitcp
+          image: traefik/whoamitcp
           ports:
             - containerPort: 8080
 
@@ -80,7 +80,7 @@ spec:
     - name: footcp
       port: 8080
   selector:
-    app: containous
+    app: traefiklabs
     task: whoamitcp
 
 ---
@@ -90,24 +90,24 @@ metadata:
   name: whoamiudp
   namespace: default
   labels:
-    app: containous
+    app: traefiklabs
     name: whoamiudp
 
 spec:
   replicas: 2
   selector:
     matchLabels:
-      app: containous
+      app: traefiklabs
       task: whoamiudp
   template:
     metadata:
       labels:
-        app: containous
+        app: traefiklabs
         task: whoamiudp
     spec:
       containers:
-        - name: containouswhoamiudp
-          image: containous/whoamiudp:dev
+        - name: whoamiudp
+          image: traefik/whoamiudp:latest
           ports:
             - containerPort: 8090
 
@@ -124,7 +124,7 @@ spec:
       name: fooudp
       port: 8090
   selector:
-    app: containous
+    app: traefiklabs
     task: whoamiudp
 
 ---
@@ -135,4 +135,4 @@ metadata:
   namespace: default
 spec:
   externalName: domain.com
-  type: ExternalName
+  type: ExternalName

integration/grpc_test.go

@@ -11,10 +11,10 @@ import (
 	"os"
 	"time"
 
-	"github.com/containous/traefik/v2/integration/helloworld"
-	"github.com/containous/traefik/v2/integration/try"
-	"github.com/containous/traefik/v2/pkg/log"
 	"github.com/go-check/check"
+	"github.com/traefik/traefik/v2/integration/helloworld"
+	"github.com/traefik/traefik/v2/integration/try"
+	"github.com/traefik/traefik/v2/pkg/log"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 )

integration/headers_test.go

@@ -5,8 +5,8 @@ import (
 	"os"
 	"time"
 
-	"github.com/containous/traefik/v2/integration/try"
 	"github.com/go-check/check"
+	"github.com/traefik/traefik/v2/integration/try"
 	checker "github.com/vdemeester/shakers"
 )
 

integration/healthcheck_test.go

@@ -6,8 +6,8 @@ import (
 	"os"
 	"time"
 
-	"github.com/containous/traefik/v2/integration/try"
 	"github.com/go-check/check"
+	"github.com/traefik/traefik/v2/integration/try"
 	checker "github.com/vdemeester/shakers"
 )
 

integration/hostresolver_test.go

@@ -4,8 +4,8 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/containous/traefik/v2/integration/try"
 	"github.com/go-check/check"
+	"github.com/traefik/traefik/v2/integration/try"
 	checker "github.com/vdemeester/shakers"
 )
 

integration/http_test.go

@@ -7,9 +7,9 @@ import (
 	"net/http/httptest"
 	"time"
 
-	"github.com/containous/traefik/v2/integration/try"
-	"github.com/containous/traefik/v2/pkg/config/dynamic"
 	"github.com/go-check/check"
+	"github.com/traefik/traefik/v2/integration/try"
+	"github.com/traefik/traefik/v2/pkg/config/dynamic"
 	checker "github.com/vdemeester/shakers"
 )
 

integration/https_test.go

@@ -11,10 +11,10 @@ import (
 	"time"
 
 	"github.com/BurntSushi/toml"
-	"github.com/containous/traefik/v2/integration/try"
-	"github.com/containous/traefik/v2/pkg/config/dynamic"
-	traefiktls "github.com/containous/traefik/v2/pkg/tls"
 	"github.com/go-check/check"
+	"github.com/traefik/traefik/v2/integration/try"
+	"github.com/traefik/traefik/v2/pkg/config/dynamic"
+	traefiktls "github.com/traefik/traefik/v2/pkg/tls"
 	checker "github.com/vdemeester/shakers"
 )
 

integration/integration_test.go

@@ -14,10 +14,10 @@ import (
 	"testing"
 	"text/template"
 
-	"github.com/containous/traefik/v2/pkg/log"
 	"github.com/fatih/structs"
 	"github.com/go-check/check"
 	compose "github.com/libkermit/compose/check"
+	"github.com/traefik/traefik/v2/pkg/log"
 	checker "github.com/vdemeester/shakers"
 )
 

integration/k8s_test.go

@@ -14,11 +14,11 @@ import (
 	"regexp"
 	"time"
 
-	"github.com/containous/traefik/v2/integration/try"
-	"github.com/containous/traefik/v2/pkg/api"
-	"github.com/containous/traefik/v2/pkg/log"
 	"github.com/go-check/check"
 	"github.com/pmezard/go-difflib/difflib"
+	"github.com/traefik/traefik/v2/integration/try"
+	"github.com/traefik/traefik/v2/pkg/api"
+	"github.com/traefik/traefik/v2/pkg/log"
 	checker "github.com/vdemeester/shakers"
 )
 

integration/keepalive_test.go

@@ -8,8 +8,8 @@ import (
 	"os"
 	"time"
 
-	"github.com/containous/traefik/v2/integration/try"
 	"github.com/go-check/check"
+	"github.com/traefik/traefik/v2/integration/try"
 	checker "github.com/vdemeester/shakers"
 )
 

integration/log_rotation_test.go

@@ -11,8 +11,8 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/containous/traefik/v2/integration/try"
 	"github.com/go-check/check"
+	"github.com/traefik/traefik/v2/integration/try"
 	checker "github.com/vdemeester/shakers"
 )
 

integration/marathon15_test.go

@@ -6,9 +6,9 @@ import (
 	"os"
 	"time"
 
-	"github.com/containous/traefik/v2/integration/try"
 	"github.com/gambol99/go-marathon"
 	"github.com/go-check/check"
+	"github.com/traefik/traefik/v2/integration/try"
 	checker "github.com/vdemeester/shakers"
 )
 
@@ -101,7 +101,7 @@ func (s *MarathonSuite15) TestConfigurationUpdate(c *check.C) {
 	app.Container.
 		Expose(80).
 		Docker.
-		Container("containous/whoami")
+		Container("traefik/whoami")
 	*app.Networks = append(*app.Networks, *marathon.NewBridgePodNetwork())
 
 	// Deploy the test application.
@@ -121,7 +121,7 @@ func (s *MarathonSuite15) TestConfigurationUpdate(c *check.C) {
 	app.Container.
 		Expose(80).
 		Docker.
-		Container("containous/whoami")
+		Container("traefik/whoami")
 	*app.Networks = append(*app.Networks, *marathon.NewBridgePodNetwork())
 
 	// Deploy the test application.

integration/marathon_test.go

@@ -6,9 +6,9 @@ import (
 	"os"
 	"time"
 
-	"github.com/containous/traefik/v2/integration/try"
 	"github.com/gambol99/go-marathon"
 	"github.com/go-check/check"
+	"github.com/traefik/traefik/v2/integration/try"
 	checker "github.com/vdemeester/shakers"
 )
 
@@ -111,7 +111,7 @@ func (s *MarathonSuite) TestConfigurationUpdate(c *check.C) {
 		AddLabel("traefik.http.Routers.rt.Rule", "PathPrefix(`/service`)")
 	app.Container.Docker.Bridged().
 		Expose(80).
-		Container("containous/whoami")
+		Container("traefik/whoami")
 
 	// Deploy the test application.
 	deployApplication(c, client, app)
@@ -128,7 +128,7 @@ func (s *MarathonSuite) TestConfigurationUpdate(c *check.C) {
 		AddLabel("traefik.http.Routers.app.Rule", "PathPrefix(`/app`)")
 	app.Container.Docker.Bridged().
 		Expose(80).
-		Container("containous/whoami")
+		Container("traefik/whoami")
 
 	// Deploy the test application.
 	deployApplication(c, client, app)

integration/proxy_protocol_test.go

@@ -5,8 +5,8 @@ import (
 	"os"
 	"time"
 
-	"github.com/containous/traefik/v2/integration/try"
 	"github.com/go-check/check"
+	"github.com/traefik/traefik/v2/integration/try"
 	checker "github.com/vdemeester/shakers"
 )
 

integration/ratelimit_test.go

@@ -5,8 +5,8 @@ import (
 	"os"
 	"time"
 
-	"github.com/containous/traefik/v2/integration/try"
 	"github.com/go-check/check"
+	"github.com/traefik/traefik/v2/integration/try"
 	checker "github.com/vdemeester/shakers"
 )
 

integration/redis_test.go

@@ -12,10 +12,10 @@ import (
 	"github.com/abronan/valkeyrie"
 	"github.com/abronan/valkeyrie/store"
 	"github.com/abronan/valkeyrie/store/redis"
-	"github.com/containous/traefik/v2/integration/try"
-	"github.com/containous/traefik/v2/pkg/api"
 	"github.com/go-check/check"
 	"github.com/pmezard/go-difflib/difflib"
+	"github.com/traefik/traefik/v2/integration/try"
+	"github.com/traefik/traefik/v2/pkg/api"
 	checker "github.com/vdemeester/shakers"
 )
 

integration/resources/compose/access_log.yml

@@ -1,12 +1,12 @@
 server0:
-  image: containous/whoami
+  image: traefik/whoami
   labels:
     - traefik.enable=true
     - traefik.http.routers.rt-server0.entryPoints=web
     - traefik.http.routers.rt-server0.rule=Path("/test")
     - traefik.http.services.service1.loadbalancer.server.port=80
 server1:
-  image: containous/whoami
+  image: traefik/whoami
   labels:
     - traefik.enable=true
     - traefik.http.routers.rt-server1.entryPoints=web
@@ -14,21 +14,21 @@ server1:
     - traefik.http.routers.rt-server1.service=service1
     - traefik.http.services.service1.loadbalancer.server.port=80
 server2:
-  image: containous/whoami
+  image: traefik/whoami
   labels:
     - traefik.enable=true
     - traefik.http.routers.rt-server2.entryPoints=web
     - traefik.http.routers.rt-server2.rule=Host("frontend2.docker.local")
     - traefik.http.services.service2.loadbalancer.server.port=80
 server3:
-  image: containous/whoami
+  image: traefik/whoami
   labels:
     - traefik.enable=true
     - traefik.http.routers.rt-server3.entryPoints=web
     - traefik.http.routers.rt-server3.rule=Host("frontend2.docker.local")
     - traefik.http.services.service2.loadbalancer.server.port=80
 authFrontend:
-  image: containous/whoami
+  image: traefik/whoami
   labels:
     - traefik.enable=true
     - traefik.http.routers.rt-authFrontend.entryPoints=httpFrontendAuth
@@ -37,7 +37,7 @@ authFrontend:
     - traefik.http.middlewares.basicauth.basicauth.users=test:$$apr1$$H6uskkkW$$IgXLP6ewTrSuBkTrqE8wj/
     - traefik.http.services.service3.loadbalancer.server.port=80
 digestAuthMiddleware:
-  image: containous/whoami
+  image: traefik/whoami
   labels:
     - traefik.enable=true
     - traefik.http.routers.rt-digestAuthMiddleware.entryPoints=digestAuth
@@ -46,7 +46,7 @@ digestAuthMiddleware:
     - traefik.http.middlewares.digestauth.digestauth.users=test:traefik:a2688e031edb4be6a3797f3882655c05, test2:traefik:518845800f9e2bfb1f1f740ec24f074e
     - traefik.http.services.service3.loadbalancer.server.port=80
 frontendRedirect:
-  image: containous/whoami
+  image: traefik/whoami
   labels:
     - traefik.enable=true
     - traefik.http.routers.rt-frontendRedirect.entryPoints=frontendRedirect
@@ -56,7 +56,7 @@ frontendRedirect:
     - traefik.http.middlewares.redirecthttp.redirectScheme.port=8000
     - traefik.http.services.service3.loadbalancer.server.port=80
 rateLimit:
-  image: containous/whoami
+  image: traefik/whoami
   labels:
     - traefik.enable=true
     - traefik.http.routers.rt-rateLimit.entryPoints=httpRateLimit
@@ -67,7 +67,7 @@ rateLimit:
     - traefik.http.middlewares.rate.ratelimit.burst=2
     - traefik.http.services.service3.loadbalancer.server.port=80
 frontendWhitelist:
-  image: containous/whoami
+  image: traefik/whoami
   labels:
     - traefik.enable=true
     - traefik.http.routers.rt-frontendWhitelist.entryPoints=web

integration/resources/compose/base.yml

@@ -1,10 +1,10 @@
 whoami1:
-  image: containous/whoami
+  image: traefik/whoami
   labels:
     - traefik.enable=true
     - traefik.http.routers.router1.rule=PathPrefix("/whoami")
 
 whoami2:
-  image: containous/whoami
+  image: traefik/whoami
   labels:
     - traefik.enable=false

integration/resources/compose/consul_catalog.yml

@@ -11,14 +11,14 @@ consul-agent:
   links:
     - consul
 whoami1:
-  image: containous/whoami:v1.3.0
+  image: traefik/whoami
   hostname: whoami1
 whoami2:
-  image: containous/whoami:v1.3.0
+  image: traefik/whoami
   hostname: whoami2
 whoami3:
-  image: containous/whoami:v1.3.0
+  image: traefik/whoami
   hostname: whoami3
 whoamitcp:
-  image: containous/whoamitcp
+  image: traefik/whoamitcp
   hostname: whoamitcp

integration/resources/compose/file.yml

@@ -1,20 +1,20 @@
 whoami1:
-  image: containous/whoami
+  image: traefik/whoami
   ports:
     - "8881:80"
 whoami2:
-  image: containous/whoami
+  image: traefik/whoami
   ports:
     - "8882:80"
 whoami3:
-  image: containous/whoami
+  image: traefik/whoami
   ports:
     - "8883:80"
 whoami4:
-  image: containous/whoami
+  image: traefik/whoami
   ports:
     - "8884:80"
 whoami5:
-  image: containous/whoami
+  image: traefik/whoami
   ports:
     - "8885:80"

integration/resources/compose/healthcheck.yml

@@ -1,5 +1,5 @@
 whoami1:
-  image: containous/whoami
+  image: traefik/whoami
 
 whoami2:
-  image: containous/whoami
+  image: traefik/whoami

integration/resources/compose/hostresolver.yml

@@ -1,5 +1,5 @@
 server1:
-  image: containous/whoami
+  image: traefik/whoami
   labels:
     - traefik.enable=true
     - traefik.http.services.service1.loadbalancer.server.port=80

integration/resources/compose/k8s.yml

@@ -1,6 +1,6 @@
 server:
   image: rancher/k3s:v1.17.2-k3s1
-  command: server --disable-agent --no-deploy traefik --log /output/k3s.log
+  command: server --disable-agent --no-deploy coredns --no-deploy servicelb --no-deploy traefik --no-deploy local-storage --no-deploy metrics-server --log /output/k3s.log
   environment:
     - K3S_CLUSTER_SECRET=somethingtotallyrandom
     - K3S_KUBECONFIG_OUTPUT=/output/kubeconfig.yaml

integration/resources/compose/minimal.yml

@@ -1,5 +1,5 @@
 whoami1:
-  image: containous/whoami
+  image: traefik/whoami
   labels:
     - traefik.http.Routers.RouterMini.Rule=PathPrefix("/whoami")
     - traefik.enable=true

integration/resources/compose/proxy-protocol.yml

@@ -4,4 +4,4 @@ haproxy:
     - ../haproxy/haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg
 
 whoami:
-  image: containous/whoami
+  image: traefik/whoami

integration/resources/compose/ratelimit.yml

@@ -1,2 +1,2 @@
 whoami1:
-  image: containous/whoami
+  image: traefik/whoami

integration/resources/compose/reqacceptgrace.yml

@@ -1,2 +1,2 @@
 whoami:
-  image: containous/whoami
+  image: traefik/whoami

integration/resources/compose/rest.yml

@@ -1,4 +1,4 @@
 whoami1:
-  image: containous/whoami
+  image: traefik/whoami
   ports:
     - "8881:80"

integration/resources/compose/retry.yml

@@ -1,2 +1,2 @@
 whoami:
-  image: containous/whoami
+  image: traefik/whoami

integration/resources/compose/stats.yml

@@ -1,4 +1,4 @@
 whoami1:
-  image: containous/whoami
+  image: traefik/whoami
 whoami2:
-  image: containous/whoami
+  image: traefik/whoami

integration/resources/compose/tcp.yml

@@ -1,5 +1,5 @@
 whoami-a:
-  image: containous/whoamitcp
+  image: traefik/whoamitcp
   command: -name whoami-a -certFile /certs/whoami-a.crt -keyFile /certs/whoami-a.key
   volumes:
     - ../../fixtures/tcp:/certs
@@ -7,7 +7,7 @@ whoami-a:
     - "8081:8080"
 
 whoami-b:
-  image: containous/whoamitcp
+  image: traefik/whoamitcp
   command: -name whoami-b -certFile /certs/whoami-b.crt -keyFile /certs/whoami-b.key
   volumes:
     - ../../fixtures/tcp:/certs
@@ -15,24 +15,24 @@ whoami-b:
     - "8082:8080"
 
 whoami-no-cert:
-  image: containous/whoamitcp
+  image: traefik/whoamitcp
   command: -name whoami-no-cert
   ports:
     - "8083:8080"
 
 whoami-no-tls:
-  image: containous/whoamitcp
+  image: traefik/whoamitcp
   command: -name whoami-no-tls
   ports:
     - "8084:8080"
 
 whoami:
-  image: containous/whoami
+  image: traefik/whoami
   ports:
     - "8085:80"
 
 whoami-banner:
-  image: containous/whoamitcp
+  image: traefik/whoamitcp
   command: -name whoami-banner --banner
   ports:
     - "8086:8080"

integration/resources/compose/tlsclientheaders.yml

@@ -1,5 +1,5 @@
 whoami:
-    image: containous/whoami
+    image: traefik/whoami
     labels:
       - traefik.http.routers.route1.rule=PathPrefix(`/`)
       - traefik.http.routers.route1.middlewares=passtls

integration/resources/compose/tracing.yml

@@ -18,4 +18,4 @@ jaeger:
     - "14268:14268"
     - "9411:9411"
 whoami:
-  image: containous/whoami
+  image: traefik/whoami

integration/resources/compose/udp.yml

@@ -1,14 +1,14 @@
 whoami-a:
-  image: containous/whoamiudp:dev
+  image: traefik/whoamiudp:latest
   command: -name whoami-a
 
 whoami-b:
-  image: containous/whoamiudp:dev
+  image: traefik/whoamiudp:latest
   command: -name whoami-b
 
 whoami-c:
-  image: containous/whoamiudp:dev
+  image: traefik/whoamiudp:latest
   command: -name whoami-c
 
 whoami-d:
-  image: containous/whoami
+  image: traefik/whoami

integration/resources/compose/whitelist.yml

@@ -1,5 +1,5 @@
 noOverrideWhitelist:
-  image: containous/whoami
+  image: traefik/whoami
   labels:
     - traefik.enable=true
     - traefik.http.routers.rt1.rule=Host("no.override.whitelist.docker.local")
@@ -7,7 +7,7 @@ noOverrideWhitelist:
     - traefik.http.middlewares.wl1.ipwhiteList.sourceRange=8.8.8.8
 
 overrideIPStrategyRemoteAddrWhitelist:
-  image: containous/whoami
+  image: traefik/whoami
   labels:
     - traefik.enable=true
     - traefik.http.routers.rt2.rule=Host("override.remoteaddr.whitelist.docker.local")
@@ -16,7 +16,7 @@ overrideIPStrategyRemoteAddrWhitelist:
     - traefik.http.middlewares.wl2.ipwhitelist.ipStrategy=true
 
 overrideIPStrategyDepthWhitelist:
-  image: containous/whoami
+  image: traefik/whoami
   labels:
   - traefik.enable=true
   - traefik.http.routers.rt3.rule=Host("override.depth.whitelist.docker.local")
@@ -25,7 +25,7 @@ overrideIPStrategyDepthWhitelist:
   - traefik.http.middlewares.wl3.ipwhitelist.ipStrategy.depth=3
 
 overrideIPStrategyExcludedIPsWhitelist:
-  image: containous/whoami
+  image: traefik/whoami
   labels:
   - traefik.enable=true
   - traefik.http.routers.rt4.rule=Host("override.excludedips.whitelist.docker.local")

integration/rest_test.go

@@ -8,9 +8,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/containous/traefik/v2/integration/try"
-	"github.com/containous/traefik/v2/pkg/config/dynamic"
 	"github.com/go-check/check"
+	"github.com/traefik/traefik/v2/integration/try"
+	"github.com/traefik/traefik/v2/pkg/config/dynamic"
 	checker "github.com/vdemeester/shakers"
 )
 

integration/retry_test.go

@@ -5,9 +5,9 @@ import (
 	"os"
 	"time"
 
-	"github.com/containous/traefik/v2/integration/try"
 	"github.com/go-check/check"
 	"github.com/gorilla/websocket"
+	"github.com/traefik/traefik/v2/integration/try"
 	checker "github.com/vdemeester/shakers"
 )
 

integration/simple_test.go

@@ -14,9 +14,9 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/containous/traefik/v2/integration/try"
-	"github.com/containous/traefik/v2/pkg/config/dynamic"
 	"github.com/go-check/check"
+	"github.com/traefik/traefik/v2/integration/try"
+	"github.com/traefik/traefik/v2/pkg/config/dynamic"
 	checker "github.com/vdemeester/shakers"
 )
 

integration/tcp_test.go

@@ -9,8 +9,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/containous/traefik/v2/integration/try"
 	"github.com/go-check/check"
+	"github.com/traefik/traefik/v2/integration/try"
 	checker "github.com/vdemeester/shakers"
 )
 

integration/timeout_test.go

@@ -6,8 +6,8 @@ import (
 	"os"
 	"time"
 
-	"github.com/containous/traefik/v2/integration/try"
 	"github.com/go-check/check"
+	"github.com/traefik/traefik/v2/integration/try"
 	checker "github.com/vdemeester/shakers"
 )
 

integration/tls_client_headers_test.go

@@ -7,8 +7,8 @@ import (
 	"os"
 	"time"
 
-	"github.com/containous/traefik/v2/integration/try"
 	"github.com/go-check/check"
+	"github.com/traefik/traefik/v2/integration/try"
 	checker "github.com/vdemeester/shakers"
 )
 

integration/tracing_test.go

@@ -5,8 +5,8 @@ import (
 	"os"
 	"time"
 
-	"github.com/containous/traefik/v2/integration/try"
 	"github.com/go-check/check"
+	"github.com/traefik/traefik/v2/integration/try"
 	checker "github.com/vdemeester/shakers"
 )
 

integration/try/try.go

@@ -7,7 +7,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/containous/traefik/v2/pkg/log"
+	"github.com/traefik/traefik/v2/pkg/log"
 )
 
 const (

integration/udp_test.go

@@ -7,8 +7,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/containous/traefik/v2/integration/try"
 	"github.com/go-check/check"
+	"github.com/traefik/traefik/v2/integration/try"
 	checker "github.com/vdemeester/shakers"
 )
 

integration/websocket_test.go

@@ -11,9 +11,9 @@ import (
 	"os"
 	"time"
 
-	"github.com/containous/traefik/v2/integration/try"
 	"github.com/go-check/check"
 	gorillawebsocket "github.com/gorilla/websocket"
+	"github.com/traefik/traefik/v2/integration/try"
 	checker "github.com/vdemeester/shakers"
 	"golang.org/x/net/websocket"
 )

integration/zk_test.go

@@ -12,10 +12,10 @@ import (
 	"github.com/abronan/valkeyrie"
 	"github.com/abronan/valkeyrie/store"
 	"github.com/abronan/valkeyrie/store/zookeeper"
-	"github.com/containous/traefik/v2/integration/try"
-	"github.com/containous/traefik/v2/pkg/api"
 	"github.com/go-check/check"
 	"github.com/pmezard/go-difflib/difflib"
+	"github.com/traefik/traefik/v2/integration/try"
+	"github.com/traefik/traefik/v2/pkg/api"
 	checker "github.com/vdemeester/shakers"
 )