Merge branch v2.3 into master

pkg/config/dynamic/config.go

@@ -1,7 +1,7 @@
 package dynamic
 
 import (
-	"github.com/containous/traefik/v2/pkg/tls"
+	"github.com/traefik/traefik/v2/pkg/tls"
 )
 
 // +k8s:deepcopy-gen=true

pkg/config/dynamic/http_config.go

@@ -4,9 +4,9 @@ import (
 	"reflect"
 	"time"
 
-	"github.com/containous/traefik/v2/pkg/tls"
-	"github.com/containous/traefik/v2/pkg/types"
 	ptypes "github.com/traefik/paerser/types"
+	"github.com/traefik/traefik/v2/pkg/tls"
+	"github.com/traefik/traefik/v2/pkg/types"
 )
 
 // +k8s:deepcopy-gen=true

pkg/config/dynamic/middlewares.go

@@ -8,8 +8,8 @@ import (
 	"os"
 	"time"
 
-	"github.com/containous/traefik/v2/pkg/ip"
 	ptypes "github.com/traefik/paerser/types"
+	"github.com/traefik/traefik/v2/pkg/ip"
 )
 
 // +k8s:deepcopy-gen=true

pkg/config/dynamic/tcp_config.go

@@ -3,7 +3,7 @@ package dynamic
 import (
 	"reflect"
 
-	"github.com/containous/traefik/v2/pkg/types"
+	"github.com/traefik/traefik/v2/pkg/types"
 )
 
 // +k8s:deepcopy-gen=true

pkg/config/dynamic/zz_generated.deepcopy.go

@@ -3,7 +3,7 @@
 /*
 The MIT License (MIT)
 
-Copyright (c) 2016-2020 Containous SAS
+Copyright (c) 2016-2020 Containous SAS; 2020-2020 Traefik Labs
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -29,8 +29,8 @@ THE SOFTWARE.
 package dynamic
 
 import (
-	tls "github.com/containous/traefik/v2/pkg/tls"
-	types "github.com/containous/traefik/v2/pkg/types"
+	tls "github.com/traefik/traefik/v2/pkg/tls"
+	types "github.com/traefik/traefik/v2/pkg/types"
 )
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.