Merge branch v2.3 into master

This commit is contained in:
Fernandez Ludovic 2020-09-17 12:06:57 +02:00
commit 86c099d629
440 changed files with 5538 additions and 5466 deletions

View file

@ -6,10 +6,10 @@ import (
"io/ioutil"
"time"
"github.com/containous/traefik/v2/pkg/log"
"github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned"
"github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/informers/externalversions"
"github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1"
"github.com/traefik/traefik/v2/pkg/log"
"github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned"
"github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/informers/externalversions"
"github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1"
corev1 "k8s.io/api/core/v1"
kubeerror "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"