From 044dc6a221a1872a8741c1030503d803cafa02cf Mon Sep 17 00:00:00 2001 From: Ludovic Fernandez Date: Fri, 3 Feb 2023 15:24:05 +0100 Subject: [PATCH] fix: go module --- .goreleaser.yml | 2 +- cmd/configuration.go | 2 +- cmd/healthcheck/healthcheck.go | 2 +- cmd/internal/gen/main.go | 22 ++++---- cmd/traefik/logger.go | 4 +- cmd/traefik/plugins.go | 4 +- cmd/traefik/traefik.go | 52 +++++++++--------- cmd/traefik/traefik_test.go | 2 +- cmd/version/version.go | 2 +- docs/content/providers/docker.md | 2 +- go.mod | 2 +- integration/access_log_test.go | 4 +- integration/acme_test.go | 10 ++-- integration/conf_throttling_test.go | 4 +- integration/consul_catalog_test.go | 2 +- integration/consul_test.go | 4 +- integration/docker_compose_test.go | 6 +-- integration/docker_test.go | 2 +- integration/error_pages_test.go | 2 +- integration/etcd_test.go | 4 +- integration/file_test.go | 2 +- integration/grpc_test.go | 4 +- integration/headers_test.go | 2 +- integration/healthcheck_test.go | 2 +- integration/hostresolver_test.go | 2 +- integration/http_test.go | 4 +- integration/https_test.go | 6 +-- integration/integration_test.go | 2 +- integration/k8s_test.go | 4 +- integration/keepalive_test.go | 2 +- integration/log_rotation_test.go | 2 +- integration/proxy_protocol_test.go | 2 +- integration/ratelimit_test.go | 2 +- integration/redis_test.go | 4 +- integration/rest_test.go | 4 +- integration/retry_test.go | 2 +- integration/simple_test.go | 4 +- integration/tcp_test.go | 2 +- integration/timeout_test.go | 2 +- integration/tls_client_headers_test.go | 2 +- integration/tracing_test.go | 2 +- integration/udp_test.go | 2 +- integration/websocket_test.go | 2 +- integration/zk_test.go | 4 +- internal/gendoc.go | 2 +- pkg/api/dashboard/dashboard.go | 2 +- pkg/api/handler.go | 8 +-- pkg/api/handler_entrypoint.go | 2 +- pkg/api/handler_entrypoint_test.go | 4 +- pkg/api/handler_http.go | 4 +- pkg/api/handler_http_test.go | 6 +-- pkg/api/handler_overview.go | 4 +- pkg/api/handler_overview_test.go | 22 ++++---- pkg/api/handler_tcp.go | 2 +- pkg/api/handler_tcp_test.go | 6 +-- pkg/api/handler_test.go | 6 +-- pkg/api/handler_udp.go | 2 +- pkg/api/handler_udp_test.go | 6 +-- pkg/api/sort_test.go | 4 +- pkg/collector/collector.go | 6 +-- pkg/collector/collector_test.go | 2 +- pkg/config/dynamic/config.go | 2 +- pkg/config/dynamic/http_config.go | 4 +- pkg/config/dynamic/middlewares.go | 4 +- pkg/config/dynamic/tcp_config.go | 4 +- pkg/config/dynamic/zz_generated.deepcopy.go | 4 +- pkg/config/label/label.go | 2 +- pkg/config/label/label_test.go | 4 +- pkg/config/runtime/runtime.go | 4 +- pkg/config/runtime/runtime_http.go | 4 +- pkg/config/runtime/runtime_http_test.go | 2 +- pkg/config/runtime/runtime_tcp.go | 4 +- pkg/config/runtime/runtime_tcp_test.go | 2 +- pkg/config/runtime/runtime_test.go | 4 +- pkg/config/runtime/runtime_udp.go | 4 +- pkg/config/runtime/runtime_udp_test.go | 2 +- pkg/config/static/entrypoints.go | 2 +- pkg/config/static/experimental.go | 2 +- pkg/config/static/hub.go | 4 +- pkg/config/static/static_config.go | 54 +++++++++---------- pkg/config/static/static_config_test.go | 2 +- pkg/healthcheck/healthcheck.go | 4 +- pkg/healthcheck/healthcheck_test.go | 6 +-- pkg/healthcheck/mock_test.go | 4 +- pkg/metrics/datadog.go | 6 +-- pkg/metrics/datadog_test.go | 2 +- pkg/metrics/influxdb2.go | 6 +-- pkg/metrics/influxdb2_test.go | 2 +- pkg/metrics/opentelemetry.go | 4 +- pkg/metrics/opentelemetry_test.go | 4 +- pkg/metrics/prometheus.go | 4 +- pkg/metrics/prometheus_test.go | 6 +-- pkg/metrics/statsd.go | 6 +-- pkg/metrics/statsd_test.go | 2 +- pkg/middlewares/accesslog/field_middleware.go | 4 +- pkg/middlewares/accesslog/logger.go | 8 +-- pkg/middlewares/accesslog/logger_test.go | 4 +- pkg/middlewares/addprefix/add_prefix.go | 6 +-- pkg/middlewares/addprefix/add_prefix_test.go | 4 +- pkg/middlewares/auth/basic_auth.go | 8 +-- pkg/middlewares/auth/basic_auth_test.go | 4 +- pkg/middlewares/auth/digest_auth.go | 8 +-- pkg/middlewares/auth/digest_auth_test.go | 4 +- pkg/middlewares/auth/forward.go | 8 +-- pkg/middlewares/auth/forward_test.go | 8 +-- pkg/middlewares/buffering/buffering.go | 8 +-- pkg/middlewares/buffering/buffering_test.go | 2 +- pkg/middlewares/capture/capture.go | 2 +- pkg/middlewares/capture/capture_test.go | 2 +- pkg/middlewares/chain/chain.go | 4 +- .../circuitbreaker/circuit_breaker.go | 8 +-- pkg/middlewares/compress/compress.go | 8 +-- pkg/middlewares/compress/compress_test.go | 4 +- pkg/middlewares/contenttype/content_type.go | 2 +- .../contenttype/content_type_test.go | 2 +- pkg/middlewares/customerrors/custom_errors.go | 8 +-- .../customerrors/custom_errors_test.go | 4 +- pkg/middlewares/extractor.go | 2 +- .../forwardedheaders/forwarded_header.go | 2 +- pkg/middlewares/grpcweb/grpcweb.go | 4 +- pkg/middlewares/handler_switcher.go | 2 +- pkg/middlewares/headers/header.go | 2 +- pkg/middlewares/headers/header_test.go | 2 +- pkg/middlewares/headers/headers.go | 8 +-- pkg/middlewares/headers/headers_test.go | 4 +- pkg/middlewares/headers/secure.go | 2 +- pkg/middlewares/headers/secure_test.go | 2 +- pkg/middlewares/inflightreq/inflight_req.go | 8 +-- pkg/middlewares/ipallowlist/ip_allowlist.go | 8 +-- .../ipallowlist/ip_allowlist_test.go | 2 +- pkg/middlewares/metrics/metrics.go | 10 ++-- pkg/middlewares/middleware.go | 2 +- .../passtlsclientcert/pass_tls_client_cert.go | 6 +-- .../pass_tls_client_cert_test.go | 4 +- pkg/middlewares/ratelimiter/rate_limiter.go | 6 +-- .../ratelimiter/rate_limiter_test.go | 4 +- pkg/middlewares/recovery/recovery.go | 2 +- pkg/middlewares/redirect/redirect.go | 2 +- pkg/middlewares/redirect/redirect_regex.go | 4 +- .../redirect/redirect_regex_test.go | 2 +- pkg/middlewares/redirect/redirect_scheme.go | 4 +- .../redirect/redirect_scheme_test.go | 2 +- pkg/middlewares/replacepath/replace_path.go | 6 +-- .../replacepath/replace_path_test.go | 2 +- .../replacepathregex/replace_path_regex.go | 8 +-- .../replace_path_regex_test.go | 4 +- .../requestdecorator/request_decorator.go | 2 +- .../request_decorator_test.go | 4 +- pkg/middlewares/retry/retry.go | 6 +-- pkg/middlewares/retry/retry_test.go | 4 +- pkg/middlewares/snicheck/snicheck.go | 4 +- pkg/middlewares/stripprefix/strip_prefix.go | 6 +-- .../stripprefix/strip_prefix_test.go | 4 +- .../stripprefixregex/strip_prefix_regex.go | 8 +-- .../strip_prefix_regex_test.go | 6 +-- .../tcp/inflightconn/inflight_conn.go | 6 +-- .../tcp/inflightconn/inflight_conn_test.go | 4 +- .../tcp/ipallowlist/ip_allowlist.go | 8 +-- .../tcp/ipallowlist/ip_allowlist_test.go | 4 +- pkg/middlewares/tracing/entrypoint.go | 4 +- pkg/middlewares/tracing/entrypoint_test.go | 2 +- pkg/middlewares/tracing/forwarder.go | 6 +-- pkg/middlewares/tracing/forwarder_test.go | 2 +- pkg/middlewares/tracing/wrapper.go | 4 +- pkg/muxer/http/matcher.go | 4 +- pkg/muxer/http/matcher_test.go | 2 +- pkg/muxer/http/mux.go | 2 +- pkg/muxer/http/mux_test.go | 4 +- pkg/muxer/tcp/matcher.go | 2 +- pkg/muxer/tcp/matcher_test.go | 2 +- pkg/muxer/tcp/mux.go | 6 +-- pkg/muxer/tcp/mux_test.go | 2 +- pkg/plugins/builder.go | 2 +- pkg/plugins/client.go | 2 +- pkg/plugins/providers.go | 12 ++--- pkg/provider/acme/account.go | 2 +- pkg/provider/acme/challenge_http.go | 4 +- pkg/provider/acme/challenge_tls.go | 10 ++-- pkg/provider/acme/local_store.go | 4 +- pkg/provider/acme/provider.go | 16 +++--- pkg/provider/acme/provider_test.go | 4 +- pkg/provider/aggregator/aggregator.go | 14 ++--- pkg/provider/aggregator/aggregator_test.go | 6 +-- pkg/provider/aggregator/ring_channel.go | 2 +- pkg/provider/configuration.go | 4 +- pkg/provider/consulcatalog/config.go | 10 ++-- pkg/provider/consulcatalog/config_test.go | 4 +- pkg/provider/consulcatalog/connect_tls.go | 4 +- pkg/provider/consulcatalog/consul_catalog.go | 14 ++--- pkg/provider/consulcatalog/label.go | 2 +- pkg/provider/docker/config.go | 10 ++-- pkg/provider/docker/config_test.go | 2 +- pkg/provider/docker/docker.go | 14 ++--- pkg/provider/docker/label.go | 2 +- pkg/provider/ecs/config.go | 8 +-- pkg/provider/ecs/config_test.go | 2 +- pkg/provider/ecs/ecs.go | 10 ++-- pkg/provider/ecs/label.go | 2 +- pkg/provider/file/file.go | 10 ++-- pkg/provider/file/file_test.go | 4 +- pkg/provider/http/http.go | 14 ++--- pkg/provider/http/http_test.go | 6 +-- pkg/provider/hub/handler.go | 2 +- pkg/provider/hub/handler_test.go | 4 +- pkg/provider/hub/hub.go | 10 ++-- pkg/provider/kubernetes/crd/client.go | 10 ++-- .../kubernetes/crd/client_mock_test.go | 4 +- pkg/provider/kubernetes/crd/client_test.go | 2 +- .../clientset/versioned/clientset.go | 2 +- .../versioned/fake/clientset_generated.go | 6 +-- .../clientset/versioned/fake/register.go | 2 +- .../clientset/versioned/scheme/register.go | 2 +- .../v1alpha1/fake/fake_ingressroute.go | 2 +- .../v1alpha1/fake/fake_ingressroutetcp.go | 2 +- .../v1alpha1/fake/fake_ingressrouteudp.go | 2 +- .../traefik/v1alpha1/fake/fake_middleware.go | 2 +- .../v1alpha1/fake/fake_middlewaretcp.go | 2 +- .../v1alpha1/fake/fake_serverstransport.go | 2 +- .../v1alpha1/fake/fake_serverstransporttcp.go | 2 +- .../traefik/v1alpha1/fake/fake_tlsoption.go | 2 +- .../traefik/v1alpha1/fake/fake_tlsstore.go | 2 +- .../v1alpha1/fake/fake_traefik_client.go | 2 +- .../v1alpha1/fake/fake_traefikservice.go | 2 +- .../typed/traefik/v1alpha1/ingressroute.go | 4 +- .../typed/traefik/v1alpha1/ingressroutetcp.go | 4 +- .../typed/traefik/v1alpha1/ingressrouteudp.go | 4 +- .../typed/traefik/v1alpha1/middleware.go | 4 +- .../typed/traefik/v1alpha1/middlewaretcp.go | 4 +- .../traefik/v1alpha1/serverstransport.go | 4 +- .../traefik/v1alpha1/serverstransporttcp.go | 4 +- .../typed/traefik/v1alpha1/tlsoption.go | 4 +- .../typed/traefik/v1alpha1/tlsstore.go | 4 +- .../typed/traefik/v1alpha1/traefik_client.go | 4 +- .../typed/traefik/v1alpha1/traefikservice.go | 4 +- .../informers/externalversions/factory.go | 6 +-- .../informers/externalversions/generic.go | 2 +- .../internalinterfaces/factory_interfaces.go | 2 +- .../externalversions/traefik/interface.go | 4 +- .../traefik/v1alpha1/ingressroute.go | 8 +-- .../traefik/v1alpha1/ingressroutetcp.go | 8 +-- .../traefik/v1alpha1/ingressrouteudp.go | 8 +-- .../traefik/v1alpha1/interface.go | 2 +- .../traefik/v1alpha1/middleware.go | 8 +-- .../traefik/v1alpha1/middlewaretcp.go | 8 +-- .../traefik/v1alpha1/serverstransport.go | 8 +-- .../traefik/v1alpha1/serverstransporttcp.go | 8 +-- .../traefik/v1alpha1/tlsoption.go | 8 +-- .../traefik/v1alpha1/tlsstore.go | 8 +-- .../traefik/v1alpha1/traefikservice.go | 8 +-- .../listers/traefik/v1alpha1/ingressroute.go | 2 +- .../traefik/v1alpha1/ingressroutetcp.go | 2 +- .../traefik/v1alpha1/ingressrouteudp.go | 2 +- .../listers/traefik/v1alpha1/middleware.go | 2 +- .../listers/traefik/v1alpha1/middlewaretcp.go | 2 +- .../traefik/v1alpha1/serverstransport.go | 2 +- .../traefik/v1alpha1/serverstransporttcp.go | 2 +- .../listers/traefik/v1alpha1/tlsoption.go | 2 +- .../listers/traefik/v1alpha1/tlsstore.go | 2 +- .../traefik/v1alpha1/traefikservice.go | 2 +- pkg/provider/kubernetes/crd/kubernetes.go | 16 +++--- .../kubernetes/crd/kubernetes_http.go | 10 ++-- pkg/provider/kubernetes/crd/kubernetes_tcp.go | 10 ++-- .../kubernetes/crd/kubernetes_test.go | 14 ++--- pkg/provider/kubernetes/crd/kubernetes_udp.go | 4 +- .../crd/traefik/v1alpha1/ingressroute.go | 4 +- .../crd/traefik/v1alpha1/ingressroutetcp.go | 4 +- .../crd/traefik/v1alpha1/middleware.go | 2 +- .../crd/traefik/v1alpha1/middlewaretcp.go | 2 +- .../crd/traefik/v1alpha1/serverstransport.go | 2 +- .../traefik/v1alpha1/serverstransporttcp.go | 2 +- .../crd/traefik/v1alpha1/service.go | 2 +- .../crd/traefik/v1alpha1/tlsstore.go | 2 +- .../traefik/v1alpha1/zz_generated.deepcopy.go | 6 +-- .../kubernetes/gateway/client_mock_test.go | 2 +- pkg/provider/kubernetes/gateway/kubernetes.go | 14 ++--- .../kubernetes/gateway/kubernetes_test.go | 6 +-- .../kubernetes/ingress/annotations.go | 4 +- .../kubernetes/ingress/annotations_test.go | 4 +- pkg/provider/kubernetes/ingress/client.go | 4 +- .../kubernetes/ingress/client_mock_test.go | 2 +- pkg/provider/kubernetes/ingress/kubernetes.go | 12 ++--- .../kubernetes/ingress/kubernetes_test.go | 8 +-- pkg/provider/kv/consul/consul.go | 6 +-- pkg/provider/kv/etcd/etcd.go | 6 +-- pkg/provider/kv/kv.go | 10 ++-- pkg/provider/kv/kv_test.go | 6 +-- pkg/provider/kv/redis/redis.go | 6 +-- pkg/provider/kv/zk/zk.go | 4 +- pkg/provider/nomad/config.go | 10 ++-- pkg/provider/nomad/config_test.go | 2 +- pkg/provider/nomad/nomad.go | 14 ++--- pkg/provider/provider.go | 4 +- pkg/provider/rest/rest.go | 6 +-- pkg/provider/tailscale/provider.go | 12 ++--- pkg/provider/tailscale/provider_test.go | 6 +-- pkg/provider/traefik/internal.go | 12 ++--- pkg/provider/traefik/internal_test.go | 8 +-- pkg/redactor/redactor.go | 4 +- pkg/redactor/redactor_config_test.go | 54 +++++++++---------- pkg/server/aggregator.go | 8 +-- pkg/server/aggregator_test.go | 4 +- pkg/server/configurationwatcher.go | 10 ++-- pkg/server/configurationwatcher_test.go | 10 ++-- pkg/server/middleware/chainbuilder.go | 12 ++--- pkg/server/middleware/middlewares.go | 46 ++++++++-------- pkg/server/middleware/middlewares_test.go | 6 +-- pkg/server/middleware/plugins.go | 4 +- pkg/server/middleware/tcp/middlewares.go | 10 ++-- pkg/server/router/router.go | 22 ++++---- pkg/server/router/router_test.go | 22 ++++---- pkg/server/router/tcp/manager.go | 18 +++---- pkg/server/router/tcp/manager_test.go | 12 ++--- pkg/server/router/tcp/postgres.go | 4 +- pkg/server/router/tcp/router.go | 4 +- pkg/server/router/tcp/router_test.go | 12 ++--- pkg/server/router/udp/router.go | 10 ++-- pkg/server/router/udp/router_test.go | 6 +-- pkg/server/routerfactory.go | 28 +++++----- pkg/server/routerfactory_test.go | 18 +++---- pkg/server/server.go | 8 +-- pkg/server/server_entrypoint_tcp.go | 24 ++++----- pkg/server/server_entrypoint_tcp_http3.go | 4 +- .../server_entrypoint_tcp_http3_test.go | 6 +-- pkg/server/server_entrypoint_tcp_test.go | 6 +-- pkg/server/server_entrypoint_udp.go | 6 +-- pkg/server/server_entrypoint_udp_test.go | 4 +- .../service/loadbalancer/failover/failover.go | 2 +- .../loadbalancer/failover/failover_test.go | 2 +- .../service/loadbalancer/mirror/mirror.go | 8 +-- .../loadbalancer/mirror/mirror_test.go | 2 +- pkg/server/service/loadbalancer/wrr/wrr.go | 2 +- .../service/loadbalancer/wrr/wrr_test.go | 2 +- pkg/server/service/managerfactory.go | 12 ++--- pkg/server/service/proxy_test.go | 2 +- pkg/server/service/roundtripper.go | 4 +- pkg/server/service/roundtripper_test.go | 4 +- pkg/server/service/service.go | 26 ++++----- pkg/server/service/service_test.go | 8 +-- pkg/server/service/smart_roundtripper.go | 2 +- pkg/server/service/tcp/service.go | 8 +-- pkg/server/service/tcp/service_test.go | 8 +-- pkg/server/service/udp/service.go | 8 +-- pkg/server/service/udp/service_test.go | 6 +-- pkg/tcp/dialer.go | 4 +- pkg/tcp/dialer_test.go | 4 +- pkg/tcp/proxy.go | 2 +- pkg/tcp/proxy_test.go | 2 +- pkg/tcp/switcher.go | 2 +- pkg/testhelpers/config.go | 2 +- pkg/tls/certificate_store.go | 2 +- pkg/tls/certificate_store_test.go | 2 +- pkg/tls/tls.go | 2 +- pkg/tls/tlsmanager.go | 6 +-- pkg/tls/zz_generated.deepcopy.go | 2 +- pkg/tracing/datadog/datadog.go | 2 +- pkg/tracing/elastic/elastic.go | 4 +- pkg/tracing/haystack/haystack.go | 2 +- pkg/tracing/instana/instana.go | 2 +- pkg/tracing/jaeger/jaeger.go | 2 +- pkg/tracing/opentelemetry/opentelemetry.go | 4 +- .../opentelemetry/opentelemetry_test.go | 4 +- pkg/udp/switcher.go | 2 +- script/binary | 6 +-- script/code-gen.sh | 2 +- 364 files changed, 1012 insertions(+), 1012 deletions(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index 9194b4a1e3..a6fc323d38 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -11,7 +11,7 @@ builds: env: - CGO_ENABLED=0 ldflags: - - -s -w -X github.com/traefik/traefik/v2/pkg/version.Version={{.Version}} -X github.com/traefik/traefik/v2/pkg/version.Codename={{.Env.CODENAME}} -X github.com/traefik/traefik/v2/pkg/version.BuildDate={{.Date}} + - -s -w -X github.com/traefik/traefik/v3/pkg/version.Version={{.Version}} -X github.com/traefik/traefik/v3/pkg/version.Codename={{.Env.CODENAME}} -X github.com/traefik/traefik/v3/pkg/version.BuildDate={{.Date}} flags: - -trimpath goos: diff --git a/cmd/configuration.go b/cmd/configuration.go index 69730ef713..d65bdf04d4 100644 --- a/cmd/configuration.go +++ b/cmd/configuration.go @@ -4,7 +4,7 @@ import ( "time" ptypes "github.com/traefik/paerser/types" - "github.com/traefik/traefik/v2/pkg/config/static" + "github.com/traefik/traefik/v3/pkg/config/static" ) // TraefikCmdConfiguration wraps the static configuration and extra parameters. diff --git a/cmd/healthcheck/healthcheck.go b/cmd/healthcheck/healthcheck.go index fbeaee5668..a3b720eb65 100644 --- a/cmd/healthcheck/healthcheck.go +++ b/cmd/healthcheck/healthcheck.go @@ -8,7 +8,7 @@ import ( "time" "github.com/traefik/paerser/cli" - "github.com/traefik/traefik/v2/pkg/config/static" + "github.com/traefik/traefik/v3/pkg/config/static" ) // NewCmd builds a new HealthCheck command. diff --git a/cmd/internal/gen/main.go b/cmd/internal/gen/main.go index 8e9c3735a3..f5fd5bb359 100644 --- a/cmd/internal/gen/main.go +++ b/cmd/internal/gen/main.go @@ -11,7 +11,7 @@ import ( "strings" ) -const rootPkg = "github.com/traefik/traefik/v2/pkg/config/dynamic" +const rootPkg = "github.com/traefik/traefik/v3/pkg/config/dynamic" const ( destModuleName = "github.com/traefik/genconf" @@ -57,8 +57,8 @@ func run(dest string) error { } centrifuge.IncludedImports = []string{ - "github.com/traefik/traefik/v2/pkg/tls", - "github.com/traefik/traefik/v2/pkg/types", + "github.com/traefik/traefik/v3/pkg/tls", + "github.com/traefik/traefik/v3/pkg/types", } centrifuge.ExcludedTypes = []string{ @@ -71,8 +71,8 @@ func run(dest string) error { } centrifuge.ExcludedFiles = []string{ - "github.com/traefik/traefik/v2/pkg/types/logs.go", - "github.com/traefik/traefik/v2/pkg/types/metrics.go", + "github.com/traefik/traefik/v3/pkg/types/logs.go", + "github.com/traefik/traefik/v3/pkg/types/metrics.go", } centrifuge.TypeCleaner = cleanType @@ -87,11 +87,11 @@ func run(dest string) error { } func cleanType(typ types.Type, base string) string { - if typ.String() == "github.com/traefik/traefik/v2/pkg/tls.FileOrContent" { + if typ.String() == "github.com/traefik/traefik/v3/pkg/tls.FileOrContent" { return "string" } - if typ.String() == "[]github.com/traefik/traefik/v2/pkg/tls.FileOrContent" { + if typ.String() == "[]github.com/traefik/traefik/v3/pkg/tls.FileOrContent" { return "[]string" } @@ -103,8 +103,8 @@ func cleanType(typ types.Type, base string) string { return strings.ReplaceAll(typ.String(), base+".", "") } - if strings.Contains(typ.String(), "github.com/traefik/traefik/v2/pkg/") { - return strings.ReplaceAll(typ.String(), "github.com/traefik/traefik/v2/pkg/", "") + if strings.Contains(typ.String(), "github.com/traefik/traefik/v3/pkg/") { + return strings.ReplaceAll(typ.String(), "github.com/traefik/traefik/v3/pkg/", "") } return typ.String() @@ -114,9 +114,9 @@ func cleanPackage(src string) string { switch src { case "github.com/traefik/paerser/types": return "" - case "github.com/traefik/traefik/v2/pkg/tls": + case "github.com/traefik/traefik/v3/pkg/tls": return path.Join(destModuleName, destPkg, "tls") - case "github.com/traefik/traefik/v2/pkg/types": + case "github.com/traefik/traefik/v3/pkg/types": return path.Join(destModuleName, destPkg, "types") default: return src diff --git a/cmd/traefik/logger.go b/cmd/traefik/logger.go index 27f3191704..4a3a10893a 100644 --- a/cmd/traefik/logger.go +++ b/cmd/traefik/logger.go @@ -11,8 +11,8 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" "github.com/sirupsen/logrus" - "github.com/traefik/traefik/v2/pkg/config/static" - "github.com/traefik/traefik/v2/pkg/logs" + "github.com/traefik/traefik/v3/pkg/config/static" + "github.com/traefik/traefik/v3/pkg/logs" ) func init() { diff --git a/cmd/traefik/plugins.go b/cmd/traefik/plugins.go index f94535f925..41c9bff602 100644 --- a/cmd/traefik/plugins.go +++ b/cmd/traefik/plugins.go @@ -3,8 +3,8 @@ package main import ( "fmt" - "github.com/traefik/traefik/v2/pkg/config/static" - "github.com/traefik/traefik/v2/pkg/plugins" + "github.com/traefik/traefik/v3/pkg/config/static" + "github.com/traefik/traefik/v3/pkg/plugins" ) const outputDir = "./plugins-storage/" diff --git a/cmd/traefik/traefik.go b/cmd/traefik/traefik.go index 434144db53..95d6117ad7 100644 --- a/cmd/traefik/traefik.go +++ b/cmd/traefik/traefik.go @@ -21,32 +21,32 @@ import ( "github.com/sirupsen/logrus" "github.com/spiffe/go-spiffe/v2/workloadapi" "github.com/traefik/paerser/cli" - "github.com/traefik/traefik/v2/cmd" - "github.com/traefik/traefik/v2/cmd/healthcheck" - cmdVersion "github.com/traefik/traefik/v2/cmd/version" - tcli "github.com/traefik/traefik/v2/pkg/cli" - "github.com/traefik/traefik/v2/pkg/collector" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/config/runtime" - "github.com/traefik/traefik/v2/pkg/config/static" - "github.com/traefik/traefik/v2/pkg/logs" - "github.com/traefik/traefik/v2/pkg/metrics" - "github.com/traefik/traefik/v2/pkg/middlewares/accesslog" - "github.com/traefik/traefik/v2/pkg/provider/acme" - "github.com/traefik/traefik/v2/pkg/provider/aggregator" - "github.com/traefik/traefik/v2/pkg/provider/hub" - "github.com/traefik/traefik/v2/pkg/provider/tailscale" - "github.com/traefik/traefik/v2/pkg/provider/traefik" - "github.com/traefik/traefik/v2/pkg/safe" - "github.com/traefik/traefik/v2/pkg/server" - "github.com/traefik/traefik/v2/pkg/server/middleware" - "github.com/traefik/traefik/v2/pkg/server/service" - "github.com/traefik/traefik/v2/pkg/tcp" - traefiktls "github.com/traefik/traefik/v2/pkg/tls" - "github.com/traefik/traefik/v2/pkg/tracing" - "github.com/traefik/traefik/v2/pkg/tracing/jaeger" - "github.com/traefik/traefik/v2/pkg/types" - "github.com/traefik/traefik/v2/pkg/version" + "github.com/traefik/traefik/v3/cmd" + "github.com/traefik/traefik/v3/cmd/healthcheck" + cmdVersion "github.com/traefik/traefik/v3/cmd/version" + tcli "github.com/traefik/traefik/v3/pkg/cli" + "github.com/traefik/traefik/v3/pkg/collector" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/runtime" + "github.com/traefik/traefik/v3/pkg/config/static" + "github.com/traefik/traefik/v3/pkg/logs" + "github.com/traefik/traefik/v3/pkg/metrics" + "github.com/traefik/traefik/v3/pkg/middlewares/accesslog" + "github.com/traefik/traefik/v3/pkg/provider/acme" + "github.com/traefik/traefik/v3/pkg/provider/aggregator" + "github.com/traefik/traefik/v3/pkg/provider/hub" + "github.com/traefik/traefik/v3/pkg/provider/tailscale" + "github.com/traefik/traefik/v3/pkg/provider/traefik" + "github.com/traefik/traefik/v3/pkg/safe" + "github.com/traefik/traefik/v3/pkg/server" + "github.com/traefik/traefik/v3/pkg/server/middleware" + "github.com/traefik/traefik/v3/pkg/server/service" + "github.com/traefik/traefik/v3/pkg/tcp" + traefiktls "github.com/traefik/traefik/v3/pkg/tls" + "github.com/traefik/traefik/v3/pkg/tracing" + "github.com/traefik/traefik/v3/pkg/tracing/jaeger" + "github.com/traefik/traefik/v3/pkg/types" + "github.com/traefik/traefik/v3/pkg/version" ) func main() { diff --git a/cmd/traefik/traefik_test.go b/cmd/traefik/traefik_test.go index c1d6770587..6dacb7507f 100644 --- a/cmd/traefik/traefik_test.go +++ b/cmd/traefik/traefik_test.go @@ -9,7 +9,7 @@ import ( "github.com/go-kit/kit/metrics" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/traefik/traefik/v2/pkg/config/static" + "github.com/traefik/traefik/v3/pkg/config/static" ) // FooCert is a PEM-encoded TLS cert. diff --git a/cmd/version/version.go b/cmd/version/version.go index 03557ff58a..172dfb338a 100644 --- a/cmd/version/version.go +++ b/cmd/version/version.go @@ -8,7 +8,7 @@ import ( "text/template" "github.com/traefik/paerser/cli" - "github.com/traefik/traefik/v2/pkg/version" + "github.com/traefik/traefik/v3/pkg/version" ) var versionTemplate = `Version: {{.Version}} diff --git a/docs/content/providers/docker.md b/docs/content/providers/docker.md index 6dc69cf306..8c935c198c 100644 --- a/docs/content/providers/docker.md +++ b/docs/content/providers/docker.md @@ -95,7 +95,7 @@ and [Docker Swarm Mode](https://docs.docker.com/engine/swarm/). ## Routing Configuration When using Docker as a [provider](./overview.md), -Traefik uses [container labels](https://docs.docker.com/engine/reference/commandline/run/#-set-metadata-on-container--l---label---label-file) to retrieve its routing configuration. +Traefik uses [container labels](https://docs.docker.com/engine/reference/commandline/run/#label) to retrieve its routing configuration. See the list of labels in the dedicated [routing](../routing/providers/docker.md) section. diff --git a/go.mod b/go.mod index c2aa3ba61a..7b737a71ff 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/traefik/traefik/v2 +module github.com/traefik/traefik/v3 go 1.19 diff --git a/integration/access_log_test.go b/integration/access_log_test.go index d2f5715db5..272a1b3711 100644 --- a/integration/access_log_test.go +++ b/integration/access_log_test.go @@ -13,8 +13,8 @@ import ( "github.com/go-check/check" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/integration/try" - "github.com/traefik/traefik/v2/pkg/middlewares/accesslog" + "github.com/traefik/traefik/v3/integration/try" + "github.com/traefik/traefik/v3/pkg/middlewares/accesslog" checker "github.com/vdemeester/shakers" ) diff --git a/integration/acme_test.go b/integration/acme_test.go index 73e9958bbf..fe5fc413b1 100644 --- a/integration/acme_test.go +++ b/integration/acme_test.go @@ -12,11 +12,11 @@ import ( "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" + "github.com/traefik/traefik/v3/integration/try" + "github.com/traefik/traefik/v3/pkg/config/static" + "github.com/traefik/traefik/v3/pkg/provider/acme" + "github.com/traefik/traefik/v3/pkg/testhelpers" + "github.com/traefik/traefik/v3/pkg/types" checker "github.com/vdemeester/shakers" ) diff --git a/integration/conf_throttling_test.go b/integration/conf_throttling_test.go index 6c4333b35c..3a7b89baab 100644 --- a/integration/conf_throttling_test.go +++ b/integration/conf_throttling_test.go @@ -11,8 +11,8 @@ import ( "time" "github.com/go-check/check" - "github.com/traefik/traefik/v2/integration/try" - "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v3/integration/try" + "github.com/traefik/traefik/v3/pkg/config/dynamic" checker "github.com/vdemeester/shakers" ) diff --git a/integration/consul_catalog_test.go b/integration/consul_catalog_test.go index bdefbd4cc3..bf0db5da18 100644 --- a/integration/consul_catalog_test.go +++ b/integration/consul_catalog_test.go @@ -9,7 +9,7 @@ import ( "github.com/go-check/check" "github.com/hashicorp/consul/api" - "github.com/traefik/traefik/v2/integration/try" + "github.com/traefik/traefik/v3/integration/try" checker "github.com/vdemeester/shakers" ) diff --git a/integration/consul_test.go b/integration/consul_test.go index 357f03deaa..441d56db74 100644 --- a/integration/consul_test.go +++ b/integration/consul_test.go @@ -16,8 +16,8 @@ import ( "github.com/kvtools/valkeyrie" "github.com/kvtools/valkeyrie/store" "github.com/pmezard/go-difflib/difflib" - "github.com/traefik/traefik/v2/integration/try" - "github.com/traefik/traefik/v2/pkg/api" + "github.com/traefik/traefik/v3/integration/try" + "github.com/traefik/traefik/v3/pkg/api" checker "github.com/vdemeester/shakers" ) diff --git a/integration/docker_compose_test.go b/integration/docker_compose_test.go index 2c2969fe02..39347dca59 100644 --- a/integration/docker_compose_test.go +++ b/integration/docker_compose_test.go @@ -8,9 +8,9 @@ import ( "time" "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" + "github.com/traefik/traefik/v3/integration/try" + "github.com/traefik/traefik/v3/pkg/api" + "github.com/traefik/traefik/v3/pkg/testhelpers" checker "github.com/vdemeester/shakers" ) diff --git a/integration/docker_test.go b/integration/docker_test.go index fe7051f7f6..dad1ef809c 100644 --- a/integration/docker_test.go +++ b/integration/docker_test.go @@ -9,7 +9,7 @@ import ( "time" "github.com/go-check/check" - "github.com/traefik/traefik/v2/integration/try" + "github.com/traefik/traefik/v3/integration/try" checker "github.com/vdemeester/shakers" ) diff --git a/integration/error_pages_test.go b/integration/error_pages_test.go index a9bd1c7a18..8a6deba898 100644 --- a/integration/error_pages_test.go +++ b/integration/error_pages_test.go @@ -7,7 +7,7 @@ import ( "time" "github.com/go-check/check" - "github.com/traefik/traefik/v2/integration/try" + "github.com/traefik/traefik/v3/integration/try" checker "github.com/vdemeester/shakers" ) diff --git a/integration/etcd_test.go b/integration/etcd_test.go index 1ffd922523..a9e9bb5324 100644 --- a/integration/etcd_test.go +++ b/integration/etcd_test.go @@ -15,8 +15,8 @@ import ( "github.com/kvtools/valkeyrie" "github.com/kvtools/valkeyrie/store" "github.com/pmezard/go-difflib/difflib" - "github.com/traefik/traefik/v2/integration/try" - "github.com/traefik/traefik/v2/pkg/api" + "github.com/traefik/traefik/v3/integration/try" + "github.com/traefik/traefik/v3/pkg/api" checker "github.com/vdemeester/shakers" ) diff --git a/integration/file_test.go b/integration/file_test.go index 5537638c25..38c30db358 100644 --- a/integration/file_test.go +++ b/integration/file_test.go @@ -6,7 +6,7 @@ import ( "time" "github.com/go-check/check" - "github.com/traefik/traefik/v2/integration/try" + "github.com/traefik/traefik/v3/integration/try" checker "github.com/vdemeester/shakers" ) diff --git a/integration/grpc_test.go b/integration/grpc_test.go index a18975864b..bf96e1ecee 100644 --- a/integration/grpc_test.go +++ b/integration/grpc_test.go @@ -12,8 +12,8 @@ import ( "github.com/go-check/check" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/integration/helloworld" - "github.com/traefik/traefik/v2/integration/try" + "github.com/traefik/traefik/v3/integration/helloworld" + "github.com/traefik/traefik/v3/integration/try" "google.golang.org/grpc" "google.golang.org/grpc/credentials" "google.golang.org/grpc/credentials/insecure" diff --git a/integration/headers_test.go b/integration/headers_test.go index 6e4b7e9b9c..60fd59578a 100644 --- a/integration/headers_test.go +++ b/integration/headers_test.go @@ -6,7 +6,7 @@ import ( "time" "github.com/go-check/check" - "github.com/traefik/traefik/v2/integration/try" + "github.com/traefik/traefik/v3/integration/try" checker "github.com/vdemeester/shakers" ) diff --git a/integration/healthcheck_test.go b/integration/healthcheck_test.go index 128a447e88..86a93b96de 100644 --- a/integration/healthcheck_test.go +++ b/integration/healthcheck_test.go @@ -10,7 +10,7 @@ import ( "time" "github.com/go-check/check" - "github.com/traefik/traefik/v2/integration/try" + "github.com/traefik/traefik/v3/integration/try" checker "github.com/vdemeester/shakers" ) diff --git a/integration/hostresolver_test.go b/integration/hostresolver_test.go index d765520168..e69e33dd91 100644 --- a/integration/hostresolver_test.go +++ b/integration/hostresolver_test.go @@ -5,7 +5,7 @@ import ( "time" "github.com/go-check/check" - "github.com/traefik/traefik/v2/integration/try" + "github.com/traefik/traefik/v3/integration/try" checker "github.com/vdemeester/shakers" ) diff --git a/integration/http_test.go b/integration/http_test.go index 6e18fcb80d..6e28fa2d7d 100644 --- a/integration/http_test.go +++ b/integration/http_test.go @@ -8,8 +8,8 @@ import ( "time" "github.com/go-check/check" - "github.com/traefik/traefik/v2/integration/try" - "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v3/integration/try" + "github.com/traefik/traefik/v3/pkg/config/dynamic" checker "github.com/vdemeester/shakers" ) diff --git a/integration/https_test.go b/integration/https_test.go index f16b390db1..9814708412 100644 --- a/integration/https_test.go +++ b/integration/https_test.go @@ -12,9 +12,9 @@ import ( "github.com/BurntSushi/toml" "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" + "github.com/traefik/traefik/v3/integration/try" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + traefiktls "github.com/traefik/traefik/v3/pkg/tls" checker "github.com/vdemeester/shakers" ) diff --git a/integration/integration_test.go b/integration/integration_test.go index 8e7f19e254..6c13e75b39 100644 --- a/integration/integration_test.go +++ b/integration/integration_test.go @@ -31,7 +31,7 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" "github.com/sirupsen/logrus" - "github.com/traefik/traefik/v2/pkg/logs" + "github.com/traefik/traefik/v3/pkg/logs" checker "github.com/vdemeester/shakers" ) diff --git a/integration/k8s_test.go b/integration/k8s_test.go index 13c64a2e0c..d07271148c 100644 --- a/integration/k8s_test.go +++ b/integration/k8s_test.go @@ -16,8 +16,8 @@ import ( "github.com/go-check/check" "github.com/pmezard/go-difflib/difflib" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/integration/try" - "github.com/traefik/traefik/v2/pkg/api" + "github.com/traefik/traefik/v3/integration/try" + "github.com/traefik/traefik/v3/pkg/api" checker "github.com/vdemeester/shakers" ) diff --git a/integration/keepalive_test.go b/integration/keepalive_test.go index df3bef5750..a56cbdd48f 100644 --- a/integration/keepalive_test.go +++ b/integration/keepalive_test.go @@ -9,7 +9,7 @@ import ( "time" "github.com/go-check/check" - "github.com/traefik/traefik/v2/integration/try" + "github.com/traefik/traefik/v3/integration/try" checker "github.com/vdemeester/shakers" ) diff --git a/integration/log_rotation_test.go b/integration/log_rotation_test.go index 241e09353c..c753dc7ff5 100644 --- a/integration/log_rotation_test.go +++ b/integration/log_rotation_test.go @@ -13,7 +13,7 @@ import ( "github.com/go-check/check" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/integration/try" + "github.com/traefik/traefik/v3/integration/try" checker "github.com/vdemeester/shakers" ) diff --git a/integration/proxy_protocol_test.go b/integration/proxy_protocol_test.go index 7ed8300af7..40640bae7e 100644 --- a/integration/proxy_protocol_test.go +++ b/integration/proxy_protocol_test.go @@ -6,7 +6,7 @@ import ( "time" "github.com/go-check/check" - "github.com/traefik/traefik/v2/integration/try" + "github.com/traefik/traefik/v3/integration/try" checker "github.com/vdemeester/shakers" ) diff --git a/integration/ratelimit_test.go b/integration/ratelimit_test.go index 5d45e8086c..5edbf64b8f 100644 --- a/integration/ratelimit_test.go +++ b/integration/ratelimit_test.go @@ -6,7 +6,7 @@ import ( "time" "github.com/go-check/check" - "github.com/traefik/traefik/v2/integration/try" + "github.com/traefik/traefik/v3/integration/try" checker "github.com/vdemeester/shakers" ) diff --git a/integration/redis_test.go b/integration/redis_test.go index d696ad6704..a5f45bff79 100644 --- a/integration/redis_test.go +++ b/integration/redis_test.go @@ -15,8 +15,8 @@ import ( "github.com/kvtools/valkeyrie" "github.com/kvtools/valkeyrie/store" "github.com/pmezard/go-difflib/difflib" - "github.com/traefik/traefik/v2/integration/try" - "github.com/traefik/traefik/v2/pkg/api" + "github.com/traefik/traefik/v3/integration/try" + "github.com/traefik/traefik/v3/pkg/api" checker "github.com/vdemeester/shakers" ) diff --git a/integration/rest_test.go b/integration/rest_test.go index d72f163145..1178fbb943 100644 --- a/integration/rest_test.go +++ b/integration/rest_test.go @@ -10,8 +10,8 @@ import ( "time" "github.com/go-check/check" - "github.com/traefik/traefik/v2/integration/try" - "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v3/integration/try" + "github.com/traefik/traefik/v3/pkg/config/dynamic" checker "github.com/vdemeester/shakers" ) diff --git a/integration/retry_test.go b/integration/retry_test.go index 6a146e5ce4..29fc0e7d0a 100644 --- a/integration/retry_test.go +++ b/integration/retry_test.go @@ -7,7 +7,7 @@ import ( "github.com/go-check/check" "github.com/gorilla/websocket" - "github.com/traefik/traefik/v2/integration/try" + "github.com/traefik/traefik/v3/integration/try" checker "github.com/vdemeester/shakers" ) diff --git a/integration/simple_test.go b/integration/simple_test.go index 41751d6a6f..367c9aa17b 100644 --- a/integration/simple_test.go +++ b/integration/simple_test.go @@ -18,8 +18,8 @@ import ( "time" "github.com/go-check/check" - "github.com/traefik/traefik/v2/integration/try" - "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v3/integration/try" + "github.com/traefik/traefik/v3/pkg/config/dynamic" checker "github.com/vdemeester/shakers" ) diff --git a/integration/tcp_test.go b/integration/tcp_test.go index b7a8b84c98..43a7158d03 100644 --- a/integration/tcp_test.go +++ b/integration/tcp_test.go @@ -13,7 +13,7 @@ import ( "time" "github.com/go-check/check" - "github.com/traefik/traefik/v2/integration/try" + "github.com/traefik/traefik/v3/integration/try" checker "github.com/vdemeester/shakers" ) diff --git a/integration/timeout_test.go b/integration/timeout_test.go index 68c5886ca5..457e2bcfb8 100644 --- a/integration/timeout_test.go +++ b/integration/timeout_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/go-check/check" - "github.com/traefik/traefik/v2/integration/try" + "github.com/traefik/traefik/v3/integration/try" checker "github.com/vdemeester/shakers" ) diff --git a/integration/tls_client_headers_test.go b/integration/tls_client_headers_test.go index 3bc587acd0..08f0c7ea52 100644 --- a/integration/tls_client_headers_test.go +++ b/integration/tls_client_headers_test.go @@ -7,7 +7,7 @@ import ( "time" "github.com/go-check/check" - "github.com/traefik/traefik/v2/integration/try" + "github.com/traefik/traefik/v3/integration/try" checker "github.com/vdemeester/shakers" ) diff --git a/integration/tracing_test.go b/integration/tracing_test.go index 2c9582b7ba..f2a1f29ad3 100644 --- a/integration/tracing_test.go +++ b/integration/tracing_test.go @@ -6,7 +6,7 @@ import ( "time" "github.com/go-check/check" - "github.com/traefik/traefik/v2/integration/try" + "github.com/traefik/traefik/v3/integration/try" checker "github.com/vdemeester/shakers" ) diff --git a/integration/udp_test.go b/integration/udp_test.go index c5ee868a1f..3493af17ea 100644 --- a/integration/udp_test.go +++ b/integration/udp_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/go-check/check" - "github.com/traefik/traefik/v2/integration/try" + "github.com/traefik/traefik/v3/integration/try" checker "github.com/vdemeester/shakers" ) diff --git a/integration/websocket_test.go b/integration/websocket_test.go index 33425624fc..c343c1b786 100644 --- a/integration/websocket_test.go +++ b/integration/websocket_test.go @@ -12,7 +12,7 @@ import ( "github.com/go-check/check" gorillawebsocket "github.com/gorilla/websocket" - "github.com/traefik/traefik/v2/integration/try" + "github.com/traefik/traefik/v3/integration/try" checker "github.com/vdemeester/shakers" "golang.org/x/net/websocket" ) diff --git a/integration/zk_test.go b/integration/zk_test.go index 21f536cb62..1e5820cc54 100644 --- a/integration/zk_test.go +++ b/integration/zk_test.go @@ -15,8 +15,8 @@ import ( "github.com/kvtools/valkeyrie/store" "github.com/kvtools/zookeeper" "github.com/pmezard/go-difflib/difflib" - "github.com/traefik/traefik/v2/integration/try" - "github.com/traefik/traefik/v2/pkg/api" + "github.com/traefik/traefik/v3/integration/try" + "github.com/traefik/traefik/v3/pkg/api" checker "github.com/vdemeester/shakers" ) diff --git a/internal/gendoc.go b/internal/gendoc.go index 397f700eee..d4fad3247b 100644 --- a/internal/gendoc.go +++ b/internal/gendoc.go @@ -15,7 +15,7 @@ import ( "github.com/traefik/paerser/flag" "github.com/traefik/paerser/generator" "github.com/traefik/paerser/parser" - "github.com/traefik/traefik/v2/cmd" + "github.com/traefik/traefik/v3/cmd" ) func main() { diff --git a/pkg/api/dashboard/dashboard.go b/pkg/api/dashboard/dashboard.go index 059917484b..b42d04247a 100644 --- a/pkg/api/dashboard/dashboard.go +++ b/pkg/api/dashboard/dashboard.go @@ -6,7 +6,7 @@ import ( "net/url" "github.com/gorilla/mux" - "github.com/traefik/traefik/v2/webui" + "github.com/traefik/traefik/v3/webui" ) // Handler expose dashboard routes. diff --git a/pkg/api/handler.go b/pkg/api/handler.go index 01ec203610..9c135546ae 100644 --- a/pkg/api/handler.go +++ b/pkg/api/handler.go @@ -8,10 +8,10 @@ import ( "github.com/gorilla/mux" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/config/runtime" - "github.com/traefik/traefik/v2/pkg/config/static" - "github.com/traefik/traefik/v2/pkg/version" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/runtime" + "github.com/traefik/traefik/v3/pkg/config/static" + "github.com/traefik/traefik/v3/pkg/version" ) type apiError struct { diff --git a/pkg/api/handler_entrypoint.go b/pkg/api/handler_entrypoint.go index 104ab38535..d21e83d0d9 100644 --- a/pkg/api/handler_entrypoint.go +++ b/pkg/api/handler_entrypoint.go @@ -9,7 +9,7 @@ import ( "github.com/gorilla/mux" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/config/static" + "github.com/traefik/traefik/v3/pkg/config/static" ) type entryPointRepresentation struct { diff --git a/pkg/api/handler_entrypoint_test.go b/pkg/api/handler_entrypoint_test.go index a3c31e5833..f02821607b 100644 --- a/pkg/api/handler_entrypoint_test.go +++ b/pkg/api/handler_entrypoint_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/traefik/traefik/v2/pkg/config/runtime" - "github.com/traefik/traefik/v2/pkg/config/static" + "github.com/traefik/traefik/v3/pkg/config/runtime" + "github.com/traefik/traefik/v3/pkg/config/static" ) func TestHandler_EntryPoints(t *testing.T) { diff --git a/pkg/api/handler_http.go b/pkg/api/handler_http.go index 9ee716e2d6..a0f25d4a60 100644 --- a/pkg/api/handler_http.go +++ b/pkg/api/handler_http.go @@ -9,8 +9,8 @@ import ( "github.com/gorilla/mux" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/config/runtime" - "github.com/traefik/traefik/v2/pkg/tls" + "github.com/traefik/traefik/v3/pkg/config/runtime" + "github.com/traefik/traefik/v3/pkg/tls" ) type routerRepresentation struct { diff --git a/pkg/api/handler_http_test.go b/pkg/api/handler_http_test.go index 238b59454e..0a9cedc5c7 100644 --- a/pkg/api/handler_http_test.go +++ b/pkg/api/handler_http_test.go @@ -13,9 +13,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/config/runtime" - "github.com/traefik/traefik/v2/pkg/config/static" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/runtime" + "github.com/traefik/traefik/v3/pkg/config/static" ) func Bool(v bool) *bool { return &v } diff --git a/pkg/api/handler_overview.go b/pkg/api/handler_overview.go index 7f423b09fb..0856f69fc0 100644 --- a/pkg/api/handler_overview.go +++ b/pkg/api/handler_overview.go @@ -6,8 +6,8 @@ import ( "reflect" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/config/runtime" - "github.com/traefik/traefik/v2/pkg/config/static" + "github.com/traefik/traefik/v3/pkg/config/runtime" + "github.com/traefik/traefik/v3/pkg/config/static" ) type schemeOverview struct { diff --git a/pkg/api/handler_overview_test.go b/pkg/api/handler_overview_test.go index 2985d93ae7..d76dd55e57 100644 --- a/pkg/api/handler_overview_test.go +++ b/pkg/api/handler_overview_test.go @@ -10,17 +10,17 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/config/runtime" - "github.com/traefik/traefik/v2/pkg/config/static" - "github.com/traefik/traefik/v2/pkg/provider/docker" - "github.com/traefik/traefik/v2/pkg/provider/file" - "github.com/traefik/traefik/v2/pkg/provider/hub" - "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd" - "github.com/traefik/traefik/v2/pkg/provider/kubernetes/ingress" - "github.com/traefik/traefik/v2/pkg/provider/rest" - "github.com/traefik/traefik/v2/pkg/tracing/jaeger" - "github.com/traefik/traefik/v2/pkg/types" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/runtime" + "github.com/traefik/traefik/v3/pkg/config/static" + "github.com/traefik/traefik/v3/pkg/provider/docker" + "github.com/traefik/traefik/v3/pkg/provider/file" + "github.com/traefik/traefik/v3/pkg/provider/hub" + "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd" + "github.com/traefik/traefik/v3/pkg/provider/kubernetes/ingress" + "github.com/traefik/traefik/v3/pkg/provider/rest" + "github.com/traefik/traefik/v3/pkg/tracing/jaeger" + "github.com/traefik/traefik/v3/pkg/types" ) func TestHandler_Overview(t *testing.T) { diff --git a/pkg/api/handler_tcp.go b/pkg/api/handler_tcp.go index 43aeb9be02..7c6a6fe67f 100644 --- a/pkg/api/handler_tcp.go +++ b/pkg/api/handler_tcp.go @@ -9,7 +9,7 @@ import ( "github.com/gorilla/mux" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/config/runtime" + "github.com/traefik/traefik/v3/pkg/config/runtime" ) type tcpRouterRepresentation struct { diff --git a/pkg/api/handler_tcp_test.go b/pkg/api/handler_tcp_test.go index d8a6e08671..f2fd35ad13 100644 --- a/pkg/api/handler_tcp_test.go +++ b/pkg/api/handler_tcp_test.go @@ -11,9 +11,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/config/runtime" - "github.com/traefik/traefik/v2/pkg/config/static" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/runtime" + "github.com/traefik/traefik/v3/pkg/config/static" ) func TestHandler_TCP(t *testing.T) { diff --git a/pkg/api/handler_test.go b/pkg/api/handler_test.go index 1dd55ebdbf..02889161bb 100644 --- a/pkg/api/handler_test.go +++ b/pkg/api/handler_test.go @@ -11,9 +11,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/config/runtime" - "github.com/traefik/traefik/v2/pkg/config/static" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/runtime" + "github.com/traefik/traefik/v3/pkg/config/static" ) var updateExpected = flag.Bool("update_expected", false, "Update expected files in testdata") diff --git a/pkg/api/handler_udp.go b/pkg/api/handler_udp.go index 72bffc80ee..bf637ee72d 100644 --- a/pkg/api/handler_udp.go +++ b/pkg/api/handler_udp.go @@ -9,7 +9,7 @@ import ( "github.com/gorilla/mux" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/config/runtime" + "github.com/traefik/traefik/v3/pkg/config/runtime" ) type udpRouterRepresentation struct { diff --git a/pkg/api/handler_udp_test.go b/pkg/api/handler_udp_test.go index 2c7842faec..b875b2dc8a 100644 --- a/pkg/api/handler_udp_test.go +++ b/pkg/api/handler_udp_test.go @@ -11,9 +11,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/config/runtime" - "github.com/traefik/traefik/v2/pkg/config/static" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/runtime" + "github.com/traefik/traefik/v3/pkg/config/static" ) func TestHandler_UDP(t *testing.T) { diff --git a/pkg/api/sort_test.go b/pkg/api/sort_test.go index 5acab875bf..30a9c3a62a 100644 --- a/pkg/api/sort_test.go +++ b/pkg/api/sort_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/config/runtime" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/runtime" ) func TestSortRouters(t *testing.T) { diff --git a/pkg/collector/collector.go b/pkg/collector/collector.go index 49f679a93a..5a49b9196d 100644 --- a/pkg/collector/collector.go +++ b/pkg/collector/collector.go @@ -11,9 +11,9 @@ import ( "github.com/mitchellh/hashstructure" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/config/static" - "github.com/traefik/traefik/v2/pkg/redactor" - "github.com/traefik/traefik/v2/pkg/version" + "github.com/traefik/traefik/v3/pkg/config/static" + "github.com/traefik/traefik/v3/pkg/redactor" + "github.com/traefik/traefik/v3/pkg/version" ) // collectorURL URL where the stats are sent. diff --git a/pkg/collector/collector_test.go b/pkg/collector/collector_test.go index b091f0c4f7..44c1ecef78 100644 --- a/pkg/collector/collector_test.go +++ b/pkg/collector/collector_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/traefik/traefik/v2/pkg/config/static" + "github.com/traefik/traefik/v3/pkg/config/static" ) func Test_createBody(t *testing.T) { diff --git a/pkg/config/dynamic/config.go b/pkg/config/dynamic/config.go index d23315d6b1..af9f657af0 100644 --- a/pkg/config/dynamic/config.go +++ b/pkg/config/dynamic/config.go @@ -1,7 +1,7 @@ package dynamic import ( - "github.com/traefik/traefik/v2/pkg/tls" + "github.com/traefik/traefik/v3/pkg/tls" ) // +k8s:deepcopy-gen=true diff --git a/pkg/config/dynamic/http_config.go b/pkg/config/dynamic/http_config.go index 46260f9045..4f3df4d8a5 100644 --- a/pkg/config/dynamic/http_config.go +++ b/pkg/config/dynamic/http_config.go @@ -5,8 +5,8 @@ import ( "time" ptypes "github.com/traefik/paerser/types" - traefiktls "github.com/traefik/traefik/v2/pkg/tls" - "github.com/traefik/traefik/v2/pkg/types" + traefiktls "github.com/traefik/traefik/v3/pkg/tls" + "github.com/traefik/traefik/v3/pkg/types" ) const ( diff --git a/pkg/config/dynamic/middlewares.go b/pkg/config/dynamic/middlewares.go index 97981ae8ac..748a205bc3 100644 --- a/pkg/config/dynamic/middlewares.go +++ b/pkg/config/dynamic/middlewares.go @@ -4,8 +4,8 @@ import ( "time" ptypes "github.com/traefik/paerser/types" - "github.com/traefik/traefik/v2/pkg/ip" - "github.com/traefik/traefik/v2/pkg/types" + "github.com/traefik/traefik/v3/pkg/ip" + "github.com/traefik/traefik/v3/pkg/types" ) // +k8s:deepcopy-gen=true diff --git a/pkg/config/dynamic/tcp_config.go b/pkg/config/dynamic/tcp_config.go index 61ceb35632..e4639a1ead 100644 --- a/pkg/config/dynamic/tcp_config.go +++ b/pkg/config/dynamic/tcp_config.go @@ -5,8 +5,8 @@ import ( "time" ptypes "github.com/traefik/paerser/types" - traefiktls "github.com/traefik/traefik/v2/pkg/tls" - "github.com/traefik/traefik/v2/pkg/types" + traefiktls "github.com/traefik/traefik/v3/pkg/tls" + "github.com/traefik/traefik/v3/pkg/types" ) // +k8s:deepcopy-gen=true diff --git a/pkg/config/dynamic/zz_generated.deepcopy.go b/pkg/config/dynamic/zz_generated.deepcopy.go index 80011d84c0..29251247e9 100644 --- a/pkg/config/dynamic/zz_generated.deepcopy.go +++ b/pkg/config/dynamic/zz_generated.deepcopy.go @@ -30,8 +30,8 @@ THE SOFTWARE. package dynamic import ( - tls "github.com/traefik/traefik/v2/pkg/tls" - types "github.com/traefik/traefik/v2/pkg/types" + tls "github.com/traefik/traefik/v3/pkg/tls" + types "github.com/traefik/traefik/v3/pkg/types" ) // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. diff --git a/pkg/config/label/label.go b/pkg/config/label/label.go index 1791f735fb..f6089a23fa 100644 --- a/pkg/config/label/label.go +++ b/pkg/config/label/label.go @@ -3,7 +3,7 @@ package label import ( "github.com/traefik/paerser/parser" - "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/dynamic" ) // DecodeConfiguration converts the labels to a configuration. diff --git a/pkg/config/label/label_test.go b/pkg/config/label/label_test.go index 59da31624f..334297edce 100644 --- a/pkg/config/label/label_test.go +++ b/pkg/config/label/label_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ptypes "github.com/traefik/paerser/types" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/types" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/types" ) func TestDecodeConfiguration(t *testing.T) { diff --git a/pkg/config/runtime/runtime.go b/pkg/config/runtime/runtime.go index 8420722792..2738b7c606 100644 --- a/pkg/config/runtime/runtime.go +++ b/pkg/config/runtime/runtime.go @@ -5,8 +5,8 @@ import ( "strings" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/logs" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/logs" ) // Status of the router/service. diff --git a/pkg/config/runtime/runtime_http.go b/pkg/config/runtime/runtime_http.go index 788a23a26b..6b9a4a3fb8 100644 --- a/pkg/config/runtime/runtime_http.go +++ b/pkg/config/runtime/runtime_http.go @@ -7,8 +7,8 @@ import ( "sync" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/logs" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/logs" ) // GetRoutersByEntryPoints returns all the http routers by entry points name and routers name. diff --git a/pkg/config/runtime/runtime_http_test.go b/pkg/config/runtime/runtime_http_test.go index 9ac028bfba..6080e770fb 100644 --- a/pkg/config/runtime/runtime_http_test.go +++ b/pkg/config/runtime/runtime_http_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/dynamic" ) func TestGetRoutersByEntryPoints(t *testing.T) { diff --git a/pkg/config/runtime/runtime_tcp.go b/pkg/config/runtime/runtime_tcp.go index 665da4525e..c188cd2d07 100644 --- a/pkg/config/runtime/runtime_tcp.go +++ b/pkg/config/runtime/runtime_tcp.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/logs" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/logs" ) // GetTCPRoutersByEntryPoints returns all the tcp routers by entry points name and routers name. diff --git a/pkg/config/runtime/runtime_tcp_test.go b/pkg/config/runtime/runtime_tcp_test.go index 067e9ee091..8263d56266 100644 --- a/pkg/config/runtime/runtime_tcp_test.go +++ b/pkg/config/runtime/runtime_tcp_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/dynamic" ) func TestGetTCPRoutersByEntryPoints(t *testing.T) { diff --git a/pkg/config/runtime/runtime_test.go b/pkg/config/runtime/runtime_test.go index e952cb20c1..54e34e8549 100644 --- a/pkg/config/runtime/runtime_test.go +++ b/pkg/config/runtime/runtime_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ptypes "github.com/traefik/paerser/types" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/config/runtime" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/runtime" ) // all the Routers/Middlewares/Services are considered fully qualified. diff --git a/pkg/config/runtime/runtime_udp.go b/pkg/config/runtime/runtime_udp.go index ed9a448147..b0eb30e505 100644 --- a/pkg/config/runtime/runtime_udp.go +++ b/pkg/config/runtime/runtime_udp.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/logs" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/logs" ) // GetUDPRoutersByEntryPoints returns all the UDP routers by entry points name and routers name. diff --git a/pkg/config/runtime/runtime_udp_test.go b/pkg/config/runtime/runtime_udp_test.go index 87fe2476f7..5e83dff05a 100644 --- a/pkg/config/runtime/runtime_udp_test.go +++ b/pkg/config/runtime/runtime_udp_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/dynamic" ) func TestGetUDPRoutersByEntryPoints(t *testing.T) { diff --git a/pkg/config/static/entrypoints.go b/pkg/config/static/entrypoints.go index 7863f1bcb0..db3fb231e4 100644 --- a/pkg/config/static/entrypoints.go +++ b/pkg/config/static/entrypoints.go @@ -6,7 +6,7 @@ import ( "strings" ptypes "github.com/traefik/paerser/types" - "github.com/traefik/traefik/v2/pkg/types" + "github.com/traefik/traefik/v3/pkg/types" ) // EntryPoint holds the entry point configuration. diff --git a/pkg/config/static/experimental.go b/pkg/config/static/experimental.go index 5f16f98986..a8fe8707eb 100644 --- a/pkg/config/static/experimental.go +++ b/pkg/config/static/experimental.go @@ -1,6 +1,6 @@ package static -import "github.com/traefik/traefik/v2/pkg/plugins" +import "github.com/traefik/traefik/v3/pkg/plugins" // Experimental experimental Traefik features. type Experimental struct { diff --git a/pkg/config/static/hub.go b/pkg/config/static/hub.go index 5cf97ae32c..5848163165 100644 --- a/pkg/config/static/hub.go +++ b/pkg/config/static/hub.go @@ -4,8 +4,8 @@ import ( "errors" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/logs" - "github.com/traefik/traefik/v2/pkg/provider/hub" + "github.com/traefik/traefik/v3/pkg/logs" + "github.com/traefik/traefik/v3/pkg/provider/hub" ) func (c *Configuration) initHubProvider() error { diff --git a/pkg/config/static/static_config.go b/pkg/config/static/static_config.go index 943e2cdec9..a1e1661a6a 100644 --- a/pkg/config/static/static_config.go +++ b/pkg/config/static/static_config.go @@ -9,33 +9,33 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" ptypes "github.com/traefik/paerser/types" - "github.com/traefik/traefik/v2/pkg/logs" - "github.com/traefik/traefik/v2/pkg/ping" - acmeprovider "github.com/traefik/traefik/v2/pkg/provider/acme" - "github.com/traefik/traefik/v2/pkg/provider/consulcatalog" - "github.com/traefik/traefik/v2/pkg/provider/docker" - "github.com/traefik/traefik/v2/pkg/provider/ecs" - "github.com/traefik/traefik/v2/pkg/provider/file" - "github.com/traefik/traefik/v2/pkg/provider/http" - "github.com/traefik/traefik/v2/pkg/provider/hub" - "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd" - "github.com/traefik/traefik/v2/pkg/provider/kubernetes/gateway" - "github.com/traefik/traefik/v2/pkg/provider/kubernetes/ingress" - "github.com/traefik/traefik/v2/pkg/provider/kv/consul" - "github.com/traefik/traefik/v2/pkg/provider/kv/etcd" - "github.com/traefik/traefik/v2/pkg/provider/kv/redis" - "github.com/traefik/traefik/v2/pkg/provider/kv/zk" - "github.com/traefik/traefik/v2/pkg/provider/nomad" - "github.com/traefik/traefik/v2/pkg/provider/rest" - "github.com/traefik/traefik/v2/pkg/tls" - "github.com/traefik/traefik/v2/pkg/tracing/datadog" - "github.com/traefik/traefik/v2/pkg/tracing/elastic" - "github.com/traefik/traefik/v2/pkg/tracing/haystack" - "github.com/traefik/traefik/v2/pkg/tracing/instana" - "github.com/traefik/traefik/v2/pkg/tracing/jaeger" - "github.com/traefik/traefik/v2/pkg/tracing/opentelemetry" - "github.com/traefik/traefik/v2/pkg/tracing/zipkin" - "github.com/traefik/traefik/v2/pkg/types" + "github.com/traefik/traefik/v3/pkg/logs" + "github.com/traefik/traefik/v3/pkg/ping" + acmeprovider "github.com/traefik/traefik/v3/pkg/provider/acme" + "github.com/traefik/traefik/v3/pkg/provider/consulcatalog" + "github.com/traefik/traefik/v3/pkg/provider/docker" + "github.com/traefik/traefik/v3/pkg/provider/ecs" + "github.com/traefik/traefik/v3/pkg/provider/file" + "github.com/traefik/traefik/v3/pkg/provider/http" + "github.com/traefik/traefik/v3/pkg/provider/hub" + "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd" + "github.com/traefik/traefik/v3/pkg/provider/kubernetes/gateway" + "github.com/traefik/traefik/v3/pkg/provider/kubernetes/ingress" + "github.com/traefik/traefik/v3/pkg/provider/kv/consul" + "github.com/traefik/traefik/v3/pkg/provider/kv/etcd" + "github.com/traefik/traefik/v3/pkg/provider/kv/redis" + "github.com/traefik/traefik/v3/pkg/provider/kv/zk" + "github.com/traefik/traefik/v3/pkg/provider/nomad" + "github.com/traefik/traefik/v3/pkg/provider/rest" + "github.com/traefik/traefik/v3/pkg/tls" + "github.com/traefik/traefik/v3/pkg/tracing/datadog" + "github.com/traefik/traefik/v3/pkg/tracing/elastic" + "github.com/traefik/traefik/v3/pkg/tracing/haystack" + "github.com/traefik/traefik/v3/pkg/tracing/instana" + "github.com/traefik/traefik/v3/pkg/tracing/jaeger" + "github.com/traefik/traefik/v3/pkg/tracing/opentelemetry" + "github.com/traefik/traefik/v3/pkg/tracing/zipkin" + "github.com/traefik/traefik/v3/pkg/types" ) const ( diff --git a/pkg/config/static/static_config_test.go b/pkg/config/static/static_config_test.go index 9680233dd0..26b67fbd2b 100644 --- a/pkg/config/static/static_config_test.go +++ b/pkg/config/static/static_config_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/traefik/traefik/v2/pkg/provider/hub" + "github.com/traefik/traefik/v3/pkg/provider/hub" ) func TestHasEntrypoint(t *testing.T) { diff --git a/pkg/healthcheck/healthcheck.go b/pkg/healthcheck/healthcheck.go index 7a590d3f17..1452bfa665 100644 --- a/pkg/healthcheck/healthcheck.go +++ b/pkg/healthcheck/healthcheck.go @@ -12,8 +12,8 @@ import ( gokitmetrics "github.com/go-kit/kit/metrics" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/config/runtime" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/runtime" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/credentials/insecure" diff --git a/pkg/healthcheck/healthcheck_test.go b/pkg/healthcheck/healthcheck_test.go index 5bc08bb941..c7813fae09 100644 --- a/pkg/healthcheck/healthcheck_test.go +++ b/pkg/healthcheck/healthcheck_test.go @@ -12,9 +12,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ptypes "github.com/traefik/paerser/types" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/config/runtime" - "github.com/traefik/traefik/v2/pkg/testhelpers" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/runtime" + "github.com/traefik/traefik/v3/pkg/testhelpers" healthpb "google.golang.org/grpc/health/grpc_health_v1" ) diff --git a/pkg/healthcheck/mock_test.go b/pkg/healthcheck/mock_test.go index d2a9b52e11..ba288cc26e 100644 --- a/pkg/healthcheck/mock_test.go +++ b/pkg/healthcheck/mock_test.go @@ -12,8 +12,8 @@ import ( gokitmetrics "github.com/go-kit/kit/metrics" "github.com/stretchr/testify/assert" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/testhelpers" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/testhelpers" "google.golang.org/grpc" healthpb "google.golang.org/grpc/health/grpc_health_v1" ) diff --git a/pkg/metrics/datadog.go b/pkg/metrics/datadog.go index fce4c4cc4d..ecc7ba33bd 100644 --- a/pkg/metrics/datadog.go +++ b/pkg/metrics/datadog.go @@ -6,9 +6,9 @@ import ( "github.com/go-kit/kit/metrics/dogstatsd" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/logs" - "github.com/traefik/traefik/v2/pkg/safe" - "github.com/traefik/traefik/v2/pkg/types" + "github.com/traefik/traefik/v3/pkg/logs" + "github.com/traefik/traefik/v3/pkg/safe" + "github.com/traefik/traefik/v3/pkg/types" ) var ( diff --git a/pkg/metrics/datadog_test.go b/pkg/metrics/datadog_test.go index 7a36c1d77a..ea837fb523 100644 --- a/pkg/metrics/datadog_test.go +++ b/pkg/metrics/datadog_test.go @@ -9,7 +9,7 @@ import ( "github.com/stvp/go-udp-testing" ptypes "github.com/traefik/paerser/types" - "github.com/traefik/traefik/v2/pkg/types" + "github.com/traefik/traefik/v3/pkg/types" ) func TestDatadog(t *testing.T) { diff --git a/pkg/metrics/influxdb2.go b/pkg/metrics/influxdb2.go index b23bcc31e0..3c1b2339c3 100644 --- a/pkg/metrics/influxdb2.go +++ b/pkg/metrics/influxdb2.go @@ -12,9 +12,9 @@ import ( influxdb2log "github.com/influxdata/influxdb-client-go/v2/log" influxdb "github.com/influxdata/influxdb1-client/v2" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/logs" - "github.com/traefik/traefik/v2/pkg/safe" - "github.com/traefik/traefik/v2/pkg/types" + "github.com/traefik/traefik/v3/pkg/logs" + "github.com/traefik/traefik/v3/pkg/safe" + "github.com/traefik/traefik/v3/pkg/types" ) var ( diff --git a/pkg/metrics/influxdb2_test.go b/pkg/metrics/influxdb2_test.go index 441137999e..c93fe9f13d 100644 --- a/pkg/metrics/influxdb2_test.go +++ b/pkg/metrics/influxdb2_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/require" ptypes "github.com/traefik/paerser/types" - "github.com/traefik/traefik/v2/pkg/types" + "github.com/traefik/traefik/v3/pkg/types" ) func TestInfluxDB2(t *testing.T) { diff --git a/pkg/metrics/opentelemetry.go b/pkg/metrics/opentelemetry.go index 000018d678..1a8dd4d6c5 100644 --- a/pkg/metrics/opentelemetry.go +++ b/pkg/metrics/opentelemetry.go @@ -10,8 +10,8 @@ import ( "github.com/go-kit/kit/metrics" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/types" - "github.com/traefik/traefik/v2/pkg/version" + "github.com/traefik/traefik/v3/pkg/types" + "github.com/traefik/traefik/v3/pkg/version" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc" "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp" diff --git a/pkg/metrics/opentelemetry_test.go b/pkg/metrics/opentelemetry_test.go index 2f1a353549..8cf4d070bf 100644 --- a/pkg/metrics/opentelemetry_test.go +++ b/pkg/metrics/opentelemetry_test.go @@ -15,8 +15,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ptypes "github.com/traefik/paerser/types" - "github.com/traefik/traefik/v2/pkg/types" - "github.com/traefik/traefik/v2/pkg/version" + "github.com/traefik/traefik/v3/pkg/types" + "github.com/traefik/traefik/v3/pkg/version" "go.opentelemetry.io/collector/pdata/pmetric/pmetricotlp" "go.opentelemetry.io/otel/attribute" ) diff --git a/pkg/metrics/prometheus.go b/pkg/metrics/prometheus.go index edad9e6f74..7be5d504bf 100644 --- a/pkg/metrics/prometheus.go +++ b/pkg/metrics/prometheus.go @@ -12,8 +12,8 @@ import ( "github.com/prometheus/client_golang/prometheus/collectors" "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/types" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/types" ) const ( diff --git a/pkg/metrics/prometheus_test.go b/pkg/metrics/prometheus_test.go index 744a7615d9..468bbc8983 100644 --- a/pkg/metrics/prometheus_test.go +++ b/pkg/metrics/prometheus_test.go @@ -11,9 +11,9 @@ import ( "github.com/prometheus/client_golang/prometheus" dto "github.com/prometheus/client_model/go" "github.com/stretchr/testify/assert" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - th "github.com/traefik/traefik/v2/pkg/testhelpers" - "github.com/traefik/traefik/v2/pkg/types" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + th "github.com/traefik/traefik/v3/pkg/testhelpers" + "github.com/traefik/traefik/v3/pkg/types" ) func TestRegisterPromState(t *testing.T) { diff --git a/pkg/metrics/statsd.go b/pkg/metrics/statsd.go index 2a1c80a9ca..c2e1027aba 100644 --- a/pkg/metrics/statsd.go +++ b/pkg/metrics/statsd.go @@ -6,9 +6,9 @@ import ( "github.com/go-kit/kit/metrics/statsd" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/logs" - "github.com/traefik/traefik/v2/pkg/safe" - "github.com/traefik/traefik/v2/pkg/types" + "github.com/traefik/traefik/v3/pkg/logs" + "github.com/traefik/traefik/v3/pkg/safe" + "github.com/traefik/traefik/v3/pkg/types" ) var ( diff --git a/pkg/metrics/statsd_test.go b/pkg/metrics/statsd_test.go index 3eb8e4705c..73aeb0af90 100644 --- a/pkg/metrics/statsd_test.go +++ b/pkg/metrics/statsd_test.go @@ -9,7 +9,7 @@ import ( "github.com/stvp/go-udp-testing" ptypes "github.com/traefik/paerser/types" - "github.com/traefik/traefik/v2/pkg/types" + "github.com/traefik/traefik/v3/pkg/types" ) func TestStatsD(t *testing.T) { diff --git a/pkg/middlewares/accesslog/field_middleware.go b/pkg/middlewares/accesslog/field_middleware.go index a7a63f6834..81f8cf606f 100644 --- a/pkg/middlewares/accesslog/field_middleware.go +++ b/pkg/middlewares/accesslog/field_middleware.go @@ -5,8 +5,8 @@ import ( "time" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/logs" - "github.com/traefik/traefik/v2/pkg/middlewares/capture" + "github.com/traefik/traefik/v3/pkg/logs" + "github.com/traefik/traefik/v3/pkg/middlewares/capture" "github.com/vulcand/oxy/v2/utils" ) diff --git a/pkg/middlewares/accesslog/logger.go b/pkg/middlewares/accesslog/logger.go index 5c5b95dadf..20ee4659fa 100644 --- a/pkg/middlewares/accesslog/logger.go +++ b/pkg/middlewares/accesslog/logger.go @@ -19,10 +19,10 @@ import ( "github.com/rs/zerolog/log" "github.com/sirupsen/logrus" ptypes "github.com/traefik/paerser/types" - "github.com/traefik/traefik/v2/pkg/logs" - "github.com/traefik/traefik/v2/pkg/middlewares/capture" - traefiktls "github.com/traefik/traefik/v2/pkg/tls" - "github.com/traefik/traefik/v2/pkg/types" + "github.com/traefik/traefik/v3/pkg/logs" + "github.com/traefik/traefik/v3/pkg/middlewares/capture" + traefiktls "github.com/traefik/traefik/v3/pkg/tls" + "github.com/traefik/traefik/v3/pkg/types" ) type key string diff --git a/pkg/middlewares/accesslog/logger_test.go b/pkg/middlewares/accesslog/logger_test.go index 967070b7d7..0f3c636075 100644 --- a/pkg/middlewares/accesslog/logger_test.go +++ b/pkg/middlewares/accesslog/logger_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ptypes "github.com/traefik/paerser/types" - "github.com/traefik/traefik/v2/pkg/middlewares/capture" - "github.com/traefik/traefik/v2/pkg/types" + "github.com/traefik/traefik/v3/pkg/middlewares/capture" + "github.com/traefik/traefik/v3/pkg/types" ) var ( diff --git a/pkg/middlewares/addprefix/add_prefix.go b/pkg/middlewares/addprefix/add_prefix.go index 83c4b0648e..4363da9b9a 100644 --- a/pkg/middlewares/addprefix/add_prefix.go +++ b/pkg/middlewares/addprefix/add_prefix.go @@ -6,9 +6,9 @@ import ( "net/http" "github.com/opentracing/opentracing-go/ext" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/middlewares" - "github.com/traefik/traefik/v2/pkg/tracing" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/middlewares" + "github.com/traefik/traefik/v3/pkg/tracing" ) const ( diff --git a/pkg/middlewares/addprefix/add_prefix_test.go b/pkg/middlewares/addprefix/add_prefix_test.go index 9ec4df5fa9..b7bbeb697e 100644 --- a/pkg/middlewares/addprefix/add_prefix_test.go +++ b/pkg/middlewares/addprefix/add_prefix_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/testhelpers" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/testhelpers" ) func TestNewAddPrefix(t *testing.T) { diff --git a/pkg/middlewares/auth/basic_auth.go b/pkg/middlewares/auth/basic_auth.go index b67eaf643a..70e25d3a12 100644 --- a/pkg/middlewares/auth/basic_auth.go +++ b/pkg/middlewares/auth/basic_auth.go @@ -9,10 +9,10 @@ import ( goauth "github.com/abbot/go-http-auth" "github.com/opentracing/opentracing-go/ext" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/middlewares" - "github.com/traefik/traefik/v2/pkg/middlewares/accesslog" - "github.com/traefik/traefik/v2/pkg/tracing" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/middlewares" + "github.com/traefik/traefik/v3/pkg/middlewares/accesslog" + "github.com/traefik/traefik/v3/pkg/tracing" ) const ( diff --git a/pkg/middlewares/auth/basic_auth_test.go b/pkg/middlewares/auth/basic_auth_test.go index 9e1b92ad13..4da9edcaea 100644 --- a/pkg/middlewares/auth/basic_auth_test.go +++ b/pkg/middlewares/auth/basic_auth_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/testhelpers" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/testhelpers" ) func TestBasicAuthFail(t *testing.T) { diff --git a/pkg/middlewares/auth/digest_auth.go b/pkg/middlewares/auth/digest_auth.go index 214e968ee7..ea772aeb5a 100644 --- a/pkg/middlewares/auth/digest_auth.go +++ b/pkg/middlewares/auth/digest_auth.go @@ -9,10 +9,10 @@ import ( goauth "github.com/abbot/go-http-auth" "github.com/opentracing/opentracing-go/ext" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/middlewares" - "github.com/traefik/traefik/v2/pkg/middlewares/accesslog" - "github.com/traefik/traefik/v2/pkg/tracing" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/middlewares" + "github.com/traefik/traefik/v3/pkg/middlewares/accesslog" + "github.com/traefik/traefik/v3/pkg/tracing" ) const ( diff --git a/pkg/middlewares/auth/digest_auth_test.go b/pkg/middlewares/auth/digest_auth_test.go index 066f80e0f1..46c0b74810 100644 --- a/pkg/middlewares/auth/digest_auth_test.go +++ b/pkg/middlewares/auth/digest_auth_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/testhelpers" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/testhelpers" ) func TestDigestAuthError(t *testing.T) { diff --git a/pkg/middlewares/auth/forward.go b/pkg/middlewares/auth/forward.go index b6adb3cb10..6ad5f628fc 100644 --- a/pkg/middlewares/auth/forward.go +++ b/pkg/middlewares/auth/forward.go @@ -12,10 +12,10 @@ import ( "time" "github.com/opentracing/opentracing-go/ext" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/middlewares" - "github.com/traefik/traefik/v2/pkg/middlewares/connectionheader" - "github.com/traefik/traefik/v2/pkg/tracing" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/middlewares" + "github.com/traefik/traefik/v3/pkg/middlewares/connectionheader" + "github.com/traefik/traefik/v3/pkg/tracing" "github.com/vulcand/oxy/v2/forward" "github.com/vulcand/oxy/v2/utils" ) diff --git a/pkg/middlewares/auth/forward_test.go b/pkg/middlewares/auth/forward_test.go index 4e17f7ff5d..0f300fc71e 100644 --- a/pkg/middlewares/auth/forward_test.go +++ b/pkg/middlewares/auth/forward_test.go @@ -12,10 +12,10 @@ import ( "github.com/opentracing/opentracing-go/mocktracer" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - tracingMiddleware "github.com/traefik/traefik/v2/pkg/middlewares/tracing" - "github.com/traefik/traefik/v2/pkg/testhelpers" - "github.com/traefik/traefik/v2/pkg/tracing" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + tracingMiddleware "github.com/traefik/traefik/v3/pkg/middlewares/tracing" + "github.com/traefik/traefik/v3/pkg/testhelpers" + "github.com/traefik/traefik/v3/pkg/tracing" "github.com/vulcand/oxy/v2/forward" ) diff --git a/pkg/middlewares/buffering/buffering.go b/pkg/middlewares/buffering/buffering.go index 3000524606..6aa2ed562d 100644 --- a/pkg/middlewares/buffering/buffering.go +++ b/pkg/middlewares/buffering/buffering.go @@ -6,10 +6,10 @@ import ( "github.com/opentracing/opentracing-go/ext" "github.com/rs/zerolog" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/logs" - "github.com/traefik/traefik/v2/pkg/middlewares" - "github.com/traefik/traefik/v2/pkg/tracing" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/logs" + "github.com/traefik/traefik/v3/pkg/middlewares" + "github.com/traefik/traefik/v3/pkg/tracing" oxybuffer "github.com/vulcand/oxy/v2/buffer" ) diff --git a/pkg/middlewares/buffering/buffering_test.go b/pkg/middlewares/buffering/buffering_test.go index 22477785a5..857d0abde1 100644 --- a/pkg/middlewares/buffering/buffering_test.go +++ b/pkg/middlewares/buffering/buffering_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/dynamic" ) func TestBuffering(t *testing.T) { diff --git a/pkg/middlewares/capture/capture.go b/pkg/middlewares/capture/capture.go index 3608945b82..b7e1821170 100644 --- a/pkg/middlewares/capture/capture.go +++ b/pkg/middlewares/capture/capture.go @@ -32,7 +32,7 @@ import ( "net" "net/http" - "github.com/traefik/traefik/v2/pkg/middlewares" + "github.com/traefik/traefik/v3/pkg/middlewares" ) type key string diff --git a/pkg/middlewares/capture/capture_test.go b/pkg/middlewares/capture/capture_test.go index 7705aa6b61..b3cfff1dee 100644 --- a/pkg/middlewares/capture/capture_test.go +++ b/pkg/middlewares/capture/capture_test.go @@ -58,7 +58,7 @@ func TestCapture(t *testing.T) { // $ go test -bench=. ./pkg/middlewares/capture/ // goos: linux // goarch: amd64 -// pkg: github.com/traefik/traefik/v2/pkg/middlewares/capture +// pkg: github.com/traefik/traefik/v3/pkg/middlewares/capture // cpu: Intel(R) Core(TM) i7-10750H CPU @ 2.60GHz // BenchmarkCapture/2k-12 280507 4015 ns/op 510.03 MB/s 5072 B/op 14 allocs/op // BenchmarkCapture/20k-12 135726 8301 ns/op 2467.26 MB/s 41936 B/op 14 allocs/op diff --git a/pkg/middlewares/chain/chain.go b/pkg/middlewares/chain/chain.go index e5fd9aa93c..d87596b429 100644 --- a/pkg/middlewares/chain/chain.go +++ b/pkg/middlewares/chain/chain.go @@ -5,8 +5,8 @@ import ( "net/http" "github.com/containous/alice" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/middlewares" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/middlewares" ) const ( diff --git a/pkg/middlewares/circuitbreaker/circuit_breaker.go b/pkg/middlewares/circuitbreaker/circuit_breaker.go index 8e3f3339b0..8445b45b81 100644 --- a/pkg/middlewares/circuitbreaker/circuit_breaker.go +++ b/pkg/middlewares/circuitbreaker/circuit_breaker.go @@ -8,10 +8,10 @@ import ( "github.com/opentracing/opentracing-go/ext" "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/logs" - "github.com/traefik/traefik/v2/pkg/middlewares" - "github.com/traefik/traefik/v2/pkg/tracing" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/logs" + "github.com/traefik/traefik/v3/pkg/middlewares" + "github.com/traefik/traefik/v3/pkg/tracing" "github.com/vulcand/oxy/v2/cbreaker" ) diff --git a/pkg/middlewares/compress/compress.go b/pkg/middlewares/compress/compress.go index 4db054d656..ab9bdc71b1 100644 --- a/pkg/middlewares/compress/compress.go +++ b/pkg/middlewares/compress/compress.go @@ -9,10 +9,10 @@ import ( "github.com/klauspost/compress/gzhttp" "github.com/opentracing/opentracing-go/ext" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/middlewares" - "github.com/traefik/traefik/v2/pkg/middlewares/compress/brotli" - "github.com/traefik/traefik/v2/pkg/tracing" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/middlewares" + "github.com/traefik/traefik/v3/pkg/middlewares/compress/brotli" + "github.com/traefik/traefik/v3/pkg/tracing" ) const typeName = "Compress" diff --git a/pkg/middlewares/compress/compress_test.go b/pkg/middlewares/compress/compress_test.go index b3eb0e03c0..f3fba60b22 100644 --- a/pkg/middlewares/compress/compress_test.go +++ b/pkg/middlewares/compress/compress_test.go @@ -12,8 +12,8 @@ import ( "github.com/klauspost/compress/gzhttp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/testhelpers" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/testhelpers" ) const ( diff --git a/pkg/middlewares/contenttype/content_type.go b/pkg/middlewares/contenttype/content_type.go index bfe5a5c482..763f7587e1 100644 --- a/pkg/middlewares/contenttype/content_type.go +++ b/pkg/middlewares/contenttype/content_type.go @@ -4,7 +4,7 @@ import ( "context" "net/http" - "github.com/traefik/traefik/v2/pkg/middlewares" + "github.com/traefik/traefik/v3/pkg/middlewares" ) const ( diff --git a/pkg/middlewares/contenttype/content_type_test.go b/pkg/middlewares/contenttype/content_type_test.go index f134994c05..24facb0d2b 100644 --- a/pkg/middlewares/contenttype/content_type_test.go +++ b/pkg/middlewares/contenttype/content_type_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/traefik/traefik/v2/pkg/testhelpers" + "github.com/traefik/traefik/v3/pkg/testhelpers" ) func TestAutoDetection(t *testing.T) { diff --git a/pkg/middlewares/customerrors/custom_errors.go b/pkg/middlewares/customerrors/custom_errors.go index eda8c4811e..9455524560 100644 --- a/pkg/middlewares/customerrors/custom_errors.go +++ b/pkg/middlewares/customerrors/custom_errors.go @@ -11,10 +11,10 @@ import ( "strings" "github.com/opentracing/opentracing-go/ext" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/middlewares" - "github.com/traefik/traefik/v2/pkg/tracing" - "github.com/traefik/traefik/v2/pkg/types" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/middlewares" + "github.com/traefik/traefik/v3/pkg/tracing" + "github.com/traefik/traefik/v3/pkg/types" "github.com/vulcand/oxy/v2/utils" ) diff --git a/pkg/middlewares/customerrors/custom_errors_test.go b/pkg/middlewares/customerrors/custom_errors_test.go index c0de064c7b..e066be29ab 100644 --- a/pkg/middlewares/customerrors/custom_errors_test.go +++ b/pkg/middlewares/customerrors/custom_errors_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/testhelpers" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/testhelpers" ) func TestHandler(t *testing.T) { diff --git a/pkg/middlewares/extractor.go b/pkg/middlewares/extractor.go index 6766132c96..9fca2a1cea 100644 --- a/pkg/middlewares/extractor.go +++ b/pkg/middlewares/extractor.go @@ -7,7 +7,7 @@ import ( "net/http" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/dynamic" "github.com/vulcand/oxy/v2/utils" ) diff --git a/pkg/middlewares/forwardedheaders/forwarded_header.go b/pkg/middlewares/forwardedheaders/forwarded_header.go index 19881ad748..3f4e32301a 100644 --- a/pkg/middlewares/forwardedheaders/forwarded_header.go +++ b/pkg/middlewares/forwardedheaders/forwarded_header.go @@ -6,7 +6,7 @@ import ( "os" "strings" - "github.com/traefik/traefik/v2/pkg/ip" + "github.com/traefik/traefik/v3/pkg/ip" ) const ( diff --git a/pkg/middlewares/grpcweb/grpcweb.go b/pkg/middlewares/grpcweb/grpcweb.go index e0813fed9c..896ac7148f 100644 --- a/pkg/middlewares/grpcweb/grpcweb.go +++ b/pkg/middlewares/grpcweb/grpcweb.go @@ -5,8 +5,8 @@ import ( "net/http" "github.com/improbable-eng/grpc-web/go/grpcweb" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/middlewares" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/middlewares" ) const typeName = "grpc-web" diff --git a/pkg/middlewares/handler_switcher.go b/pkg/middlewares/handler_switcher.go index 7c8c775fc0..d5b465b608 100644 --- a/pkg/middlewares/handler_switcher.go +++ b/pkg/middlewares/handler_switcher.go @@ -3,7 +3,7 @@ package middlewares import ( "net/http" - "github.com/traefik/traefik/v2/pkg/safe" + "github.com/traefik/traefik/v3/pkg/safe" ) // HTTPHandlerSwitcher allows hot switching of http.ServeMux. diff --git a/pkg/middlewares/headers/header.go b/pkg/middlewares/headers/header.go index 88d788bf62..a62fc097e6 100644 --- a/pkg/middlewares/headers/header.go +++ b/pkg/middlewares/headers/header.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/dynamic" ) // Header is a middleware that helps setup a few basic security features. diff --git a/pkg/middlewares/headers/header_test.go b/pkg/middlewares/headers/header_test.go index fa21fe311f..269756b465 100644 --- a/pkg/middlewares/headers/header_test.go +++ b/pkg/middlewares/headers/header_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/dynamic" ) func TestNewHeader_customRequestHeader(t *testing.T) { diff --git a/pkg/middlewares/headers/headers.go b/pkg/middlewares/headers/headers.go index 07ad062249..1210f6711e 100644 --- a/pkg/middlewares/headers/headers.go +++ b/pkg/middlewares/headers/headers.go @@ -7,10 +7,10 @@ import ( "net/http" "github.com/opentracing/opentracing-go/ext" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/middlewares" - "github.com/traefik/traefik/v2/pkg/middlewares/connectionheader" - "github.com/traefik/traefik/v2/pkg/tracing" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/middlewares" + "github.com/traefik/traefik/v3/pkg/middlewares/connectionheader" + "github.com/traefik/traefik/v3/pkg/tracing" ) const ( diff --git a/pkg/middlewares/headers/headers_test.go b/pkg/middlewares/headers/headers_test.go index efbcdb0b2b..13c6dd3773 100644 --- a/pkg/middlewares/headers/headers_test.go +++ b/pkg/middlewares/headers/headers_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/tracing" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/tracing" ) func TestNew_withoutOptions(t *testing.T) { diff --git a/pkg/middlewares/headers/secure.go b/pkg/middlewares/headers/secure.go index e5fcd9cd4c..99b03a4897 100644 --- a/pkg/middlewares/headers/secure.go +++ b/pkg/middlewares/headers/secure.go @@ -3,7 +3,7 @@ package headers import ( "net/http" - "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/dynamic" "github.com/unrolled/secure" ) diff --git a/pkg/middlewares/headers/secure_test.go b/pkg/middlewares/headers/secure_test.go index 6ed22f1e39..24e38564ec 100644 --- a/pkg/middlewares/headers/secure_test.go +++ b/pkg/middlewares/headers/secure_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/dynamic" ) // Middleware tests based on https://github.com/unrolled/secure diff --git a/pkg/middlewares/inflightreq/inflight_req.go b/pkg/middlewares/inflightreq/inflight_req.go index c34982befc..a6fcdf101a 100644 --- a/pkg/middlewares/inflightreq/inflight_req.go +++ b/pkg/middlewares/inflightreq/inflight_req.go @@ -7,10 +7,10 @@ import ( "github.com/opentracing/opentracing-go/ext" "github.com/rs/zerolog" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/logs" - "github.com/traefik/traefik/v2/pkg/middlewares" - "github.com/traefik/traefik/v2/pkg/tracing" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/logs" + "github.com/traefik/traefik/v3/pkg/middlewares" + "github.com/traefik/traefik/v3/pkg/tracing" "github.com/vulcand/oxy/v2/connlimit" ) diff --git a/pkg/middlewares/ipallowlist/ip_allowlist.go b/pkg/middlewares/ipallowlist/ip_allowlist.go index b9ddaf94b9..e888d5d92f 100644 --- a/pkg/middlewares/ipallowlist/ip_allowlist.go +++ b/pkg/middlewares/ipallowlist/ip_allowlist.go @@ -8,10 +8,10 @@ import ( "github.com/opentracing/opentracing-go/ext" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/ip" - "github.com/traefik/traefik/v2/pkg/middlewares" - "github.com/traefik/traefik/v2/pkg/tracing" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/ip" + "github.com/traefik/traefik/v3/pkg/middlewares" + "github.com/traefik/traefik/v3/pkg/tracing" ) const ( diff --git a/pkg/middlewares/ipallowlist/ip_allowlist_test.go b/pkg/middlewares/ipallowlist/ip_allowlist_test.go index df2e49835a..8bd26b3eb5 100644 --- a/pkg/middlewares/ipallowlist/ip_allowlist_test.go +++ b/pkg/middlewares/ipallowlist/ip_allowlist_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/dynamic" ) func TestNewIPAllowLister(t *testing.T) { diff --git a/pkg/middlewares/metrics/metrics.go b/pkg/middlewares/metrics/metrics.go index b04a49c85d..816c453f61 100644 --- a/pkg/middlewares/metrics/metrics.go +++ b/pkg/middlewares/metrics/metrics.go @@ -11,11 +11,11 @@ import ( "github.com/containous/alice" gokitmetrics "github.com/go-kit/kit/metrics" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/metrics" - "github.com/traefik/traefik/v2/pkg/middlewares" - "github.com/traefik/traefik/v2/pkg/middlewares/capture" - "github.com/traefik/traefik/v2/pkg/middlewares/retry" - traefiktls "github.com/traefik/traefik/v2/pkg/tls" + "github.com/traefik/traefik/v3/pkg/metrics" + "github.com/traefik/traefik/v3/pkg/middlewares" + "github.com/traefik/traefik/v3/pkg/middlewares/capture" + "github.com/traefik/traefik/v3/pkg/middlewares/retry" + traefiktls "github.com/traefik/traefik/v3/pkg/tls" "google.golang.org/grpc/codes" ) diff --git a/pkg/middlewares/middleware.go b/pkg/middlewares/middleware.go index 32aadf29a6..928a9982e6 100644 --- a/pkg/middlewares/middleware.go +++ b/pkg/middlewares/middleware.go @@ -5,7 +5,7 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/logs" + "github.com/traefik/traefik/v3/pkg/logs" ) // GetLogger creates a logger with the middleware fields. diff --git a/pkg/middlewares/passtlsclientcert/pass_tls_client_cert.go b/pkg/middlewares/passtlsclientcert/pass_tls_client_cert.go index 3f0f804239..94367ce289 100644 --- a/pkg/middlewares/passtlsclientcert/pass_tls_client_cert.go +++ b/pkg/middlewares/passtlsclientcert/pass_tls_client_cert.go @@ -13,9 +13,9 @@ import ( "github.com/opentracing/opentracing-go/ext" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/middlewares" - "github.com/traefik/traefik/v2/pkg/tracing" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/middlewares" + "github.com/traefik/traefik/v3/pkg/tracing" ) const typeName = "PassClientTLSCert" diff --git a/pkg/middlewares/passtlsclientcert/pass_tls_client_cert_test.go b/pkg/middlewares/passtlsclientcert/pass_tls_client_cert_test.go index 96c1bdffa7..47f6b451f0 100644 --- a/pkg/middlewares/passtlsclientcert/pass_tls_client_cert_test.go +++ b/pkg/middlewares/passtlsclientcert/pass_tls_client_cert_test.go @@ -15,8 +15,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/testhelpers" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/testhelpers" ) const ( diff --git a/pkg/middlewares/ratelimiter/rate_limiter.go b/pkg/middlewares/ratelimiter/rate_limiter.go index 9b95ab1767..1c3582c4e4 100644 --- a/pkg/middlewares/ratelimiter/rate_limiter.go +++ b/pkg/middlewares/ratelimiter/rate_limiter.go @@ -11,9 +11,9 @@ import ( "github.com/mailgun/ttlmap" "github.com/opentracing/opentracing-go/ext" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/middlewares" - "github.com/traefik/traefik/v2/pkg/tracing" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/middlewares" + "github.com/traefik/traefik/v3/pkg/tracing" "github.com/vulcand/oxy/v2/utils" "golang.org/x/time/rate" ) diff --git a/pkg/middlewares/ratelimiter/rate_limiter_test.go b/pkg/middlewares/ratelimiter/rate_limiter_test.go index 6705617745..5187d5d635 100644 --- a/pkg/middlewares/ratelimiter/rate_limiter_test.go +++ b/pkg/middlewares/ratelimiter/rate_limiter_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ptypes "github.com/traefik/paerser/types" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/testhelpers" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/testhelpers" "github.com/vulcand/oxy/v2/utils" "golang.org/x/time/rate" ) diff --git a/pkg/middlewares/recovery/recovery.go b/pkg/middlewares/recovery/recovery.go index 90e0b36595..ebd3edcb5d 100644 --- a/pkg/middlewares/recovery/recovery.go +++ b/pkg/middlewares/recovery/recovery.go @@ -5,7 +5,7 @@ import ( "net/http" "runtime" - "github.com/traefik/traefik/v2/pkg/middlewares" + "github.com/traefik/traefik/v3/pkg/middlewares" ) const ( diff --git a/pkg/middlewares/redirect/redirect.go b/pkg/middlewares/redirect/redirect.go index a48053f8a9..d64d8cd70e 100644 --- a/pkg/middlewares/redirect/redirect.go +++ b/pkg/middlewares/redirect/redirect.go @@ -6,7 +6,7 @@ import ( "regexp" "github.com/opentracing/opentracing-go/ext" - "github.com/traefik/traefik/v2/pkg/tracing" + "github.com/traefik/traefik/v3/pkg/tracing" "github.com/vulcand/oxy/v2/utils" ) diff --git a/pkg/middlewares/redirect/redirect_regex.go b/pkg/middlewares/redirect/redirect_regex.go index 62e5dc9866..f684932052 100644 --- a/pkg/middlewares/redirect/redirect_regex.go +++ b/pkg/middlewares/redirect/redirect_regex.go @@ -5,8 +5,8 @@ import ( "net/http" "strings" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/middlewares" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/middlewares" ) const typeRegexName = "RedirectRegex" diff --git a/pkg/middlewares/redirect/redirect_regex_test.go b/pkg/middlewares/redirect/redirect_regex_test.go index d6346cf75e..a93c788442 100644 --- a/pkg/middlewares/redirect/redirect_regex_test.go +++ b/pkg/middlewares/redirect/redirect_regex_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/dynamic" ) func TestRedirectRegexHandler(t *testing.T) { diff --git a/pkg/middlewares/redirect/redirect_scheme.go b/pkg/middlewares/redirect/redirect_scheme.go index c2ef75598a..b0d8146c7d 100644 --- a/pkg/middlewares/redirect/redirect_scheme.go +++ b/pkg/middlewares/redirect/redirect_scheme.go @@ -7,8 +7,8 @@ import ( "net/http" "strings" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/middlewares" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/middlewares" ) const ( diff --git a/pkg/middlewares/redirect/redirect_scheme_test.go b/pkg/middlewares/redirect/redirect_scheme_test.go index 07ae542468..7ef53f2527 100644 --- a/pkg/middlewares/redirect/redirect_scheme_test.go +++ b/pkg/middlewares/redirect/redirect_scheme_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/dynamic" ) func TestRedirectSchemeHandler(t *testing.T) { diff --git a/pkg/middlewares/replacepath/replace_path.go b/pkg/middlewares/replacepath/replace_path.go index e193610564..9f6fea4431 100644 --- a/pkg/middlewares/replacepath/replace_path.go +++ b/pkg/middlewares/replacepath/replace_path.go @@ -6,9 +6,9 @@ import ( "net/url" "github.com/opentracing/opentracing-go/ext" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/middlewares" - "github.com/traefik/traefik/v2/pkg/tracing" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/middlewares" + "github.com/traefik/traefik/v3/pkg/tracing" ) const ( diff --git a/pkg/middlewares/replacepath/replace_path_test.go b/pkg/middlewares/replacepath/replace_path_test.go index 782733bc09..5998579d1e 100644 --- a/pkg/middlewares/replacepath/replace_path_test.go +++ b/pkg/middlewares/replacepath/replace_path_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/dynamic" ) func TestReplacePath(t *testing.T) { diff --git a/pkg/middlewares/replacepathregex/replace_path_regex.go b/pkg/middlewares/replacepathregex/replace_path_regex.go index 2f2621b8c6..1fffb6bd47 100644 --- a/pkg/middlewares/replacepathregex/replace_path_regex.go +++ b/pkg/middlewares/replacepathregex/replace_path_regex.go @@ -9,10 +9,10 @@ import ( "strings" "github.com/opentracing/opentracing-go/ext" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/middlewares" - "github.com/traefik/traefik/v2/pkg/middlewares/replacepath" - "github.com/traefik/traefik/v2/pkg/tracing" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/middlewares" + "github.com/traefik/traefik/v3/pkg/middlewares/replacepath" + "github.com/traefik/traefik/v3/pkg/tracing" ) const typeName = "ReplacePathRegex" diff --git a/pkg/middlewares/replacepathregex/replace_path_regex_test.go b/pkg/middlewares/replacepathregex/replace_path_regex_test.go index 59018d7841..7e83f38624 100644 --- a/pkg/middlewares/replacepathregex/replace_path_regex_test.go +++ b/pkg/middlewares/replacepathregex/replace_path_regex_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/middlewares/replacepath" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/middlewares/replacepath" ) func TestReplacePathRegex(t *testing.T) { diff --git a/pkg/middlewares/requestdecorator/request_decorator.go b/pkg/middlewares/requestdecorator/request_decorator.go index 013cb12c38..e2a82395ca 100644 --- a/pkg/middlewares/requestdecorator/request_decorator.go +++ b/pkg/middlewares/requestdecorator/request_decorator.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/containous/alice" - "github.com/traefik/traefik/v2/pkg/types" + "github.com/traefik/traefik/v3/pkg/types" ) const ( diff --git a/pkg/middlewares/requestdecorator/request_decorator_test.go b/pkg/middlewares/requestdecorator/request_decorator_test.go index 03c8f40189..75ccc0139e 100644 --- a/pkg/middlewares/requestdecorator/request_decorator_test.go +++ b/pkg/middlewares/requestdecorator/request_decorator_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/traefik/traefik/v2/pkg/testhelpers" - "github.com/traefik/traefik/v2/pkg/types" + "github.com/traefik/traefik/v3/pkg/testhelpers" + "github.com/traefik/traefik/v3/pkg/types" ) func TestRequestHost(t *testing.T) { diff --git a/pkg/middlewares/retry/retry.go b/pkg/middlewares/retry/retry.go index b9f3b6af78..310164bd33 100644 --- a/pkg/middlewares/retry/retry.go +++ b/pkg/middlewares/retry/retry.go @@ -13,9 +13,9 @@ import ( "github.com/cenkalti/backoff/v4" "github.com/opentracing/opentracing-go/ext" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/middlewares" - "github.com/traefik/traefik/v2/pkg/tracing" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/middlewares" + "github.com/traefik/traefik/v3/pkg/tracing" ) // Compile time validation that the response writer implements http interfaces correctly. diff --git a/pkg/middlewares/retry/retry_test.go b/pkg/middlewares/retry/retry_test.go index 4622093afa..a2d96b3ce3 100644 --- a/pkg/middlewares/retry/retry_test.go +++ b/pkg/middlewares/retry/retry_test.go @@ -15,8 +15,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ptypes "github.com/traefik/paerser/types" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/testhelpers" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/testhelpers" ) func TestRetry(t *testing.T) { diff --git a/pkg/middlewares/snicheck/snicheck.go b/pkg/middlewares/snicheck/snicheck.go index 27f8148d12..89f817fcbc 100644 --- a/pkg/middlewares/snicheck/snicheck.go +++ b/pkg/middlewares/snicheck/snicheck.go @@ -6,8 +6,8 @@ import ( "strings" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/middlewares/requestdecorator" - traefiktls "github.com/traefik/traefik/v2/pkg/tls" + "github.com/traefik/traefik/v3/pkg/middlewares/requestdecorator" + traefiktls "github.com/traefik/traefik/v3/pkg/tls" ) // SNICheck is an HTTP handler that checks whether the TLS configuration for the server name is the same as for the host header. diff --git a/pkg/middlewares/stripprefix/strip_prefix.go b/pkg/middlewares/stripprefix/strip_prefix.go index 8338ee2eda..a017c051f0 100644 --- a/pkg/middlewares/stripprefix/strip_prefix.go +++ b/pkg/middlewares/stripprefix/strip_prefix.go @@ -6,9 +6,9 @@ import ( "strings" "github.com/opentracing/opentracing-go/ext" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/middlewares" - "github.com/traefik/traefik/v2/pkg/tracing" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/middlewares" + "github.com/traefik/traefik/v3/pkg/tracing" ) const ( diff --git a/pkg/middlewares/stripprefix/strip_prefix_test.go b/pkg/middlewares/stripprefix/strip_prefix_test.go index 7f2717bd34..612a282f1f 100644 --- a/pkg/middlewares/stripprefix/strip_prefix_test.go +++ b/pkg/middlewares/stripprefix/strip_prefix_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/testhelpers" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/testhelpers" ) func TestStripPrefix(t *testing.T) { diff --git a/pkg/middlewares/stripprefixregex/strip_prefix_regex.go b/pkg/middlewares/stripprefixregex/strip_prefix_regex.go index debeba16dd..383ce1f01e 100644 --- a/pkg/middlewares/stripprefixregex/strip_prefix_regex.go +++ b/pkg/middlewares/stripprefixregex/strip_prefix_regex.go @@ -7,10 +7,10 @@ import ( "strings" "github.com/opentracing/opentracing-go/ext" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/middlewares" - "github.com/traefik/traefik/v2/pkg/middlewares/stripprefix" - "github.com/traefik/traefik/v2/pkg/tracing" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/middlewares" + "github.com/traefik/traefik/v3/pkg/middlewares/stripprefix" + "github.com/traefik/traefik/v3/pkg/tracing" ) const ( diff --git a/pkg/middlewares/stripprefixregex/strip_prefix_regex_test.go b/pkg/middlewares/stripprefixregex/strip_prefix_regex_test.go index 763985ba94..64db6b8421 100644 --- a/pkg/middlewares/stripprefixregex/strip_prefix_regex_test.go +++ b/pkg/middlewares/stripprefixregex/strip_prefix_regex_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/middlewares/stripprefix" - "github.com/traefik/traefik/v2/pkg/testhelpers" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/middlewares/stripprefix" + "github.com/traefik/traefik/v3/pkg/testhelpers" ) func TestStripPrefixRegex(t *testing.T) { diff --git a/pkg/middlewares/tcp/inflightconn/inflight_conn.go b/pkg/middlewares/tcp/inflightconn/inflight_conn.go index 6213d4e426..b8663efc59 100644 --- a/pkg/middlewares/tcp/inflightconn/inflight_conn.go +++ b/pkg/middlewares/tcp/inflightconn/inflight_conn.go @@ -6,9 +6,9 @@ import ( "net" "sync" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/middlewares" - "github.com/traefik/traefik/v2/pkg/tcp" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/middlewares" + "github.com/traefik/traefik/v3/pkg/tcp" ) const typeName = "InFlightConnTCP" diff --git a/pkg/middlewares/tcp/inflightconn/inflight_conn_test.go b/pkg/middlewares/tcp/inflightconn/inflight_conn_test.go index 138e92b413..28fca80df2 100644 --- a/pkg/middlewares/tcp/inflightconn/inflight_conn_test.go +++ b/pkg/middlewares/tcp/inflightconn/inflight_conn_test.go @@ -7,8 +7,8 @@ import ( "time" "github.com/stretchr/testify/require" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/tcp" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/tcp" ) func TestInFlightConn_ServeTCP(t *testing.T) { diff --git a/pkg/middlewares/tcp/ipallowlist/ip_allowlist.go b/pkg/middlewares/tcp/ipallowlist/ip_allowlist.go index e2a513cf05..0ebe2fab7a 100644 --- a/pkg/middlewares/tcp/ipallowlist/ip_allowlist.go +++ b/pkg/middlewares/tcp/ipallowlist/ip_allowlist.go @@ -5,10 +5,10 @@ import ( "errors" "fmt" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/ip" - "github.com/traefik/traefik/v2/pkg/middlewares" - "github.com/traefik/traefik/v2/pkg/tcp" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/ip" + "github.com/traefik/traefik/v3/pkg/middlewares" + "github.com/traefik/traefik/v3/pkg/tcp" ) const ( diff --git a/pkg/middlewares/tcp/ipallowlist/ip_allowlist_test.go b/pkg/middlewares/tcp/ipallowlist/ip_allowlist_test.go index 4f3b59e15b..8da65c1ad6 100644 --- a/pkg/middlewares/tcp/ipallowlist/ip_allowlist_test.go +++ b/pkg/middlewares/tcp/ipallowlist/ip_allowlist_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/tcp" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/tcp" ) func TestNewIPAllowLister(t *testing.T) { diff --git a/pkg/middlewares/tracing/entrypoint.go b/pkg/middlewares/tracing/entrypoint.go index d665823a22..b17d8c2ce2 100644 --- a/pkg/middlewares/tracing/entrypoint.go +++ b/pkg/middlewares/tracing/entrypoint.go @@ -7,8 +7,8 @@ import ( "github.com/containous/alice" "github.com/opentracing/opentracing-go" "github.com/opentracing/opentracing-go/ext" - "github.com/traefik/traefik/v2/pkg/middlewares" - "github.com/traefik/traefik/v2/pkg/tracing" + "github.com/traefik/traefik/v3/pkg/middlewares" + "github.com/traefik/traefik/v3/pkg/tracing" ) const ( diff --git a/pkg/middlewares/tracing/entrypoint_test.go b/pkg/middlewares/tracing/entrypoint_test.go index 604c8c012e..e8528e0484 100644 --- a/pkg/middlewares/tracing/entrypoint_test.go +++ b/pkg/middlewares/tracing/entrypoint_test.go @@ -9,7 +9,7 @@ import ( "github.com/opentracing/opentracing-go/ext" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/traefik/traefik/v2/pkg/tracing" + "github.com/traefik/traefik/v3/pkg/tracing" ) func TestEntryPointMiddleware(t *testing.T) { diff --git a/pkg/middlewares/tracing/forwarder.go b/pkg/middlewares/tracing/forwarder.go index 2ebf5fe779..e2ee76a105 100644 --- a/pkg/middlewares/tracing/forwarder.go +++ b/pkg/middlewares/tracing/forwarder.go @@ -5,9 +5,9 @@ import ( "net/http" "github.com/opentracing/opentracing-go/ext" - "github.com/traefik/traefik/v2/pkg/logs" - "github.com/traefik/traefik/v2/pkg/middlewares" - "github.com/traefik/traefik/v2/pkg/tracing" + "github.com/traefik/traefik/v3/pkg/logs" + "github.com/traefik/traefik/v3/pkg/middlewares" + "github.com/traefik/traefik/v3/pkg/tracing" ) const ( diff --git a/pkg/middlewares/tracing/forwarder_test.go b/pkg/middlewares/tracing/forwarder_test.go index 1253412d34..785e729cb3 100644 --- a/pkg/middlewares/tracing/forwarder_test.go +++ b/pkg/middlewares/tracing/forwarder_test.go @@ -9,7 +9,7 @@ import ( "github.com/opentracing/opentracing-go/ext" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/traefik/traefik/v2/pkg/tracing" + "github.com/traefik/traefik/v3/pkg/tracing" ) func TestNewForwarder(t *testing.T) { diff --git a/pkg/middlewares/tracing/wrapper.go b/pkg/middlewares/tracing/wrapper.go index e13209d548..1fa3cfcdd8 100644 --- a/pkg/middlewares/tracing/wrapper.go +++ b/pkg/middlewares/tracing/wrapper.go @@ -7,8 +7,8 @@ import ( "github.com/containous/alice" "github.com/opentracing/opentracing-go/ext" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/logs" - "github.com/traefik/traefik/v2/pkg/tracing" + "github.com/traefik/traefik/v3/pkg/logs" + "github.com/traefik/traefik/v3/pkg/tracing" ) // Traceable embeds tracing information. diff --git a/pkg/muxer/http/matcher.go b/pkg/muxer/http/matcher.go index 124761fd2f..9b6861d2f5 100644 --- a/pkg/muxer/http/matcher.go +++ b/pkg/muxer/http/matcher.go @@ -8,8 +8,8 @@ import ( "unicode/utf8" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/ip" - "github.com/traefik/traefik/v2/pkg/middlewares/requestdecorator" + "github.com/traefik/traefik/v3/pkg/ip" + "github.com/traefik/traefik/v3/pkg/middlewares/requestdecorator" "golang.org/x/exp/slices" ) diff --git a/pkg/muxer/http/matcher_test.go b/pkg/muxer/http/matcher_test.go index 0c3d6dc9f1..1b527a3920 100644 --- a/pkg/muxer/http/matcher_test.go +++ b/pkg/muxer/http/matcher_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/traefik/traefik/v2/pkg/middlewares/requestdecorator" + "github.com/traefik/traefik/v3/pkg/middlewares/requestdecorator" ) func TestClientIPMatcher(t *testing.T) { diff --git a/pkg/muxer/http/mux.go b/pkg/muxer/http/mux.go index 6111af74c8..979634aa11 100644 --- a/pkg/muxer/http/mux.go +++ b/pkg/muxer/http/mux.go @@ -6,7 +6,7 @@ import ( "sort" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/rules" + "github.com/traefik/traefik/v3/pkg/rules" "github.com/vulcand/predicate" ) diff --git a/pkg/muxer/http/mux_test.go b/pkg/muxer/http/mux_test.go index e11502b1b3..91a2a3f781 100644 --- a/pkg/muxer/http/mux_test.go +++ b/pkg/muxer/http/mux_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/traefik/traefik/v2/pkg/middlewares/requestdecorator" - "github.com/traefik/traefik/v2/pkg/testhelpers" + "github.com/traefik/traefik/v3/pkg/middlewares/requestdecorator" + "github.com/traefik/traefik/v3/pkg/testhelpers" ) func TestMuxer(t *testing.T) { diff --git a/pkg/muxer/tcp/matcher.go b/pkg/muxer/tcp/matcher.go index 40694c3eae..36db1306fe 100644 --- a/pkg/muxer/tcp/matcher.go +++ b/pkg/muxer/tcp/matcher.go @@ -8,7 +8,7 @@ import ( "github.com/go-acme/lego/v4/challenge/tlsalpn01" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/ip" + "github.com/traefik/traefik/v3/pkg/ip" ) var tcpFuncs = map[string]func(*matchersTree, ...string) error{ diff --git a/pkg/muxer/tcp/matcher_test.go b/pkg/muxer/tcp/matcher_test.go index 06b45e1866..3ba833d494 100644 --- a/pkg/muxer/tcp/matcher_test.go +++ b/pkg/muxer/tcp/matcher_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/traefik/traefik/v2/pkg/tcp" + "github.com/traefik/traefik/v3/pkg/tcp" ) func Test_HostSNICatchAll(t *testing.T) { diff --git a/pkg/muxer/tcp/mux.go b/pkg/muxer/tcp/mux.go index 0c6ef3fd63..f23ce629d6 100644 --- a/pkg/muxer/tcp/mux.go +++ b/pkg/muxer/tcp/mux.go @@ -7,9 +7,9 @@ import ( "strings" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/rules" - "github.com/traefik/traefik/v2/pkg/tcp" - "github.com/traefik/traefik/v2/pkg/types" + "github.com/traefik/traefik/v3/pkg/rules" + "github.com/traefik/traefik/v3/pkg/tcp" + "github.com/traefik/traefik/v3/pkg/types" "github.com/vulcand/predicate" ) diff --git a/pkg/muxer/tcp/mux_test.go b/pkg/muxer/tcp/mux_test.go index 54cd976cf3..928b4f3d43 100644 --- a/pkg/muxer/tcp/mux_test.go +++ b/pkg/muxer/tcp/mux_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/traefik/traefik/v2/pkg/tcp" + "github.com/traefik/traefik/v3/pkg/tcp" ) func Test_addTCPRoute(t *testing.T) { diff --git a/pkg/plugins/builder.go b/pkg/plugins/builder.go index aa3d4c9829..c2012427bf 100644 --- a/pkg/plugins/builder.go +++ b/pkg/plugins/builder.go @@ -8,7 +8,7 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/logs" + "github.com/traefik/traefik/v3/pkg/logs" "github.com/traefik/yaegi/interp" "github.com/traefik/yaegi/stdlib" ) diff --git a/pkg/plugins/client.go b/pkg/plugins/client.go index 9e7ba85385..476d3f3020 100644 --- a/pkg/plugins/client.go +++ b/pkg/plugins/client.go @@ -18,7 +18,7 @@ import ( "github.com/hashicorp/go-retryablehttp" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/logs" + "github.com/traefik/traefik/v3/pkg/logs" "golang.org/x/mod/module" "golang.org/x/mod/zip" "gopkg.in/yaml.v3" diff --git a/pkg/plugins/providers.go b/pkg/plugins/providers.go index ea024c8364..5fdaf03acc 100644 --- a/pkg/plugins/providers.go +++ b/pkg/plugins/providers.go @@ -10,10 +10,10 @@ import ( "github.com/mitchellh/mapstructure" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/logs" - "github.com/traefik/traefik/v2/pkg/provider" - "github.com/traefik/traefik/v2/pkg/safe" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/logs" + "github.com/traefik/traefik/v3/pkg/provider" + "github.com/traefik/traefik/v3/pkg/safe" "github.com/traefik/yaegi/interp" ) @@ -45,7 +45,7 @@ func (p _PP) Stop() error { func ppSymbols() map[string]map[string]reflect.Value { return map[string]map[string]reflect.Value{ - "github.com/traefik/traefik/v2/pkg/plugins/plugins": { + "github.com/traefik/traefik/v3/pkg/plugins/plugins": { "PP": reflect.ValueOf((*PP)(nil)), "_PP": reflect.ValueOf((*_PP)(nil)), }, @@ -115,7 +115,7 @@ import ( "context" ` + basePkg + ` "` + builder.Import + `" - "github.com/traefik/traefik/v2/pkg/plugins" + "github.com/traefik/traefik/v3/pkg/plugins" ) func NewWrapper(ctx context.Context, config *` + basePkg + `.Config, name string) (plugins.PP, error) { diff --git a/pkg/provider/acme/account.go b/pkg/provider/acme/account.go index 6bac6c186d..c0a7458b3a 100644 --- a/pkg/provider/acme/account.go +++ b/pkg/provider/acme/account.go @@ -10,7 +10,7 @@ import ( "github.com/go-acme/lego/v4/certcrypto" "github.com/go-acme/lego/v4/registration" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/logs" + "github.com/traefik/traefik/v3/pkg/logs" ) // Account is used to store lets encrypt registration info. diff --git a/pkg/provider/acme/challenge_http.go b/pkg/provider/acme/challenge_http.go index 80d6a6c67c..1553565056 100644 --- a/pkg/provider/acme/challenge_http.go +++ b/pkg/provider/acme/challenge_http.go @@ -14,8 +14,8 @@ import ( "github.com/cenkalti/backoff/v4" "github.com/go-acme/lego/v4/challenge/http01" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/logs" - "github.com/traefik/traefik/v2/pkg/safe" + "github.com/traefik/traefik/v3/pkg/logs" + "github.com/traefik/traefik/v3/pkg/safe" ) // ChallengeHTTP HTTP challenge provider implements challenge.Provider. diff --git a/pkg/provider/acme/challenge_tls.go b/pkg/provider/acme/challenge_tls.go index a53f83f2b5..b4ce624d5c 100644 --- a/pkg/provider/acme/challenge_tls.go +++ b/pkg/provider/acme/challenge_tls.go @@ -7,11 +7,11 @@ import ( "github.com/go-acme/lego/v4/challenge/tlsalpn01" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/logs" - "github.com/traefik/traefik/v2/pkg/safe" - traefiktls "github.com/traefik/traefik/v2/pkg/tls" - "github.com/traefik/traefik/v2/pkg/types" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/logs" + "github.com/traefik/traefik/v3/pkg/safe" + traefiktls "github.com/traefik/traefik/v3/pkg/tls" + "github.com/traefik/traefik/v3/pkg/types" ) const providerNameALPN = "tlsalpn.acme" diff --git a/pkg/provider/acme/local_store.go b/pkg/provider/acme/local_store.go index 57a26207b3..c7677e047b 100644 --- a/pkg/provider/acme/local_store.go +++ b/pkg/provider/acme/local_store.go @@ -7,8 +7,8 @@ import ( "sync" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/logs" - "github.com/traefik/traefik/v2/pkg/safe" + "github.com/traefik/traefik/v3/pkg/logs" + "github.com/traefik/traefik/v3/pkg/safe" ) var _ Store = (*LocalStore)(nil) diff --git a/pkg/provider/acme/provider.go b/pkg/provider/acme/provider.go index e57c84d5ba..c9c7a70e77 100644 --- a/pkg/provider/acme/provider.go +++ b/pkg/provider/acme/provider.go @@ -21,14 +21,14 @@ import ( "github.com/go-acme/lego/v4/registration" "github.com/rs/zerolog/log" ptypes "github.com/traefik/paerser/types" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/logs" - httpmuxer "github.com/traefik/traefik/v2/pkg/muxer/http" - tcpmuxer "github.com/traefik/traefik/v2/pkg/muxer/tcp" - "github.com/traefik/traefik/v2/pkg/safe" - traefiktls "github.com/traefik/traefik/v2/pkg/tls" - "github.com/traefik/traefik/v2/pkg/types" - "github.com/traefik/traefik/v2/pkg/version" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/logs" + httpmuxer "github.com/traefik/traefik/v3/pkg/muxer/http" + tcpmuxer "github.com/traefik/traefik/v3/pkg/muxer/tcp" + "github.com/traefik/traefik/v3/pkg/safe" + traefiktls "github.com/traefik/traefik/v3/pkg/tls" + "github.com/traefik/traefik/v3/pkg/types" + "github.com/traefik/traefik/v3/pkg/version" ) // ocspMustStaple enables OCSP stapling as from https://github.com/go-acme/lego/issues/270. diff --git a/pkg/provider/acme/provider_test.go b/pkg/provider/acme/provider_test.go index 3268b1c923..d41f19c452 100644 --- a/pkg/provider/acme/provider_test.go +++ b/pkg/provider/acme/provider_test.go @@ -8,8 +8,8 @@ import ( "github.com/go-acme/lego/v4/certcrypto" "github.com/stretchr/testify/assert" - "github.com/traefik/traefik/v2/pkg/safe" - "github.com/traefik/traefik/v2/pkg/types" + "github.com/traefik/traefik/v3/pkg/safe" + "github.com/traefik/traefik/v3/pkg/types" ) func TestGetUncheckedCertificates(t *testing.T) { diff --git a/pkg/provider/aggregator/aggregator.go b/pkg/provider/aggregator/aggregator.go index ccdaa3d5f7..009aa9c938 100644 --- a/pkg/provider/aggregator/aggregator.go +++ b/pkg/provider/aggregator/aggregator.go @@ -5,13 +5,13 @@ import ( "time" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/config/static" - "github.com/traefik/traefik/v2/pkg/provider" - "github.com/traefik/traefik/v2/pkg/provider/file" - "github.com/traefik/traefik/v2/pkg/provider/traefik" - "github.com/traefik/traefik/v2/pkg/redactor" - "github.com/traefik/traefik/v2/pkg/safe" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/static" + "github.com/traefik/traefik/v3/pkg/provider" + "github.com/traefik/traefik/v3/pkg/provider/file" + "github.com/traefik/traefik/v3/pkg/provider/traefik" + "github.com/traefik/traefik/v3/pkg/redactor" + "github.com/traefik/traefik/v3/pkg/safe" ) // throttled defines what kind of config refresh throttling the aggregator should diff --git a/pkg/provider/aggregator/aggregator_test.go b/pkg/provider/aggregator/aggregator_test.go index 4bcf2bd792..4683a24800 100644 --- a/pkg/provider/aggregator/aggregator_test.go +++ b/pkg/provider/aggregator/aggregator_test.go @@ -6,9 +6,9 @@ import ( "time" "github.com/stretchr/testify/require" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/provider" - "github.com/traefik/traefik/v2/pkg/safe" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/provider" + "github.com/traefik/traefik/v3/pkg/safe" ) func TestProviderAggregator_Provide(t *testing.T) { diff --git a/pkg/provider/aggregator/ring_channel.go b/pkg/provider/aggregator/ring_channel.go index e69328da18..454a43a58b 100644 --- a/pkg/provider/aggregator/ring_channel.go +++ b/pkg/provider/aggregator/ring_channel.go @@ -1,7 +1,7 @@ package aggregator import ( - "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/dynamic" ) // RingChannel implements a channel in a way that never blocks the writer. diff --git a/pkg/provider/configuration.go b/pkg/provider/configuration.go index 54b861bcda..ebe57b92ec 100644 --- a/pkg/provider/configuration.go +++ b/pkg/provider/configuration.go @@ -11,8 +11,8 @@ import ( "github.com/Masterminds/sprig/v3" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/logs" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/logs" ) // Merge Merges multiple configurations. diff --git a/pkg/provider/consulcatalog/config.go b/pkg/provider/consulcatalog/config.go index f60d33894a..14c4fcc870 100644 --- a/pkg/provider/consulcatalog/config.go +++ b/pkg/provider/consulcatalog/config.go @@ -11,11 +11,11 @@ import ( "github.com/hashicorp/consul/api" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/config/label" - "github.com/traefik/traefik/v2/pkg/logs" - "github.com/traefik/traefik/v2/pkg/provider" - "github.com/traefik/traefik/v2/pkg/provider/constraints" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/label" + "github.com/traefik/traefik/v3/pkg/logs" + "github.com/traefik/traefik/v3/pkg/provider" + "github.com/traefik/traefik/v3/pkg/provider/constraints" ) func (p *Provider) buildConfiguration(ctx context.Context, items []itemData, certInfo *connectCert) *dynamic.Configuration { diff --git a/pkg/provider/consulcatalog/config_test.go b/pkg/provider/consulcatalog/config_test.go index c8837430c1..d1a6065548 100644 --- a/pkg/provider/consulcatalog/config_test.go +++ b/pkg/provider/consulcatalog/config_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ptypes "github.com/traefik/paerser/types" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/tls" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/tls" ) func Int(v int) *int { return &v } diff --git a/pkg/provider/consulcatalog/connect_tls.go b/pkg/provider/consulcatalog/connect_tls.go index edb420770f..904131283c 100644 --- a/pkg/provider/consulcatalog/connect_tls.go +++ b/pkg/provider/consulcatalog/connect_tls.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/hashicorp/consul/agent/connect" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - traefiktls "github.com/traefik/traefik/v2/pkg/tls" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + traefiktls "github.com/traefik/traefik/v3/pkg/tls" ) // connectCert holds our certificates as a client of the Consul Connect protocol. diff --git a/pkg/provider/consulcatalog/consul_catalog.go b/pkg/provider/consulcatalog/consul_catalog.go index af8c7e2f77..696214e0cd 100644 --- a/pkg/provider/consulcatalog/consul_catalog.go +++ b/pkg/provider/consulcatalog/consul_catalog.go @@ -14,13 +14,13 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" ptypes "github.com/traefik/paerser/types" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/job" - "github.com/traefik/traefik/v2/pkg/logs" - "github.com/traefik/traefik/v2/pkg/provider" - "github.com/traefik/traefik/v2/pkg/provider/constraints" - "github.com/traefik/traefik/v2/pkg/safe" - "github.com/traefik/traefik/v2/pkg/types" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/job" + "github.com/traefik/traefik/v3/pkg/logs" + "github.com/traefik/traefik/v3/pkg/provider" + "github.com/traefik/traefik/v3/pkg/provider/constraints" + "github.com/traefik/traefik/v3/pkg/safe" + "github.com/traefik/traefik/v3/pkg/types" ) // defaultTemplateRule is the default template for the default rule. diff --git a/pkg/provider/consulcatalog/label.go b/pkg/provider/consulcatalog/label.go index 65178750c0..dd71e93479 100644 --- a/pkg/provider/consulcatalog/label.go +++ b/pkg/provider/consulcatalog/label.go @@ -1,7 +1,7 @@ package consulcatalog import ( - "github.com/traefik/traefik/v2/pkg/config/label" + "github.com/traefik/traefik/v3/pkg/config/label" ) // configuration contains information from the labels that are globals (not related to the dynamic configuration) or specific to the provider. diff --git a/pkg/provider/docker/config.go b/pkg/provider/docker/config.go index 3899d451dc..3075786e76 100644 --- a/pkg/provider/docker/config.go +++ b/pkg/provider/docker/config.go @@ -10,11 +10,11 @@ import ( dockertypes "github.com/docker/docker/api/types" "github.com/docker/go-connections/nat" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/config/label" - "github.com/traefik/traefik/v2/pkg/logs" - "github.com/traefik/traefik/v2/pkg/provider" - "github.com/traefik/traefik/v2/pkg/provider/constraints" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/label" + "github.com/traefik/traefik/v3/pkg/logs" + "github.com/traefik/traefik/v3/pkg/provider" + "github.com/traefik/traefik/v3/pkg/provider/constraints" ) func (p *Provider) buildConfiguration(ctx context.Context, containersInspected []dockerData) *dynamic.Configuration { diff --git a/pkg/provider/docker/config_test.go b/pkg/provider/docker/config_test.go index 498b49b1d1..5f0048b2ac 100644 --- a/pkg/provider/docker/config_test.go +++ b/pkg/provider/docker/config_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ptypes "github.com/traefik/paerser/types" - "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/dynamic" ) func TestDefaultRule(t *testing.T) { diff --git a/pkg/provider/docker/docker.go b/pkg/provider/docker/docker.go index 2e902cf8aa..ec48f714ce 100644 --- a/pkg/provider/docker/docker.go +++ b/pkg/provider/docker/docker.go @@ -25,13 +25,13 @@ import ( "github.com/docker/go-connections/sockets" "github.com/rs/zerolog/log" ptypes "github.com/traefik/paerser/types" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/job" - "github.com/traefik/traefik/v2/pkg/logs" - "github.com/traefik/traefik/v2/pkg/provider" - "github.com/traefik/traefik/v2/pkg/safe" - "github.com/traefik/traefik/v2/pkg/types" - "github.com/traefik/traefik/v2/pkg/version" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/job" + "github.com/traefik/traefik/v3/pkg/logs" + "github.com/traefik/traefik/v3/pkg/provider" + "github.com/traefik/traefik/v3/pkg/safe" + "github.com/traefik/traefik/v3/pkg/types" + "github.com/traefik/traefik/v3/pkg/version" ) const ( diff --git a/pkg/provider/docker/label.go b/pkg/provider/docker/label.go index f86de21667..b968eedf1a 100644 --- a/pkg/provider/docker/label.go +++ b/pkg/provider/docker/label.go @@ -3,7 +3,7 @@ package docker import ( "fmt" - "github.com/traefik/traefik/v2/pkg/config/label" + "github.com/traefik/traefik/v3/pkg/config/label" ) const ( diff --git a/pkg/provider/ecs/config.go b/pkg/provider/ecs/config.go index a0c7d0bb02..e53c7480eb 100644 --- a/pkg/provider/ecs/config.go +++ b/pkg/provider/ecs/config.go @@ -11,10 +11,10 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/docker/go-connections/nat" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/config/label" - "github.com/traefik/traefik/v2/pkg/provider" - "github.com/traefik/traefik/v2/pkg/provider/constraints" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/label" + "github.com/traefik/traefik/v3/pkg/provider" + "github.com/traefik/traefik/v3/pkg/provider/constraints" ) func (p *Provider) buildConfiguration(ctx context.Context, instances []ecsInstance) *dynamic.Configuration { diff --git a/pkg/provider/ecs/config_test.go b/pkg/provider/ecs/config_test.go index 24a1af69d9..aac4d9cfde 100644 --- a/pkg/provider/ecs/config_test.go +++ b/pkg/provider/ecs/config_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ptypes "github.com/traefik/paerser/types" - "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/dynamic" ) func Int(v int) *int { return &v } diff --git a/pkg/provider/ecs/ecs.go b/pkg/provider/ecs/ecs.go index 22e3e5695d..8ecf125453 100644 --- a/pkg/provider/ecs/ecs.go +++ b/pkg/provider/ecs/ecs.go @@ -19,11 +19,11 @@ import ( "github.com/patrickmn/go-cache" "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/job" - "github.com/traefik/traefik/v2/pkg/logs" - "github.com/traefik/traefik/v2/pkg/provider" - "github.com/traefik/traefik/v2/pkg/safe" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/job" + "github.com/traefik/traefik/v3/pkg/logs" + "github.com/traefik/traefik/v3/pkg/provider" + "github.com/traefik/traefik/v3/pkg/safe" ) // Provider holds configurations of the provider. diff --git a/pkg/provider/ecs/label.go b/pkg/provider/ecs/label.go index 0f3b2a8b3c..7a01a93fff 100644 --- a/pkg/provider/ecs/label.go +++ b/pkg/provider/ecs/label.go @@ -1,7 +1,7 @@ package ecs import ( - "github.com/traefik/traefik/v2/pkg/config/label" + "github.com/traefik/traefik/v3/pkg/config/label" ) // configuration Contains information from the labels that are globals (not related to the dynamic configuration) or specific to the provider. diff --git a/pkg/provider/file/file.go b/pkg/provider/file/file.go index c8c26d75a4..938252664e 100644 --- a/pkg/provider/file/file.go +++ b/pkg/provider/file/file.go @@ -13,11 +13,11 @@ import ( "github.com/Masterminds/sprig/v3" "github.com/rs/zerolog/log" "github.com/traefik/paerser/file" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/logs" - "github.com/traefik/traefik/v2/pkg/provider" - "github.com/traefik/traefik/v2/pkg/safe" - "github.com/traefik/traefik/v2/pkg/tls" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/logs" + "github.com/traefik/traefik/v3/pkg/provider" + "github.com/traefik/traefik/v3/pkg/safe" + "github.com/traefik/traefik/v3/pkg/tls" "gopkg.in/fsnotify.v1" ) diff --git a/pkg/provider/file/file_test.go b/pkg/provider/file/file_test.go index dde5d2544b..5712803069 100644 --- a/pkg/provider/file/file_test.go +++ b/pkg/provider/file/file_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/safe" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/safe" ) type ProvideTestCase struct { diff --git a/pkg/provider/http/http.go b/pkg/provider/http/http.go index 6566150835..c354e5f8b2 100644 --- a/pkg/provider/http/http.go +++ b/pkg/provider/http/http.go @@ -12,13 +12,13 @@ import ( "github.com/rs/zerolog/log" "github.com/traefik/paerser/file" ptypes "github.com/traefik/paerser/types" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/job" - "github.com/traefik/traefik/v2/pkg/logs" - "github.com/traefik/traefik/v2/pkg/provider" - "github.com/traefik/traefik/v2/pkg/safe" - "github.com/traefik/traefik/v2/pkg/tls" - "github.com/traefik/traefik/v2/pkg/types" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/job" + "github.com/traefik/traefik/v3/pkg/logs" + "github.com/traefik/traefik/v3/pkg/provider" + "github.com/traefik/traefik/v3/pkg/safe" + "github.com/traefik/traefik/v3/pkg/tls" + "github.com/traefik/traefik/v3/pkg/types" ) var _ provider.Provider = (*Provider)(nil) diff --git a/pkg/provider/http/http_test.go b/pkg/provider/http/http_test.go index 809d2a7fd0..d805dd3c43 100644 --- a/pkg/provider/http/http_test.go +++ b/pkg/provider/http/http_test.go @@ -11,9 +11,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ptypes "github.com/traefik/paerser/types" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/safe" - "github.com/traefik/traefik/v2/pkg/tls" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/safe" + "github.com/traefik/traefik/v3/pkg/tls" ) func TestProvider_Init(t *testing.T) { diff --git a/pkg/provider/hub/handler.go b/pkg/provider/hub/handler.go index 23cc47b1e0..86014cb7c2 100644 --- a/pkg/provider/hub/handler.go +++ b/pkg/provider/hub/handler.go @@ -10,7 +10,7 @@ import ( "sync/atomic" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/dynamic" ) type handler struct { diff --git a/pkg/provider/hub/handler_test.go b/pkg/provider/hub/handler_test.go index b69fc8b6d5..bc13f90c0f 100644 --- a/pkg/provider/hub/handler_test.go +++ b/pkg/provider/hub/handler_test.go @@ -15,8 +15,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/tls/generate" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/tls/generate" ) func TestHandleConfig(t *testing.T) { diff --git a/pkg/provider/hub/hub.go b/pkg/provider/hub/hub.go index d2d8991018..f1120cc80b 100644 --- a/pkg/provider/hub/hub.go +++ b/pkg/provider/hub/hub.go @@ -9,11 +9,11 @@ import ( "net/http" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/logs" - "github.com/traefik/traefik/v2/pkg/provider" - "github.com/traefik/traefik/v2/pkg/safe" - ttls "github.com/traefik/traefik/v2/pkg/tls" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/logs" + "github.com/traefik/traefik/v3/pkg/provider" + "github.com/traefik/traefik/v3/pkg/safe" + ttls "github.com/traefik/traefik/v3/pkg/tls" ) var _ provider.Provider = (*Provider)(nil) diff --git a/pkg/provider/kubernetes/crd/client.go b/pkg/provider/kubernetes/crd/client.go index 842dc1ce6a..86c221dd33 100644 --- a/pkg/provider/kubernetes/crd/client.go +++ b/pkg/provider/kubernetes/crd/client.go @@ -9,11 +9,11 @@ import ( "time" "github.com/rs/zerolog/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" - "github.com/traefik/traefik/v2/pkg/provider/kubernetes/k8s" - "github.com/traefik/traefik/v2/pkg/version" + "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/clientset/versioned" + "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/informers/externalversions" + "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefik/v1alpha1" + "github.com/traefik/traefik/v3/pkg/provider/kubernetes/k8s" + "github.com/traefik/traefik/v3/pkg/version" corev1 "k8s.io/api/core/v1" kubeerror "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/provider/kubernetes/crd/client_mock_test.go b/pkg/provider/kubernetes/crd/client_mock_test.go index 4ed71e1d05..9d9d0beb46 100644 --- a/pkg/provider/kubernetes/crd/client_mock_test.go +++ b/pkg/provider/kubernetes/crd/client_mock_test.go @@ -5,8 +5,8 @@ import ( "os" "path/filepath" - "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" - "github.com/traefik/traefik/v2/pkg/provider/kubernetes/k8s" + "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefik/v1alpha1" + "github.com/traefik/traefik/v3/pkg/provider/kubernetes/k8s" corev1 "k8s.io/api/core/v1" "k8s.io/client-go/kubernetes/scheme" ) diff --git a/pkg/provider/kubernetes/crd/client_test.go b/pkg/provider/kubernetes/crd/client_test.go index 42aa574ee2..5d64d08f70 100644 --- a/pkg/provider/kubernetes/crd/client_test.go +++ b/pkg/provider/kubernetes/crd/client_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - crdfake "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned/fake" + crdfake "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/clientset/versioned/fake" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" kubefake "k8s.io/client-go/kubernetes/fake" diff --git a/pkg/provider/kubernetes/crd/generated/clientset/versioned/clientset.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/clientset.go index 6f2c4b79bd..09d251ad93 100644 --- a/pkg/provider/kubernetes/crd/generated/clientset/versioned/clientset.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/clientset.go @@ -29,7 +29,7 @@ package versioned import ( "fmt" - traefikv1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1" + traefikv1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" diff --git a/pkg/provider/kubernetes/crd/generated/clientset/versioned/fake/clientset_generated.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/fake/clientset_generated.go index d35e643915..e7c34c51ae 100644 --- a/pkg/provider/kubernetes/crd/generated/clientset/versioned/fake/clientset_generated.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/fake/clientset_generated.go @@ -27,9 +27,9 @@ THE SOFTWARE. package fake import ( - clientset "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned" - traefikv1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1" - faketraefikv1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake" + clientset "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/clientset/versioned" + traefikv1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1" + faketraefikv1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" diff --git a/pkg/provider/kubernetes/crd/generated/clientset/versioned/fake/register.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/fake/register.go index bdf7af3d79..8e0489128f 100644 --- a/pkg/provider/kubernetes/crd/generated/clientset/versioned/fake/register.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/fake/register.go @@ -27,7 +27,7 @@ THE SOFTWARE. package fake import ( - traefikv1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + traefikv1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefik/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme/register.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme/register.go index 0351d8a0ed..3aab7e6902 100644 --- a/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme/register.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme/register.go @@ -27,7 +27,7 @@ THE SOFTWARE. package scheme import ( - traefikv1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + traefikv1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefik/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_ingressroute.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_ingressroute.go index bbf76c75b9..c3daac5d08 100644 --- a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_ingressroute.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_ingressroute.go @@ -29,7 +29,7 @@ package fake import ( "context" - v1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + v1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefik/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_ingressroutetcp.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_ingressroutetcp.go index 879a239b3d..d2d8299a46 100644 --- a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_ingressroutetcp.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_ingressroutetcp.go @@ -29,7 +29,7 @@ package fake import ( "context" - v1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + v1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefik/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_ingressrouteudp.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_ingressrouteudp.go index 4349987613..6f9f413030 100644 --- a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_ingressrouteudp.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_ingressrouteudp.go @@ -29,7 +29,7 @@ package fake import ( "context" - v1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + v1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefik/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_middleware.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_middleware.go index 9371d16b61..3f8dac618b 100644 --- a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_middleware.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_middleware.go @@ -29,7 +29,7 @@ package fake import ( "context" - v1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + v1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefik/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_middlewaretcp.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_middlewaretcp.go index f4032c9166..b4f7586ac6 100644 --- a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_middlewaretcp.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_middlewaretcp.go @@ -29,7 +29,7 @@ package fake import ( "context" - v1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + v1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefik/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_serverstransport.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_serverstransport.go index 8bd86a2bd7..293ddfeecb 100644 --- a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_serverstransport.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_serverstransport.go @@ -29,7 +29,7 @@ package fake import ( "context" - v1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + v1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefik/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_serverstransporttcp.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_serverstransporttcp.go index 5ac6492fd7..e26cec68fc 100644 --- a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_serverstransporttcp.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_serverstransporttcp.go @@ -29,7 +29,7 @@ package fake import ( "context" - v1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + v1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefik/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_tlsoption.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_tlsoption.go index 8340c42351..5e44da0acb 100644 --- a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_tlsoption.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_tlsoption.go @@ -29,7 +29,7 @@ package fake import ( "context" - v1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + v1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefik/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_tlsstore.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_tlsstore.go index 0a90d563d0..3da87fb3ca 100644 --- a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_tlsstore.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_tlsstore.go @@ -29,7 +29,7 @@ package fake import ( "context" - v1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + v1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefik/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_traefik_client.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_traefik_client.go index 0c16ba4e78..8f6bae75e9 100644 --- a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_traefik_client.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_traefik_client.go @@ -27,7 +27,7 @@ THE SOFTWARE. package fake import ( - v1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1" + v1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) diff --git a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_traefikservice.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_traefikservice.go index 386b03315b..061fe4dad2 100644 --- a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_traefikservice.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_traefikservice.go @@ -29,7 +29,7 @@ package fake import ( "context" - v1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + v1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefik/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/ingressroute.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/ingressroute.go index 6f14615148..6f097d9ba7 100644 --- a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/ingressroute.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/ingressroute.go @@ -30,8 +30,8 @@ import ( "context" "time" - scheme "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme" - v1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + scheme "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme" + v1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefik/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/ingressroutetcp.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/ingressroutetcp.go index ec4a6b3441..9ef0c9772e 100644 --- a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/ingressroutetcp.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/ingressroutetcp.go @@ -30,8 +30,8 @@ import ( "context" "time" - scheme "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme" - v1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + scheme "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme" + v1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefik/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/ingressrouteudp.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/ingressrouteudp.go index 3126460c14..d2563bcb66 100644 --- a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/ingressrouteudp.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/ingressrouteudp.go @@ -30,8 +30,8 @@ import ( "context" "time" - scheme "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme" - v1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + scheme "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme" + v1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefik/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/middleware.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/middleware.go index adb790512f..a40141761b 100644 --- a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/middleware.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/middleware.go @@ -30,8 +30,8 @@ import ( "context" "time" - scheme "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme" - v1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + scheme "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme" + v1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefik/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/middlewaretcp.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/middlewaretcp.go index f740548155..7b751862b9 100644 --- a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/middlewaretcp.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/middlewaretcp.go @@ -30,8 +30,8 @@ import ( "context" "time" - scheme "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme" - v1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + scheme "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme" + v1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefik/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/serverstransport.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/serverstransport.go index d2444b2d33..fa8883aba9 100644 --- a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/serverstransport.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/serverstransport.go @@ -30,8 +30,8 @@ import ( "context" "time" - scheme "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme" - v1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + scheme "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme" + v1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefik/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/serverstransporttcp.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/serverstransporttcp.go index 648f6e86f9..d6c01c365d 100644 --- a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/serverstransporttcp.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/serverstransporttcp.go @@ -30,8 +30,8 @@ import ( "context" "time" - scheme "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme" - v1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + scheme "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme" + v1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefik/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/tlsoption.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/tlsoption.go index 358ff20e8a..b9848f4306 100644 --- a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/tlsoption.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/tlsoption.go @@ -30,8 +30,8 @@ import ( "context" "time" - scheme "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme" - v1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + scheme "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme" + v1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefik/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/tlsstore.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/tlsstore.go index 16a53fa25c..1c0e1a23a6 100644 --- a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/tlsstore.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/tlsstore.go @@ -30,8 +30,8 @@ import ( "context" "time" - scheme "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme" - v1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + scheme "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme" + v1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefik/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/traefik_client.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/traefik_client.go index 291aebd491..862a167c70 100644 --- a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/traefik_client.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/traefik_client.go @@ -27,8 +27,8 @@ THE SOFTWARE. package v1alpha1 import ( - "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme" - v1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme" + v1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefik/v1alpha1" rest "k8s.io/client-go/rest" ) diff --git a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/traefikservice.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/traefikservice.go index 0384e4a97e..89f3954b27 100644 --- a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/traefikservice.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/traefikservice.go @@ -30,8 +30,8 @@ import ( "context" "time" - scheme "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme" - v1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + scheme "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme" + v1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefik/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/provider/kubernetes/crd/generated/informers/externalversions/factory.go b/pkg/provider/kubernetes/crd/generated/informers/externalversions/factory.go index 1b0085df09..a4f4cc5a9b 100644 --- a/pkg/provider/kubernetes/crd/generated/informers/externalversions/factory.go +++ b/pkg/provider/kubernetes/crd/generated/informers/externalversions/factory.go @@ -31,9 +31,9 @@ import ( sync "sync" time "time" - versioned "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned" - internalinterfaces "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" - traefik "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik" + versioned "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/clientset/versioned" + internalinterfaces "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" + traefik "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/provider/kubernetes/crd/generated/informers/externalversions/generic.go b/pkg/provider/kubernetes/crd/generated/informers/externalversions/generic.go index 250a011877..ba1fa583a3 100644 --- a/pkg/provider/kubernetes/crd/generated/informers/externalversions/generic.go +++ b/pkg/provider/kubernetes/crd/generated/informers/externalversions/generic.go @@ -29,7 +29,7 @@ package externalversions import ( "fmt" - v1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + v1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefik/v1alpha1" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" ) diff --git a/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces/factory_interfaces.go b/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces/factory_interfaces.go index 5abe4a64d9..6af7a12d8b 100644 --- a/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces/factory_interfaces.go +++ b/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -29,7 +29,7 @@ package internalinterfaces import ( time "time" - versioned "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned" + versioned "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/clientset/versioned" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" diff --git a/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/interface.go b/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/interface.go index 8edcc5d82a..a584925775 100644 --- a/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/interface.go +++ b/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/interface.go @@ -27,8 +27,8 @@ THE SOFTWARE. package traefik import ( - internalinterfaces "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1" + internalinterfaces "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1" ) // Interface provides access to each of this group's versions. diff --git a/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/ingressroute.go b/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/ingressroute.go index d990823807..4da1e53c83 100644 --- a/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/ingressroute.go +++ b/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/ingressroute.go @@ -30,10 +30,10 @@ import ( "context" time "time" - versioned "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned" - internalinterfaces "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1" - traefikv1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + versioned "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/clientset/versioned" + internalinterfaces "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1" + traefikv1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefik/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/ingressroutetcp.go b/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/ingressroutetcp.go index 544bf98a96..9a1f0c8e44 100644 --- a/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/ingressroutetcp.go +++ b/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/ingressroutetcp.go @@ -30,10 +30,10 @@ import ( "context" time "time" - versioned "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned" - internalinterfaces "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1" - traefikv1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + versioned "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/clientset/versioned" + internalinterfaces "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1" + traefikv1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefik/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/ingressrouteudp.go b/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/ingressrouteudp.go index 073dcbf81d..31798dfc60 100644 --- a/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/ingressrouteudp.go +++ b/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/ingressrouteudp.go @@ -30,10 +30,10 @@ import ( "context" time "time" - versioned "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned" - internalinterfaces "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1" - traefikv1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + versioned "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/clientset/versioned" + internalinterfaces "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1" + traefikv1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefik/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/interface.go b/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/interface.go index 047b7a31f1..a611e3c78e 100644 --- a/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/interface.go +++ b/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/interface.go @@ -27,7 +27,7 @@ THE SOFTWARE. package v1alpha1 import ( - internalinterfaces "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" + internalinterfaces "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/middleware.go b/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/middleware.go index b630ff64cc..fa9ff771c4 100644 --- a/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/middleware.go +++ b/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/middleware.go @@ -30,10 +30,10 @@ import ( "context" time "time" - versioned "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned" - internalinterfaces "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1" - traefikv1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + versioned "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/clientset/versioned" + internalinterfaces "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1" + traefikv1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefik/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/middlewaretcp.go b/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/middlewaretcp.go index 6fce3ca24c..2bd54d23a3 100644 --- a/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/middlewaretcp.go +++ b/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/middlewaretcp.go @@ -30,10 +30,10 @@ import ( "context" time "time" - versioned "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned" - internalinterfaces "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1" - traefikv1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + versioned "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/clientset/versioned" + internalinterfaces "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1" + traefikv1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefik/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/serverstransport.go b/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/serverstransport.go index 7801f4b8d2..22f9607f3d 100644 --- a/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/serverstransport.go +++ b/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/serverstransport.go @@ -30,10 +30,10 @@ import ( "context" time "time" - versioned "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned" - internalinterfaces "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1" - traefikv1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + versioned "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/clientset/versioned" + internalinterfaces "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1" + traefikv1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefik/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/serverstransporttcp.go b/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/serverstransporttcp.go index 127df37f96..7b07e2ba58 100644 --- a/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/serverstransporttcp.go +++ b/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/serverstransporttcp.go @@ -30,10 +30,10 @@ import ( "context" time "time" - versioned "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned" - internalinterfaces "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1" - traefikv1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + versioned "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/clientset/versioned" + internalinterfaces "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1" + traefikv1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefik/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/tlsoption.go b/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/tlsoption.go index 4a2a1bf36c..d31a6959c4 100644 --- a/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/tlsoption.go +++ b/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/tlsoption.go @@ -30,10 +30,10 @@ import ( "context" time "time" - versioned "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned" - internalinterfaces "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1" - traefikv1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + versioned "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/clientset/versioned" + internalinterfaces "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1" + traefikv1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefik/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/tlsstore.go b/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/tlsstore.go index ba37932c7d..783f459c99 100644 --- a/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/tlsstore.go +++ b/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/tlsstore.go @@ -30,10 +30,10 @@ import ( "context" time "time" - versioned "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned" - internalinterfaces "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1" - traefikv1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + versioned "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/clientset/versioned" + internalinterfaces "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1" + traefikv1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefik/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/traefikservice.go b/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/traefikservice.go index 57bce76831..bc1390d520 100644 --- a/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/traefikservice.go +++ b/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/traefikservice.go @@ -30,10 +30,10 @@ import ( "context" time "time" - versioned "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned" - internalinterfaces "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1" - traefikv1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + versioned "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/clientset/versioned" + internalinterfaces "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1" + traefikv1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefik/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/ingressroute.go b/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/ingressroute.go index ab4878d034..78093fe169 100644 --- a/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/ingressroute.go +++ b/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/ingressroute.go @@ -27,7 +27,7 @@ THE SOFTWARE. package v1alpha1 import ( - v1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + v1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefik/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/ingressroutetcp.go b/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/ingressroutetcp.go index 408a153c2d..aada15c847 100644 --- a/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/ingressroutetcp.go +++ b/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/ingressroutetcp.go @@ -27,7 +27,7 @@ THE SOFTWARE. package v1alpha1 import ( - v1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + v1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefik/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/ingressrouteudp.go b/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/ingressrouteudp.go index dcd7fae3d9..5e00c09428 100644 --- a/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/ingressrouteudp.go +++ b/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/ingressrouteudp.go @@ -27,7 +27,7 @@ THE SOFTWARE. package v1alpha1 import ( - v1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + v1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefik/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/middleware.go b/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/middleware.go index 30bd9e9880..f227ea242a 100644 --- a/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/middleware.go +++ b/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/middleware.go @@ -27,7 +27,7 @@ THE SOFTWARE. package v1alpha1 import ( - v1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + v1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefik/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/middlewaretcp.go b/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/middlewaretcp.go index a9df604cf0..4a4fa3ab0e 100644 --- a/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/middlewaretcp.go +++ b/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/middlewaretcp.go @@ -27,7 +27,7 @@ THE SOFTWARE. package v1alpha1 import ( - v1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + v1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefik/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/serverstransport.go b/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/serverstransport.go index c9ec998717..0f9930787b 100644 --- a/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/serverstransport.go +++ b/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/serverstransport.go @@ -27,7 +27,7 @@ THE SOFTWARE. package v1alpha1 import ( - v1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + v1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefik/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/serverstransporttcp.go b/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/serverstransporttcp.go index 9f204aa787..3bc63b329a 100644 --- a/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/serverstransporttcp.go +++ b/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/serverstransporttcp.go @@ -27,7 +27,7 @@ THE SOFTWARE. package v1alpha1 import ( - v1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + v1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefik/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/tlsoption.go b/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/tlsoption.go index bec59e6c67..8a52c79df8 100644 --- a/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/tlsoption.go +++ b/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/tlsoption.go @@ -27,7 +27,7 @@ THE SOFTWARE. package v1alpha1 import ( - v1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + v1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefik/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/tlsstore.go b/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/tlsstore.go index 358bc51930..673a690ba1 100644 --- a/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/tlsstore.go +++ b/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/tlsstore.go @@ -27,7 +27,7 @@ THE SOFTWARE. package v1alpha1 import ( - v1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + v1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefik/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/traefikservice.go b/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/traefikservice.go index 47a5ba5570..e9636e46cd 100644 --- a/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/traefikservice.go +++ b/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/traefikservice.go @@ -27,7 +27,7 @@ THE SOFTWARE. package v1alpha1 import ( - v1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + v1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefik/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/provider/kubernetes/crd/kubernetes.go b/pkg/provider/kubernetes/crd/kubernetes.go index e3d65be74a..60a1cf1625 100644 --- a/pkg/provider/kubernetes/crd/kubernetes.go +++ b/pkg/provider/kubernetes/crd/kubernetes.go @@ -19,14 +19,14 @@ import ( "github.com/mitchellh/hashstructure" "github.com/rs/zerolog/log" ptypes "github.com/traefik/paerser/types" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/job" - "github.com/traefik/traefik/v2/pkg/logs" - "github.com/traefik/traefik/v2/pkg/provider" - "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" - "github.com/traefik/traefik/v2/pkg/safe" - "github.com/traefik/traefik/v2/pkg/tls" - "github.com/traefik/traefik/v2/pkg/types" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/job" + "github.com/traefik/traefik/v3/pkg/logs" + "github.com/traefik/traefik/v3/pkg/provider" + "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefik/v1alpha1" + "github.com/traefik/traefik/v3/pkg/safe" + "github.com/traefik/traefik/v3/pkg/tls" + "github.com/traefik/traefik/v3/pkg/types" corev1 "k8s.io/api/core/v1" apiextensionv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" "k8s.io/apimachinery/pkg/labels" diff --git a/pkg/provider/kubernetes/crd/kubernetes_http.go b/pkg/provider/kubernetes/crd/kubernetes_http.go index fa8bed11d7..02e0f44d45 100644 --- a/pkg/provider/kubernetes/crd/kubernetes_http.go +++ b/pkg/provider/kubernetes/crd/kubernetes_http.go @@ -9,11 +9,11 @@ import ( "strings" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/logs" - "github.com/traefik/traefik/v2/pkg/provider" - "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" - "github.com/traefik/traefik/v2/pkg/tls" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/logs" + "github.com/traefik/traefik/v3/pkg/provider" + "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefik/v1alpha1" + "github.com/traefik/traefik/v3/pkg/tls" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/intstr" ) diff --git a/pkg/provider/kubernetes/crd/kubernetes_tcp.go b/pkg/provider/kubernetes/crd/kubernetes_tcp.go index 446168a258..0b2d3b1479 100644 --- a/pkg/provider/kubernetes/crd/kubernetes_tcp.go +++ b/pkg/provider/kubernetes/crd/kubernetes_tcp.go @@ -9,11 +9,11 @@ import ( "strings" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/logs" - "github.com/traefik/traefik/v2/pkg/provider" - "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" - "github.com/traefik/traefik/v2/pkg/tls" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/logs" + "github.com/traefik/traefik/v3/pkg/provider" + "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefik/v1alpha1" + "github.com/traefik/traefik/v3/pkg/tls" corev1 "k8s.io/api/core/v1" ) diff --git a/pkg/provider/kubernetes/crd/kubernetes_test.go b/pkg/provider/kubernetes/crd/kubernetes_test.go index 6819df09e5..eac24ede2a 100644 --- a/pkg/provider/kubernetes/crd/kubernetes_test.go +++ b/pkg/provider/kubernetes/crd/kubernetes_test.go @@ -12,13 +12,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ptypes "github.com/traefik/paerser/types" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/provider" - crdfake "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned/fake" - "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" - "github.com/traefik/traefik/v2/pkg/provider/kubernetes/k8s" - "github.com/traefik/traefik/v2/pkg/tls" - "github.com/traefik/traefik/v2/pkg/types" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/provider" + crdfake "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/generated/clientset/versioned/fake" + "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefik/v1alpha1" + "github.com/traefik/traefik/v3/pkg/provider/kubernetes/k8s" + "github.com/traefik/traefik/v3/pkg/tls" + "github.com/traefik/traefik/v3/pkg/types" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/intstr" diff --git a/pkg/provider/kubernetes/crd/kubernetes_udp.go b/pkg/provider/kubernetes/crd/kubernetes_udp.go index 2589ebb0f0..e9d0ef9e52 100644 --- a/pkg/provider/kubernetes/crd/kubernetes_udp.go +++ b/pkg/provider/kubernetes/crd/kubernetes_udp.go @@ -8,8 +8,8 @@ import ( "strconv" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefik/v1alpha1" corev1 "k8s.io/api/core/v1" ) diff --git a/pkg/provider/kubernetes/crd/traefik/v1alpha1/ingressroute.go b/pkg/provider/kubernetes/crd/traefik/v1alpha1/ingressroute.go index 93f57998c5..0b9625d6d2 100644 --- a/pkg/provider/kubernetes/crd/traefik/v1alpha1/ingressroute.go +++ b/pkg/provider/kubernetes/crd/traefik/v1alpha1/ingressroute.go @@ -1,8 +1,8 @@ package v1alpha1 import ( - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/types" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/types" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" ) diff --git a/pkg/provider/kubernetes/crd/traefik/v1alpha1/ingressroutetcp.go b/pkg/provider/kubernetes/crd/traefik/v1alpha1/ingressroutetcp.go index 71b76afc55..80811e3da8 100644 --- a/pkg/provider/kubernetes/crd/traefik/v1alpha1/ingressroutetcp.go +++ b/pkg/provider/kubernetes/crd/traefik/v1alpha1/ingressroutetcp.go @@ -1,8 +1,8 @@ package v1alpha1 import ( - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/types" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/types" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" ) diff --git a/pkg/provider/kubernetes/crd/traefik/v1alpha1/middleware.go b/pkg/provider/kubernetes/crd/traefik/v1alpha1/middleware.go index c0d55d28fb..51078f8560 100644 --- a/pkg/provider/kubernetes/crd/traefik/v1alpha1/middleware.go +++ b/pkg/provider/kubernetes/crd/traefik/v1alpha1/middleware.go @@ -1,7 +1,7 @@ package v1alpha1 import ( - "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/dynamic" apiextensionv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" diff --git a/pkg/provider/kubernetes/crd/traefik/v1alpha1/middlewaretcp.go b/pkg/provider/kubernetes/crd/traefik/v1alpha1/middlewaretcp.go index 655bf0e26f..10799f2953 100644 --- a/pkg/provider/kubernetes/crd/traefik/v1alpha1/middlewaretcp.go +++ b/pkg/provider/kubernetes/crd/traefik/v1alpha1/middlewaretcp.go @@ -1,7 +1,7 @@ package v1alpha1 import ( - "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/dynamic" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/provider/kubernetes/crd/traefik/v1alpha1/serverstransport.go b/pkg/provider/kubernetes/crd/traefik/v1alpha1/serverstransport.go index 68a3438d2e..d8ae851dec 100644 --- a/pkg/provider/kubernetes/crd/traefik/v1alpha1/serverstransport.go +++ b/pkg/provider/kubernetes/crd/traefik/v1alpha1/serverstransport.go @@ -1,7 +1,7 @@ package v1alpha1 import ( - "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/dynamic" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" ) diff --git a/pkg/provider/kubernetes/crd/traefik/v1alpha1/serverstransporttcp.go b/pkg/provider/kubernetes/crd/traefik/v1alpha1/serverstransporttcp.go index 44b92dbe63..e98d8c07c2 100644 --- a/pkg/provider/kubernetes/crd/traefik/v1alpha1/serverstransporttcp.go +++ b/pkg/provider/kubernetes/crd/traefik/v1alpha1/serverstransporttcp.go @@ -1,7 +1,7 @@ package v1alpha1 import ( - "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/dynamic" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" ) diff --git a/pkg/provider/kubernetes/crd/traefik/v1alpha1/service.go b/pkg/provider/kubernetes/crd/traefik/v1alpha1/service.go index 09fafb11be..2e93ced5dd 100644 --- a/pkg/provider/kubernetes/crd/traefik/v1alpha1/service.go +++ b/pkg/provider/kubernetes/crd/traefik/v1alpha1/service.go @@ -1,7 +1,7 @@ package v1alpha1 import ( - "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/dynamic" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/provider/kubernetes/crd/traefik/v1alpha1/tlsstore.go b/pkg/provider/kubernetes/crd/traefik/v1alpha1/tlsstore.go index 2af463df18..2f7bff6221 100644 --- a/pkg/provider/kubernetes/crd/traefik/v1alpha1/tlsstore.go +++ b/pkg/provider/kubernetes/crd/traefik/v1alpha1/tlsstore.go @@ -1,7 +1,7 @@ package v1alpha1 import ( - "github.com/traefik/traefik/v2/pkg/tls" + "github.com/traefik/traefik/v3/pkg/tls" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/provider/kubernetes/crd/traefik/v1alpha1/zz_generated.deepcopy.go b/pkg/provider/kubernetes/crd/traefik/v1alpha1/zz_generated.deepcopy.go index bb30df58cd..e8f75cda62 100644 --- a/pkg/provider/kubernetes/crd/traefik/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/provider/kubernetes/crd/traefik/v1alpha1/zz_generated.deepcopy.go @@ -30,9 +30,9 @@ THE SOFTWARE. package v1alpha1 import ( - dynamic "github.com/traefik/traefik/v2/pkg/config/dynamic" - tls "github.com/traefik/traefik/v2/pkg/tls" - types "github.com/traefik/traefik/v2/pkg/types" + dynamic "github.com/traefik/traefik/v3/pkg/config/dynamic" + tls "github.com/traefik/traefik/v3/pkg/tls" + types "github.com/traefik/traefik/v3/pkg/types" v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" runtime "k8s.io/apimachinery/pkg/runtime" intstr "k8s.io/apimachinery/pkg/util/intstr" diff --git a/pkg/provider/kubernetes/gateway/client_mock_test.go b/pkg/provider/kubernetes/gateway/client_mock_test.go index 010ce66355..1003a777c9 100644 --- a/pkg/provider/kubernetes/gateway/client_mock_test.go +++ b/pkg/provider/kubernetes/gateway/client_mock_test.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "github.com/traefik/traefik/v2/pkg/provider/kubernetes/k8s" + "github.com/traefik/traefik/v3/pkg/provider/kubernetes/k8s" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" diff --git a/pkg/provider/kubernetes/gateway/kubernetes.go b/pkg/provider/kubernetes/gateway/kubernetes.go index 8f25399f61..0db48af8de 100644 --- a/pkg/provider/kubernetes/gateway/kubernetes.go +++ b/pkg/provider/kubernetes/gateway/kubernetes.go @@ -19,13 +19,13 @@ import ( "github.com/mitchellh/hashstructure" "github.com/rs/zerolog/log" ptypes "github.com/traefik/paerser/types" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/job" - "github.com/traefik/traefik/v2/pkg/logs" - "github.com/traefik/traefik/v2/pkg/provider" - traefikv1alpha1 "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" - "github.com/traefik/traefik/v2/pkg/safe" - "github.com/traefik/traefik/v2/pkg/tls" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/job" + "github.com/traefik/traefik/v3/pkg/logs" + "github.com/traefik/traefik/v3/pkg/provider" + traefikv1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefik/v1alpha1" + "github.com/traefik/traefik/v3/pkg/safe" + "github.com/traefik/traefik/v3/pkg/tls" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" diff --git a/pkg/provider/kubernetes/gateway/kubernetes_test.go b/pkg/provider/kubernetes/gateway/kubernetes_test.go index 068d37d3b2..f7e2acafe9 100644 --- a/pkg/provider/kubernetes/gateway/kubernetes_test.go +++ b/pkg/provider/kubernetes/gateway/kubernetes_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ptypes "github.com/traefik/paerser/types" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/provider" - "github.com/traefik/traefik/v2/pkg/tls" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/provider" + "github.com/traefik/traefik/v3/pkg/tls" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/utils/pointer" "sigs.k8s.io/gateway-api/apis/v1alpha2" diff --git a/pkg/provider/kubernetes/ingress/annotations.go b/pkg/provider/kubernetes/ingress/annotations.go index 25807cdd25..54d28c44ed 100644 --- a/pkg/provider/kubernetes/ingress/annotations.go +++ b/pkg/provider/kubernetes/ingress/annotations.go @@ -4,8 +4,8 @@ import ( "regexp" "strings" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/config/label" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/label" ) const ( diff --git a/pkg/provider/kubernetes/ingress/annotations_test.go b/pkg/provider/kubernetes/ingress/annotations_test.go index 075e76f902..c7c6b62bc4 100644 --- a/pkg/provider/kubernetes/ingress/annotations_test.go +++ b/pkg/provider/kubernetes/ingress/annotations_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/types" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/types" ) func Test_parseRouterConfig(t *testing.T) { diff --git a/pkg/provider/kubernetes/ingress/client.go b/pkg/provider/kubernetes/ingress/client.go index 2ac4867246..11854c12b2 100644 --- a/pkg/provider/kubernetes/ingress/client.go +++ b/pkg/provider/kubernetes/ingress/client.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/go-version" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/provider/kubernetes/k8s" - traefikversion "github.com/traefik/traefik/v2/pkg/version" + "github.com/traefik/traefik/v3/pkg/provider/kubernetes/k8s" + traefikversion "github.com/traefik/traefik/v3/pkg/version" corev1 "k8s.io/api/core/v1" networkingv1 "k8s.io/api/networking/v1" networkingv1beta1 "k8s.io/api/networking/v1beta1" diff --git a/pkg/provider/kubernetes/ingress/client_mock_test.go b/pkg/provider/kubernetes/ingress/client_mock_test.go index 6cc6ef1380..6d91c37c85 100644 --- a/pkg/provider/kubernetes/ingress/client_mock_test.go +++ b/pkg/provider/kubernetes/ingress/client_mock_test.go @@ -5,7 +5,7 @@ import ( "os" "github.com/hashicorp/go-version" - "github.com/traefik/traefik/v2/pkg/provider/kubernetes/k8s" + "github.com/traefik/traefik/v3/pkg/provider/kubernetes/k8s" corev1 "k8s.io/api/core/v1" networkingv1 "k8s.io/api/networking/v1" networkingv1beta1 "k8s.io/api/networking/v1beta1" diff --git a/pkg/provider/kubernetes/ingress/kubernetes.go b/pkg/provider/kubernetes/ingress/kubernetes.go index 54a4be3953..bef1069406 100644 --- a/pkg/provider/kubernetes/ingress/kubernetes.go +++ b/pkg/provider/kubernetes/ingress/kubernetes.go @@ -18,12 +18,12 @@ import ( "github.com/mitchellh/hashstructure" "github.com/rs/zerolog/log" ptypes "github.com/traefik/paerser/types" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/job" - "github.com/traefik/traefik/v2/pkg/logs" - "github.com/traefik/traefik/v2/pkg/provider" - "github.com/traefik/traefik/v2/pkg/safe" - "github.com/traefik/traefik/v2/pkg/tls" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/job" + "github.com/traefik/traefik/v3/pkg/logs" + "github.com/traefik/traefik/v3/pkg/provider" + "github.com/traefik/traefik/v3/pkg/safe" + "github.com/traefik/traefik/v3/pkg/tls" corev1 "k8s.io/api/core/v1" networkingv1 "k8s.io/api/networking/v1" "k8s.io/apimachinery/pkg/labels" diff --git a/pkg/provider/kubernetes/ingress/kubernetes_test.go b/pkg/provider/kubernetes/ingress/kubernetes_test.go index 3c21f15192..3c9a6bc5c8 100644 --- a/pkg/provider/kubernetes/ingress/kubernetes_test.go +++ b/pkg/provider/kubernetes/ingress/kubernetes_test.go @@ -11,10 +11,10 @@ import ( "github.com/stretchr/testify/assert" ptypes "github.com/traefik/paerser/types" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/provider" - "github.com/traefik/traefik/v2/pkg/tls" - "github.com/traefik/traefik/v2/pkg/types" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/provider" + "github.com/traefik/traefik/v3/pkg/tls" + "github.com/traefik/traefik/v3/pkg/types" corev1 "k8s.io/api/core/v1" networkingv1 "k8s.io/api/networking/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/provider/kv/consul/consul.go b/pkg/provider/kv/consul/consul.go index 4a537c78f9..2a5fdfd497 100644 --- a/pkg/provider/kv/consul/consul.go +++ b/pkg/provider/kv/consul/consul.go @@ -7,9 +7,9 @@ import ( "time" "github.com/kvtools/consul" - "github.com/traefik/traefik/v2/pkg/provider" - "github.com/traefik/traefik/v2/pkg/provider/kv" - "github.com/traefik/traefik/v2/pkg/types" + "github.com/traefik/traefik/v3/pkg/provider" + "github.com/traefik/traefik/v3/pkg/provider/kv" + "github.com/traefik/traefik/v3/pkg/types" ) // providerName is the Consul provider name. diff --git a/pkg/provider/kv/etcd/etcd.go b/pkg/provider/kv/etcd/etcd.go index 7cf027fedb..9da0610761 100644 --- a/pkg/provider/kv/etcd/etcd.go +++ b/pkg/provider/kv/etcd/etcd.go @@ -6,9 +6,9 @@ import ( "time" "github.com/kvtools/etcdv3" - "github.com/traefik/traefik/v2/pkg/provider" - "github.com/traefik/traefik/v2/pkg/provider/kv" - "github.com/traefik/traefik/v2/pkg/types" + "github.com/traefik/traefik/v3/pkg/provider" + "github.com/traefik/traefik/v3/pkg/provider/kv" + "github.com/traefik/traefik/v3/pkg/types" ) var _ provider.Provider = (*Provider)(nil) diff --git a/pkg/provider/kv/kv.go b/pkg/provider/kv/kv.go index f6697b8219..fd2671306c 100644 --- a/pkg/provider/kv/kv.go +++ b/pkg/provider/kv/kv.go @@ -11,11 +11,11 @@ import ( "github.com/kvtools/valkeyrie" "github.com/kvtools/valkeyrie/store" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/config/kv" - "github.com/traefik/traefik/v2/pkg/job" - "github.com/traefik/traefik/v2/pkg/logs" - "github.com/traefik/traefik/v2/pkg/safe" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/kv" + "github.com/traefik/traefik/v3/pkg/job" + "github.com/traefik/traefik/v3/pkg/logs" + "github.com/traefik/traefik/v3/pkg/safe" ) // Provider holds configurations of the provider. diff --git a/pkg/provider/kv/kv_test.go b/pkg/provider/kv/kv_test.go index b078997fec..8ba2cde996 100644 --- a/pkg/provider/kv/kv_test.go +++ b/pkg/provider/kv/kv_test.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ptypes "github.com/traefik/paerser/types" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/tls" - "github.com/traefik/traefik/v2/pkg/types" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/tls" + "github.com/traefik/traefik/v3/pkg/types" ) func Test_buildConfiguration(t *testing.T) { diff --git a/pkg/provider/kv/redis/redis.go b/pkg/provider/kv/redis/redis.go index 23f432bb1e..ddd7178cbe 100644 --- a/pkg/provider/kv/redis/redis.go +++ b/pkg/provider/kv/redis/redis.go @@ -5,9 +5,9 @@ import ( "fmt" "github.com/kvtools/redis" - "github.com/traefik/traefik/v2/pkg/provider" - "github.com/traefik/traefik/v2/pkg/provider/kv" - "github.com/traefik/traefik/v2/pkg/types" + "github.com/traefik/traefik/v3/pkg/provider" + "github.com/traefik/traefik/v3/pkg/provider/kv" + "github.com/traefik/traefik/v3/pkg/types" ) var _ provider.Provider = (*Provider)(nil) diff --git a/pkg/provider/kv/zk/zk.go b/pkg/provider/kv/zk/zk.go index 28b7fee120..9d66cee34a 100644 --- a/pkg/provider/kv/zk/zk.go +++ b/pkg/provider/kv/zk/zk.go @@ -4,8 +4,8 @@ import ( "time" "github.com/kvtools/zookeeper" - "github.com/traefik/traefik/v2/pkg/provider" - "github.com/traefik/traefik/v2/pkg/provider/kv" + "github.com/traefik/traefik/v3/pkg/provider" + "github.com/traefik/traefik/v3/pkg/provider/kv" ) var _ provider.Provider = (*Provider)(nil) diff --git a/pkg/provider/nomad/config.go b/pkg/provider/nomad/config.go index c6202c9d73..b6caa8cf10 100644 --- a/pkg/provider/nomad/config.go +++ b/pkg/provider/nomad/config.go @@ -11,11 +11,11 @@ import ( "strings" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/config/label" - "github.com/traefik/traefik/v2/pkg/logs" - "github.com/traefik/traefik/v2/pkg/provider" - "github.com/traefik/traefik/v2/pkg/provider/constraints" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/label" + "github.com/traefik/traefik/v3/pkg/logs" + "github.com/traefik/traefik/v3/pkg/provider" + "github.com/traefik/traefik/v3/pkg/provider/constraints" ) func (p *Provider) buildConfig(ctx context.Context, items []item) *dynamic.Configuration { diff --git a/pkg/provider/nomad/config_test.go b/pkg/provider/nomad/config_test.go index b1dca43611..db7bb3855b 100644 --- a/pkg/provider/nomad/config_test.go +++ b/pkg/provider/nomad/config_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ptypes "github.com/traefik/paerser/types" - "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/dynamic" ) func Test_defaultRule(t *testing.T) { diff --git a/pkg/provider/nomad/nomad.go b/pkg/provider/nomad/nomad.go index 8f12086f61..9ed5c660f5 100644 --- a/pkg/provider/nomad/nomad.go +++ b/pkg/provider/nomad/nomad.go @@ -12,13 +12,13 @@ import ( "github.com/hashicorp/nomad/api" "github.com/rs/zerolog/log" ptypes "github.com/traefik/paerser/types" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/job" - "github.com/traefik/traefik/v2/pkg/logs" - "github.com/traefik/traefik/v2/pkg/provider" - "github.com/traefik/traefik/v2/pkg/provider/constraints" - "github.com/traefik/traefik/v2/pkg/safe" - "github.com/traefik/traefik/v2/pkg/types" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/job" + "github.com/traefik/traefik/v3/pkg/logs" + "github.com/traefik/traefik/v3/pkg/provider" + "github.com/traefik/traefik/v3/pkg/provider/constraints" + "github.com/traefik/traefik/v3/pkg/safe" + "github.com/traefik/traefik/v3/pkg/types" ) const ( diff --git a/pkg/provider/provider.go b/pkg/provider/provider.go index 70b053055c..2597a05e69 100644 --- a/pkg/provider/provider.go +++ b/pkg/provider/provider.go @@ -1,8 +1,8 @@ package provider import ( - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/safe" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/safe" ) // Provider defines methods of a provider. diff --git a/pkg/provider/rest/rest.go b/pkg/provider/rest/rest.go index f375bd1dbc..e0a03bb4be 100644 --- a/pkg/provider/rest/rest.go +++ b/pkg/provider/rest/rest.go @@ -7,9 +7,9 @@ import ( "github.com/gorilla/mux" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/provider" - "github.com/traefik/traefik/v2/pkg/safe" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/provider" + "github.com/traefik/traefik/v3/pkg/safe" "github.com/unrolled/render" ) diff --git a/pkg/provider/tailscale/provider.go b/pkg/provider/tailscale/provider.go index a807dfdcfa..b0b439b862 100644 --- a/pkg/provider/tailscale/provider.go +++ b/pkg/provider/tailscale/provider.go @@ -11,12 +11,12 @@ import ( "github.com/rs/zerolog/log" "github.com/tailscale/tscert" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/logs" - "github.com/traefik/traefik/v2/pkg/muxer/http" - "github.com/traefik/traefik/v2/pkg/muxer/tcp" - "github.com/traefik/traefik/v2/pkg/safe" - traefiktls "github.com/traefik/traefik/v2/pkg/tls" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/logs" + "github.com/traefik/traefik/v3/pkg/muxer/http" + "github.com/traefik/traefik/v3/pkg/muxer/tcp" + "github.com/traefik/traefik/v3/pkg/safe" + traefiktls "github.com/traefik/traefik/v3/pkg/tls" ) // Provider is the Tailscale certificates provider implementation. It receives diff --git a/pkg/provider/tailscale/provider_test.go b/pkg/provider/tailscale/provider_test.go index 6a7ae0d6f2..614b42ed30 100644 --- a/pkg/provider/tailscale/provider_test.go +++ b/pkg/provider/tailscale/provider_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - traefiktls "github.com/traefik/traefik/v2/pkg/tls" - "github.com/traefik/traefik/v2/pkg/types" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + traefiktls "github.com/traefik/traefik/v3/pkg/tls" + "github.com/traefik/traefik/v3/pkg/types" ) func TestProvider_findDomains(t *testing.T) { diff --git a/pkg/provider/traefik/internal.go b/pkg/provider/traefik/internal.go index 4ddcb499ba..71a6c321aa 100644 --- a/pkg/provider/traefik/internal.go +++ b/pkg/provider/traefik/internal.go @@ -9,12 +9,12 @@ import ( "time" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/config/static" - "github.com/traefik/traefik/v2/pkg/logs" - "github.com/traefik/traefik/v2/pkg/provider" - "github.com/traefik/traefik/v2/pkg/safe" - "github.com/traefik/traefik/v2/pkg/tls" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/static" + "github.com/traefik/traefik/v3/pkg/logs" + "github.com/traefik/traefik/v3/pkg/provider" + "github.com/traefik/traefik/v3/pkg/safe" + "github.com/traefik/traefik/v3/pkg/tls" ) const defaultInternalEntryPointName = "traefik" diff --git a/pkg/provider/traefik/internal_test.go b/pkg/provider/traefik/internal_test.go index 1e7d5b282b..915bbf6b68 100644 --- a/pkg/provider/traefik/internal_test.go +++ b/pkg/provider/traefik/internal_test.go @@ -10,10 +10,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/traefik/traefik/v2/pkg/config/static" - "github.com/traefik/traefik/v2/pkg/ping" - "github.com/traefik/traefik/v2/pkg/provider/rest" - "github.com/traefik/traefik/v2/pkg/types" + "github.com/traefik/traefik/v3/pkg/config/static" + "github.com/traefik/traefik/v3/pkg/ping" + "github.com/traefik/traefik/v3/pkg/provider/rest" + "github.com/traefik/traefik/v3/pkg/types" ) var updateExpected = flag.Bool("update_expected", false, "Update expected files in fixtures") diff --git a/pkg/redactor/redactor.go b/pkg/redactor/redactor.go index c122e307cf..fc8a9dd14a 100644 --- a/pkg/redactor/redactor.go +++ b/pkg/redactor/redactor.go @@ -7,8 +7,8 @@ import ( "regexp" "github.com/mitchellh/copystructure" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/tls" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/tls" "mvdan.cc/xurls/v2" ) diff --git a/pkg/redactor/redactor_config_test.go b/pkg/redactor/redactor_config_test.go index 49a4a292d4..c941bb848e 100644 --- a/pkg/redactor/redactor_config_test.go +++ b/pkg/redactor/redactor_config_test.go @@ -10,33 +10,33 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ptypes "github.com/traefik/paerser/types" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/config/static" - "github.com/traefik/traefik/v2/pkg/ping" - "github.com/traefik/traefik/v2/pkg/plugins" - "github.com/traefik/traefik/v2/pkg/provider/acme" - "github.com/traefik/traefik/v2/pkg/provider/consulcatalog" - "github.com/traefik/traefik/v2/pkg/provider/docker" - "github.com/traefik/traefik/v2/pkg/provider/ecs" - "github.com/traefik/traefik/v2/pkg/provider/file" - "github.com/traefik/traefik/v2/pkg/provider/http" - "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd" - "github.com/traefik/traefik/v2/pkg/provider/kubernetes/gateway" - "github.com/traefik/traefik/v2/pkg/provider/kubernetes/ingress" - "github.com/traefik/traefik/v2/pkg/provider/kv" - "github.com/traefik/traefik/v2/pkg/provider/kv/consul" - "github.com/traefik/traefik/v2/pkg/provider/kv/etcd" - "github.com/traefik/traefik/v2/pkg/provider/kv/redis" - "github.com/traefik/traefik/v2/pkg/provider/kv/zk" - "github.com/traefik/traefik/v2/pkg/provider/rest" - traefiktls "github.com/traefik/traefik/v2/pkg/tls" - "github.com/traefik/traefik/v2/pkg/tracing/datadog" - "github.com/traefik/traefik/v2/pkg/tracing/elastic" - "github.com/traefik/traefik/v2/pkg/tracing/haystack" - "github.com/traefik/traefik/v2/pkg/tracing/instana" - "github.com/traefik/traefik/v2/pkg/tracing/jaeger" - "github.com/traefik/traefik/v2/pkg/tracing/zipkin" - "github.com/traefik/traefik/v2/pkg/types" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/static" + "github.com/traefik/traefik/v3/pkg/ping" + "github.com/traefik/traefik/v3/pkg/plugins" + "github.com/traefik/traefik/v3/pkg/provider/acme" + "github.com/traefik/traefik/v3/pkg/provider/consulcatalog" + "github.com/traefik/traefik/v3/pkg/provider/docker" + "github.com/traefik/traefik/v3/pkg/provider/ecs" + "github.com/traefik/traefik/v3/pkg/provider/file" + "github.com/traefik/traefik/v3/pkg/provider/http" + "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd" + "github.com/traefik/traefik/v3/pkg/provider/kubernetes/gateway" + "github.com/traefik/traefik/v3/pkg/provider/kubernetes/ingress" + "github.com/traefik/traefik/v3/pkg/provider/kv" + "github.com/traefik/traefik/v3/pkg/provider/kv/consul" + "github.com/traefik/traefik/v3/pkg/provider/kv/etcd" + "github.com/traefik/traefik/v3/pkg/provider/kv/redis" + "github.com/traefik/traefik/v3/pkg/provider/kv/zk" + "github.com/traefik/traefik/v3/pkg/provider/rest" + traefiktls "github.com/traefik/traefik/v3/pkg/tls" + "github.com/traefik/traefik/v3/pkg/tracing/datadog" + "github.com/traefik/traefik/v3/pkg/tracing/elastic" + "github.com/traefik/traefik/v3/pkg/tracing/haystack" + "github.com/traefik/traefik/v3/pkg/tracing/instana" + "github.com/traefik/traefik/v3/pkg/tracing/jaeger" + "github.com/traefik/traefik/v3/pkg/tracing/zipkin" + "github.com/traefik/traefik/v3/pkg/types" ) var updateExpected = flag.Bool("update_expected", true, "Update expected files in fixtures") diff --git a/pkg/server/aggregator.go b/pkg/server/aggregator.go index b7c1af17c7..bd4fda0f59 100644 --- a/pkg/server/aggregator.go +++ b/pkg/server/aggregator.go @@ -3,10 +3,10 @@ package server import ( "github.com/go-acme/lego/v4/challenge/tlsalpn01" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/logs" - "github.com/traefik/traefik/v2/pkg/server/provider" - "github.com/traefik/traefik/v2/pkg/tls" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/logs" + "github.com/traefik/traefik/v3/pkg/server/provider" + "github.com/traefik/traefik/v3/pkg/tls" ) func mergeConfiguration(configurations dynamic.Configurations, defaultEntryPoints []string) dynamic.Configuration { diff --git a/pkg/server/aggregator_test.go b/pkg/server/aggregator_test.go index 70fdcdb7f7..ea1fb639f4 100644 --- a/pkg/server/aggregator_test.go +++ b/pkg/server/aggregator_test.go @@ -5,8 +5,8 @@ import ( "github.com/go-acme/lego/v4/challenge/tlsalpn01" "github.com/stretchr/testify/assert" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/tls" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/tls" ) func Test_mergeConfiguration(t *testing.T) { diff --git a/pkg/server/configurationwatcher.go b/pkg/server/configurationwatcher.go index 153fc2aefb..da2d66f170 100644 --- a/pkg/server/configurationwatcher.go +++ b/pkg/server/configurationwatcher.go @@ -7,11 +7,11 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/logs" - "github.com/traefik/traefik/v2/pkg/provider" - "github.com/traefik/traefik/v2/pkg/safe" - "github.com/traefik/traefik/v2/pkg/tls" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/logs" + "github.com/traefik/traefik/v3/pkg/provider" + "github.com/traefik/traefik/v3/pkg/safe" + "github.com/traefik/traefik/v3/pkg/tls" ) // ConfigurationWatcher watches configuration changes. diff --git a/pkg/server/configurationwatcher_test.go b/pkg/server/configurationwatcher_test.go index 4daab45276..d22cb9538f 100644 --- a/pkg/server/configurationwatcher_test.go +++ b/pkg/server/configurationwatcher_test.go @@ -9,11 +9,11 @@ import ( "time" "github.com/stretchr/testify/assert" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/provider/aggregator" - "github.com/traefik/traefik/v2/pkg/safe" - th "github.com/traefik/traefik/v2/pkg/testhelpers" - "github.com/traefik/traefik/v2/pkg/tls" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/provider/aggregator" + "github.com/traefik/traefik/v3/pkg/safe" + th "github.com/traefik/traefik/v3/pkg/testhelpers" + "github.com/traefik/traefik/v3/pkg/tls" ) type mockProvider struct { diff --git a/pkg/server/middleware/chainbuilder.go b/pkg/server/middleware/chainbuilder.go index 57d8385c5a..864e7e68b4 100644 --- a/pkg/server/middleware/chainbuilder.go +++ b/pkg/server/middleware/chainbuilder.go @@ -5,12 +5,12 @@ import ( "github.com/containous/alice" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/metrics" - "github.com/traefik/traefik/v2/pkg/middlewares/accesslog" - "github.com/traefik/traefik/v2/pkg/middlewares/capture" - metricsmiddleware "github.com/traefik/traefik/v2/pkg/middlewares/metrics" - mTracing "github.com/traefik/traefik/v2/pkg/middlewares/tracing" - "github.com/traefik/traefik/v2/pkg/tracing" + "github.com/traefik/traefik/v3/pkg/metrics" + "github.com/traefik/traefik/v3/pkg/middlewares/accesslog" + "github.com/traefik/traefik/v3/pkg/middlewares/capture" + metricsmiddleware "github.com/traefik/traefik/v3/pkg/middlewares/metrics" + mTracing "github.com/traefik/traefik/v3/pkg/middlewares/tracing" + "github.com/traefik/traefik/v3/pkg/tracing" ) // ChainBuilder Creates a middleware chain by entry point. It is used for middlewares that are created almost systematically and that need to be created before all others. diff --git a/pkg/server/middleware/middlewares.go b/pkg/server/middleware/middlewares.go index 6d1790838e..0d1bfcfa8d 100644 --- a/pkg/server/middleware/middlewares.go +++ b/pkg/server/middleware/middlewares.go @@ -9,29 +9,29 @@ import ( "strings" "github.com/containous/alice" - "github.com/traefik/traefik/v2/pkg/config/runtime" - "github.com/traefik/traefik/v2/pkg/middlewares/addprefix" - "github.com/traefik/traefik/v2/pkg/middlewares/auth" - "github.com/traefik/traefik/v2/pkg/middlewares/buffering" - "github.com/traefik/traefik/v2/pkg/middlewares/chain" - "github.com/traefik/traefik/v2/pkg/middlewares/circuitbreaker" - "github.com/traefik/traefik/v2/pkg/middlewares/compress" - "github.com/traefik/traefik/v2/pkg/middlewares/contenttype" - "github.com/traefik/traefik/v2/pkg/middlewares/customerrors" - "github.com/traefik/traefik/v2/pkg/middlewares/grpcweb" - "github.com/traefik/traefik/v2/pkg/middlewares/headers" - "github.com/traefik/traefik/v2/pkg/middlewares/inflightreq" - "github.com/traefik/traefik/v2/pkg/middlewares/ipallowlist" - "github.com/traefik/traefik/v2/pkg/middlewares/passtlsclientcert" - "github.com/traefik/traefik/v2/pkg/middlewares/ratelimiter" - "github.com/traefik/traefik/v2/pkg/middlewares/redirect" - "github.com/traefik/traefik/v2/pkg/middlewares/replacepath" - "github.com/traefik/traefik/v2/pkg/middlewares/replacepathregex" - "github.com/traefik/traefik/v2/pkg/middlewares/retry" - "github.com/traefik/traefik/v2/pkg/middlewares/stripprefix" - "github.com/traefik/traefik/v2/pkg/middlewares/stripprefixregex" - "github.com/traefik/traefik/v2/pkg/middlewares/tracing" - "github.com/traefik/traefik/v2/pkg/server/provider" + "github.com/traefik/traefik/v3/pkg/config/runtime" + "github.com/traefik/traefik/v3/pkg/middlewares/addprefix" + "github.com/traefik/traefik/v3/pkg/middlewares/auth" + "github.com/traefik/traefik/v3/pkg/middlewares/buffering" + "github.com/traefik/traefik/v3/pkg/middlewares/chain" + "github.com/traefik/traefik/v3/pkg/middlewares/circuitbreaker" + "github.com/traefik/traefik/v3/pkg/middlewares/compress" + "github.com/traefik/traefik/v3/pkg/middlewares/contenttype" + "github.com/traefik/traefik/v3/pkg/middlewares/customerrors" + "github.com/traefik/traefik/v3/pkg/middlewares/grpcweb" + "github.com/traefik/traefik/v3/pkg/middlewares/headers" + "github.com/traefik/traefik/v3/pkg/middlewares/inflightreq" + "github.com/traefik/traefik/v3/pkg/middlewares/ipallowlist" + "github.com/traefik/traefik/v3/pkg/middlewares/passtlsclientcert" + "github.com/traefik/traefik/v3/pkg/middlewares/ratelimiter" + "github.com/traefik/traefik/v3/pkg/middlewares/redirect" + "github.com/traefik/traefik/v3/pkg/middlewares/replacepath" + "github.com/traefik/traefik/v3/pkg/middlewares/replacepathregex" + "github.com/traefik/traefik/v3/pkg/middlewares/retry" + "github.com/traefik/traefik/v3/pkg/middlewares/stripprefix" + "github.com/traefik/traefik/v3/pkg/middlewares/stripprefixregex" + "github.com/traefik/traefik/v3/pkg/middlewares/tracing" + "github.com/traefik/traefik/v3/pkg/server/provider" ) type middlewareStackType int diff --git a/pkg/server/middleware/middlewares_test.go b/pkg/server/middleware/middlewares_test.go index 5d8db1aa8d..a0b97d1b90 100644 --- a/pkg/server/middleware/middlewares_test.go +++ b/pkg/server/middleware/middlewares_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/config/runtime" - "github.com/traefik/traefik/v2/pkg/server/provider" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/runtime" + "github.com/traefik/traefik/v3/pkg/server/provider" ) func TestBuilder_BuildChainNilConfig(t *testing.T) { diff --git a/pkg/server/middleware/plugins.go b/pkg/server/middleware/plugins.go index 3a092f1408..13b8b19596 100644 --- a/pkg/server/middleware/plugins.go +++ b/pkg/server/middleware/plugins.go @@ -3,8 +3,8 @@ package middleware import ( "errors" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/plugins" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/plugins" ) // PluginsBuilder the plugin's builder interface. diff --git a/pkg/server/middleware/tcp/middlewares.go b/pkg/server/middleware/tcp/middlewares.go index ad6320a467..e03a4fb84f 100644 --- a/pkg/server/middleware/tcp/middlewares.go +++ b/pkg/server/middleware/tcp/middlewares.go @@ -5,11 +5,11 @@ import ( "fmt" "strings" - "github.com/traefik/traefik/v2/pkg/config/runtime" - "github.com/traefik/traefik/v2/pkg/middlewares/tcp/inflightconn" - "github.com/traefik/traefik/v2/pkg/middlewares/tcp/ipallowlist" - "github.com/traefik/traefik/v2/pkg/server/provider" - "github.com/traefik/traefik/v2/pkg/tcp" + "github.com/traefik/traefik/v3/pkg/config/runtime" + "github.com/traefik/traefik/v3/pkg/middlewares/tcp/inflightconn" + "github.com/traefik/traefik/v3/pkg/middlewares/tcp/ipallowlist" + "github.com/traefik/traefik/v3/pkg/server/provider" + "github.com/traefik/traefik/v3/pkg/tcp" ) type middlewareStackType int diff --git a/pkg/server/router/router.go b/pkg/server/router/router.go index 067dc9f207..97f7f98b6a 100644 --- a/pkg/server/router/router.go +++ b/pkg/server/router/router.go @@ -8,17 +8,17 @@ import ( "github.com/containous/alice" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/config/runtime" - "github.com/traefik/traefik/v2/pkg/logs" - "github.com/traefik/traefik/v2/pkg/metrics" - "github.com/traefik/traefik/v2/pkg/middlewares/accesslog" - metricsMiddle "github.com/traefik/traefik/v2/pkg/middlewares/metrics" - "github.com/traefik/traefik/v2/pkg/middlewares/recovery" - "github.com/traefik/traefik/v2/pkg/middlewares/tracing" - httpmuxer "github.com/traefik/traefik/v2/pkg/muxer/http" - "github.com/traefik/traefik/v2/pkg/server/middleware" - "github.com/traefik/traefik/v2/pkg/server/provider" - "github.com/traefik/traefik/v2/pkg/tls" + "github.com/traefik/traefik/v3/pkg/config/runtime" + "github.com/traefik/traefik/v3/pkg/logs" + "github.com/traefik/traefik/v3/pkg/metrics" + "github.com/traefik/traefik/v3/pkg/middlewares/accesslog" + metricsMiddle "github.com/traefik/traefik/v3/pkg/middlewares/metrics" + "github.com/traefik/traefik/v3/pkg/middlewares/recovery" + "github.com/traefik/traefik/v3/pkg/middlewares/tracing" + httpmuxer "github.com/traefik/traefik/v3/pkg/muxer/http" + "github.com/traefik/traefik/v3/pkg/server/middleware" + "github.com/traefik/traefik/v3/pkg/server/provider" + "github.com/traefik/traefik/v3/pkg/tls" ) type middlewareBuilder interface { diff --git a/pkg/server/router/router_test.go b/pkg/server/router/router_test.go index 7f867633e6..21e0de141e 100644 --- a/pkg/server/router/router_test.go +++ b/pkg/server/router/router_test.go @@ -13,17 +13,17 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ptypes "github.com/traefik/paerser/types" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/config/runtime" - "github.com/traefik/traefik/v2/pkg/metrics" - "github.com/traefik/traefik/v2/pkg/middlewares/accesslog" - "github.com/traefik/traefik/v2/pkg/middlewares/capture" - "github.com/traefik/traefik/v2/pkg/middlewares/requestdecorator" - "github.com/traefik/traefik/v2/pkg/server/middleware" - "github.com/traefik/traefik/v2/pkg/server/service" - "github.com/traefik/traefik/v2/pkg/testhelpers" - "github.com/traefik/traefik/v2/pkg/tls" - "github.com/traefik/traefik/v2/pkg/types" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/runtime" + "github.com/traefik/traefik/v3/pkg/metrics" + "github.com/traefik/traefik/v3/pkg/middlewares/accesslog" + "github.com/traefik/traefik/v3/pkg/middlewares/capture" + "github.com/traefik/traefik/v3/pkg/middlewares/requestdecorator" + "github.com/traefik/traefik/v3/pkg/server/middleware" + "github.com/traefik/traefik/v3/pkg/server/service" + "github.com/traefik/traefik/v3/pkg/testhelpers" + "github.com/traefik/traefik/v3/pkg/tls" + "github.com/traefik/traefik/v3/pkg/types" ) func TestRouterManager_Get(t *testing.T) { diff --git a/pkg/server/router/tcp/manager.go b/pkg/server/router/tcp/manager.go index 05a451131f..df24ed704e 100644 --- a/pkg/server/router/tcp/manager.go +++ b/pkg/server/router/tcp/manager.go @@ -8,15 +8,15 @@ import ( "net/http" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/config/runtime" - "github.com/traefik/traefik/v2/pkg/logs" - "github.com/traefik/traefik/v2/pkg/middlewares/snicheck" - httpmuxer "github.com/traefik/traefik/v2/pkg/muxer/http" - tcpmuxer "github.com/traefik/traefik/v2/pkg/muxer/tcp" - "github.com/traefik/traefik/v2/pkg/server/provider" - tcpservice "github.com/traefik/traefik/v2/pkg/server/service/tcp" - "github.com/traefik/traefik/v2/pkg/tcp" - traefiktls "github.com/traefik/traefik/v2/pkg/tls" + "github.com/traefik/traefik/v3/pkg/config/runtime" + "github.com/traefik/traefik/v3/pkg/logs" + "github.com/traefik/traefik/v3/pkg/middlewares/snicheck" + httpmuxer "github.com/traefik/traefik/v3/pkg/muxer/http" + tcpmuxer "github.com/traefik/traefik/v3/pkg/muxer/tcp" + "github.com/traefik/traefik/v3/pkg/server/provider" + tcpservice "github.com/traefik/traefik/v3/pkg/server/service/tcp" + "github.com/traefik/traefik/v3/pkg/tcp" + traefiktls "github.com/traefik/traefik/v3/pkg/tls" ) type middlewareBuilder interface { diff --git a/pkg/server/router/tcp/manager_test.go b/pkg/server/router/tcp/manager_test.go index 6c5ec0a050..29af7783ce 100644 --- a/pkg/server/router/tcp/manager_test.go +++ b/pkg/server/router/tcp/manager_test.go @@ -9,12 +9,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/config/runtime" - tcpmiddleware "github.com/traefik/traefik/v2/pkg/server/middleware/tcp" - "github.com/traefik/traefik/v2/pkg/server/service/tcp" - tcp2 "github.com/traefik/traefik/v2/pkg/tcp" - traefiktls "github.com/traefik/traefik/v2/pkg/tls" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/runtime" + tcpmiddleware "github.com/traefik/traefik/v3/pkg/server/middleware/tcp" + "github.com/traefik/traefik/v3/pkg/server/service/tcp" + tcp2 "github.com/traefik/traefik/v3/pkg/tcp" + traefiktls "github.com/traefik/traefik/v3/pkg/tls" ) func TestRuntimeConfiguration(t *testing.T) { diff --git a/pkg/server/router/tcp/postgres.go b/pkg/server/router/tcp/postgres.go index 02cb480a40..e82ba7eb3b 100644 --- a/pkg/server/router/tcp/postgres.go +++ b/pkg/server/router/tcp/postgres.go @@ -9,8 +9,8 @@ import ( "sync" "github.com/rs/zerolog/log" - tcpmuxer "github.com/traefik/traefik/v2/pkg/muxer/tcp" - "github.com/traefik/traefik/v2/pkg/tcp" + tcpmuxer "github.com/traefik/traefik/v3/pkg/muxer/tcp" + "github.com/traefik/traefik/v3/pkg/tcp" ) var ( diff --git a/pkg/server/router/tcp/router.go b/pkg/server/router/tcp/router.go index 2f0f11af8b..8c2e8939bd 100644 --- a/pkg/server/router/tcp/router.go +++ b/pkg/server/router/tcp/router.go @@ -11,8 +11,8 @@ import ( "time" "github.com/rs/zerolog/log" - tcpmuxer "github.com/traefik/traefik/v2/pkg/muxer/tcp" - "github.com/traefik/traefik/v2/pkg/tcp" + tcpmuxer "github.com/traefik/traefik/v3/pkg/muxer/tcp" + "github.com/traefik/traefik/v3/pkg/tcp" ) const defaultBufSize = 4096 diff --git a/pkg/server/router/tcp/router_test.go b/pkg/server/router/tcp/router_test.go index 617e4f2cc9..3701ca67e5 100644 --- a/pkg/server/router/tcp/router_test.go +++ b/pkg/server/router/tcp/router_test.go @@ -16,12 +16,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/config/runtime" - tcpmiddleware "github.com/traefik/traefik/v2/pkg/server/middleware/tcp" - "github.com/traefik/traefik/v2/pkg/server/service/tcp" - tcp2 "github.com/traefik/traefik/v2/pkg/tcp" - traefiktls "github.com/traefik/traefik/v2/pkg/tls" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/runtime" + tcpmiddleware "github.com/traefik/traefik/v3/pkg/server/middleware/tcp" + "github.com/traefik/traefik/v3/pkg/server/service/tcp" + tcp2 "github.com/traefik/traefik/v3/pkg/tcp" + traefiktls "github.com/traefik/traefik/v3/pkg/tls" ) type applyRouter func(conf *runtime.Configuration) diff --git a/pkg/server/router/udp/router.go b/pkg/server/router/udp/router.go index 0a5303effe..091d77ed51 100644 --- a/pkg/server/router/udp/router.go +++ b/pkg/server/router/udp/router.go @@ -6,11 +6,11 @@ import ( "sort" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/config/runtime" - "github.com/traefik/traefik/v2/pkg/logs" - "github.com/traefik/traefik/v2/pkg/server/provider" - udpservice "github.com/traefik/traefik/v2/pkg/server/service/udp" - "github.com/traefik/traefik/v2/pkg/udp" + "github.com/traefik/traefik/v3/pkg/config/runtime" + "github.com/traefik/traefik/v3/pkg/logs" + "github.com/traefik/traefik/v3/pkg/server/provider" + udpservice "github.com/traefik/traefik/v3/pkg/server/service/udp" + "github.com/traefik/traefik/v3/pkg/udp" ) // NewManager Creates a new Manager. diff --git a/pkg/server/router/udp/router_test.go b/pkg/server/router/udp/router_test.go index d29d7d2d6b..d6be074915 100644 --- a/pkg/server/router/udp/router_test.go +++ b/pkg/server/router/udp/router_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/config/runtime" - "github.com/traefik/traefik/v2/pkg/server/service/udp" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/runtime" + "github.com/traefik/traefik/v3/pkg/server/service/udp" ) func TestRuntimeConfiguration(t *testing.T) { diff --git a/pkg/server/routerfactory.go b/pkg/server/routerfactory.go index c3bf9fa748..d7a1bf68ce 100644 --- a/pkg/server/routerfactory.go +++ b/pkg/server/routerfactory.go @@ -4,20 +4,20 @@ import ( "context" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/config/runtime" - "github.com/traefik/traefik/v2/pkg/config/static" - "github.com/traefik/traefik/v2/pkg/metrics" - "github.com/traefik/traefik/v2/pkg/server/middleware" - tcpmiddleware "github.com/traefik/traefik/v2/pkg/server/middleware/tcp" - "github.com/traefik/traefik/v2/pkg/server/router" - tcprouter "github.com/traefik/traefik/v2/pkg/server/router/tcp" - udprouter "github.com/traefik/traefik/v2/pkg/server/router/udp" - "github.com/traefik/traefik/v2/pkg/server/service" - tcpsvc "github.com/traefik/traefik/v2/pkg/server/service/tcp" - udpsvc "github.com/traefik/traefik/v2/pkg/server/service/udp" - "github.com/traefik/traefik/v2/pkg/tcp" - "github.com/traefik/traefik/v2/pkg/tls" - "github.com/traefik/traefik/v2/pkg/udp" + "github.com/traefik/traefik/v3/pkg/config/runtime" + "github.com/traefik/traefik/v3/pkg/config/static" + "github.com/traefik/traefik/v3/pkg/metrics" + "github.com/traefik/traefik/v3/pkg/server/middleware" + tcpmiddleware "github.com/traefik/traefik/v3/pkg/server/middleware/tcp" + "github.com/traefik/traefik/v3/pkg/server/router" + tcprouter "github.com/traefik/traefik/v3/pkg/server/router/tcp" + udprouter "github.com/traefik/traefik/v3/pkg/server/router/udp" + "github.com/traefik/traefik/v3/pkg/server/service" + tcpsvc "github.com/traefik/traefik/v3/pkg/server/service/tcp" + udpsvc "github.com/traefik/traefik/v3/pkg/server/service/udp" + "github.com/traefik/traefik/v3/pkg/tcp" + "github.com/traefik/traefik/v3/pkg/tls" + "github.com/traefik/traefik/v3/pkg/udp" ) // RouterFactory the factory of TCP/UDP routers. diff --git a/pkg/server/routerfactory_test.go b/pkg/server/routerfactory_test.go index ef37c14ff4..b935df89ef 100644 --- a/pkg/server/routerfactory_test.go +++ b/pkg/server/routerfactory_test.go @@ -6,15 +6,15 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/config/runtime" - "github.com/traefik/traefik/v2/pkg/config/static" - "github.com/traefik/traefik/v2/pkg/metrics" - "github.com/traefik/traefik/v2/pkg/server/middleware" - "github.com/traefik/traefik/v2/pkg/server/service" - "github.com/traefik/traefik/v2/pkg/tcp" - th "github.com/traefik/traefik/v2/pkg/testhelpers" - "github.com/traefik/traefik/v2/pkg/tls" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/runtime" + "github.com/traefik/traefik/v3/pkg/config/static" + "github.com/traefik/traefik/v3/pkg/metrics" + "github.com/traefik/traefik/v3/pkg/server/middleware" + "github.com/traefik/traefik/v3/pkg/server/service" + "github.com/traefik/traefik/v3/pkg/tcp" + th "github.com/traefik/traefik/v3/pkg/testhelpers" + "github.com/traefik/traefik/v3/pkg/tls" ) func TestReuseService(t *testing.T) { diff --git a/pkg/server/server.go b/pkg/server/server.go index 962cf6c285..c17464621e 100644 --- a/pkg/server/server.go +++ b/pkg/server/server.go @@ -8,10 +8,10 @@ import ( "time" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/metrics" - "github.com/traefik/traefik/v2/pkg/middlewares/accesslog" - "github.com/traefik/traefik/v2/pkg/safe" - "github.com/traefik/traefik/v2/pkg/server/middleware" + "github.com/traefik/traefik/v3/pkg/metrics" + "github.com/traefik/traefik/v3/pkg/middlewares/accesslog" + "github.com/traefik/traefik/v3/pkg/safe" + "github.com/traefik/traefik/v3/pkg/server/middleware" ) // Server is the reverse-proxy/load-balancer engine. diff --git a/pkg/server/server_entrypoint_tcp.go b/pkg/server/server_entrypoint_tcp.go index 87c0a77efd..49a6bd4fc9 100644 --- a/pkg/server/server_entrypoint_tcp.go +++ b/pkg/server/server_entrypoint_tcp.go @@ -18,18 +18,18 @@ import ( "github.com/pires/go-proxyproto" "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/config/static" - "github.com/traefik/traefik/v2/pkg/ip" - "github.com/traefik/traefik/v2/pkg/logs" - "github.com/traefik/traefik/v2/pkg/middlewares" - "github.com/traefik/traefik/v2/pkg/middlewares/contenttype" - "github.com/traefik/traefik/v2/pkg/middlewares/forwardedheaders" - "github.com/traefik/traefik/v2/pkg/middlewares/requestdecorator" - "github.com/traefik/traefik/v2/pkg/safe" - "github.com/traefik/traefik/v2/pkg/server/router" - tcprouter "github.com/traefik/traefik/v2/pkg/server/router/tcp" - "github.com/traefik/traefik/v2/pkg/tcp" - "github.com/traefik/traefik/v2/pkg/types" + "github.com/traefik/traefik/v3/pkg/config/static" + "github.com/traefik/traefik/v3/pkg/ip" + "github.com/traefik/traefik/v3/pkg/logs" + "github.com/traefik/traefik/v3/pkg/middlewares" + "github.com/traefik/traefik/v3/pkg/middlewares/contenttype" + "github.com/traefik/traefik/v3/pkg/middlewares/forwardedheaders" + "github.com/traefik/traefik/v3/pkg/middlewares/requestdecorator" + "github.com/traefik/traefik/v3/pkg/safe" + "github.com/traefik/traefik/v3/pkg/server/router" + tcprouter "github.com/traefik/traefik/v3/pkg/server/router/tcp" + "github.com/traefik/traefik/v3/pkg/tcp" + "github.com/traefik/traefik/v3/pkg/types" "golang.org/x/net/http2" "golang.org/x/net/http2/h2c" ) diff --git a/pkg/server/server_entrypoint_tcp_http3.go b/pkg/server/server_entrypoint_tcp_http3.go index 99755d6d77..78d517e4b2 100644 --- a/pkg/server/server_entrypoint_tcp_http3.go +++ b/pkg/server/server_entrypoint_tcp_http3.go @@ -11,8 +11,8 @@ import ( "github.com/lucas-clemente/quic-go/http3" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/config/static" - tcprouter "github.com/traefik/traefik/v2/pkg/server/router/tcp" + "github.com/traefik/traefik/v3/pkg/config/static" + tcprouter "github.com/traefik/traefik/v3/pkg/server/router/tcp" ) type http3server struct { diff --git a/pkg/server/server_entrypoint_tcp_http3_test.go b/pkg/server/server_entrypoint_tcp_http3_test.go index 257ac3d726..b4f509f95a 100644 --- a/pkg/server/server_entrypoint_tcp_http3_test.go +++ b/pkg/server/server_entrypoint_tcp_http3_test.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/traefik/traefik/v2/pkg/config/static" - tcprouter "github.com/traefik/traefik/v2/pkg/server/router/tcp" - traefiktls "github.com/traefik/traefik/v2/pkg/tls" + "github.com/traefik/traefik/v3/pkg/config/static" + tcprouter "github.com/traefik/traefik/v3/pkg/server/router/tcp" + traefiktls "github.com/traefik/traefik/v3/pkg/tls" ) // LocalhostCert is a PEM-encoded TLS cert with SAN IPs diff --git a/pkg/server/server_entrypoint_tcp_test.go b/pkg/server/server_entrypoint_tcp_test.go index 342d7d9faf..8fb5f582cc 100644 --- a/pkg/server/server_entrypoint_tcp_test.go +++ b/pkg/server/server_entrypoint_tcp_test.go @@ -14,9 +14,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ptypes "github.com/traefik/paerser/types" - "github.com/traefik/traefik/v2/pkg/config/static" - tcprouter "github.com/traefik/traefik/v2/pkg/server/router/tcp" - "github.com/traefik/traefik/v2/pkg/tcp" + "github.com/traefik/traefik/v3/pkg/config/static" + tcprouter "github.com/traefik/traefik/v3/pkg/server/router/tcp" + "github.com/traefik/traefik/v3/pkg/tcp" ) func TestShutdownHijacked(t *testing.T) { diff --git a/pkg/server/server_entrypoint_udp.go b/pkg/server/server_entrypoint_udp.go index 1aa4c38c31..347b169db2 100644 --- a/pkg/server/server_entrypoint_udp.go +++ b/pkg/server/server_entrypoint_udp.go @@ -8,9 +8,9 @@ import ( "time" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/config/static" - "github.com/traefik/traefik/v2/pkg/logs" - "github.com/traefik/traefik/v2/pkg/udp" + "github.com/traefik/traefik/v3/pkg/config/static" + "github.com/traefik/traefik/v3/pkg/logs" + "github.com/traefik/traefik/v3/pkg/udp" ) // UDPEntryPoints maps UDP entry points by their names. diff --git a/pkg/server/server_entrypoint_udp_test.go b/pkg/server/server_entrypoint_udp_test.go index 0396f434fa..e5ac550862 100644 --- a/pkg/server/server_entrypoint_udp_test.go +++ b/pkg/server/server_entrypoint_udp_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/require" ptypes "github.com/traefik/paerser/types" - "github.com/traefik/traefik/v2/pkg/config/static" - "github.com/traefik/traefik/v2/pkg/udp" + "github.com/traefik/traefik/v3/pkg/config/static" + "github.com/traefik/traefik/v3/pkg/udp" ) func TestShutdownUDPConn(t *testing.T) { diff --git a/pkg/server/service/loadbalancer/failover/failover.go b/pkg/server/service/loadbalancer/failover/failover.go index 972d386727..07cf519684 100644 --- a/pkg/server/service/loadbalancer/failover/failover.go +++ b/pkg/server/service/loadbalancer/failover/failover.go @@ -7,7 +7,7 @@ import ( "sync" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/dynamic" ) // Failover is an http.Handler that can forward requests to the fallback handler diff --git a/pkg/server/service/loadbalancer/failover/failover_test.go b/pkg/server/service/loadbalancer/failover/failover_test.go index 9f8d382152..a2f7f89f04 100644 --- a/pkg/server/service/loadbalancer/failover/failover_test.go +++ b/pkg/server/service/loadbalancer/failover/failover_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/dynamic" ) type responseRecorder struct { diff --git a/pkg/server/service/loadbalancer/mirror/mirror.go b/pkg/server/service/loadbalancer/mirror/mirror.go index cb77b72808..201dade9a7 100644 --- a/pkg/server/service/loadbalancer/mirror/mirror.go +++ b/pkg/server/service/loadbalancer/mirror/mirror.go @@ -12,10 +12,10 @@ import ( "sync" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/healthcheck" - "github.com/traefik/traefik/v2/pkg/middlewares/accesslog" - "github.com/traefik/traefik/v2/pkg/safe" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/healthcheck" + "github.com/traefik/traefik/v3/pkg/middlewares/accesslog" + "github.com/traefik/traefik/v3/pkg/safe" ) // Mirroring is an http.Handler that can mirror requests. diff --git a/pkg/server/service/loadbalancer/mirror/mirror_test.go b/pkg/server/service/loadbalancer/mirror/mirror_test.go index eda49a9600..57d815f0f3 100644 --- a/pkg/server/service/loadbalancer/mirror/mirror_test.go +++ b/pkg/server/service/loadbalancer/mirror/mirror_test.go @@ -10,7 +10,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/traefik/traefik/v2/pkg/safe" + "github.com/traefik/traefik/v3/pkg/safe" ) const defaultMaxBodySize int64 = -1 diff --git a/pkg/server/service/loadbalancer/wrr/wrr.go b/pkg/server/service/loadbalancer/wrr/wrr.go index ed89dfb314..7442fa3a19 100644 --- a/pkg/server/service/loadbalancer/wrr/wrr.go +++ b/pkg/server/service/loadbalancer/wrr/wrr.go @@ -8,7 +8,7 @@ import ( "sync" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/dynamic" ) type namedHandler struct { diff --git a/pkg/server/service/loadbalancer/wrr/wrr_test.go b/pkg/server/service/loadbalancer/wrr/wrr_test.go index 7d6d6acad0..e0ca68c049 100644 --- a/pkg/server/service/loadbalancer/wrr/wrr_test.go +++ b/pkg/server/service/loadbalancer/wrr/wrr_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/dynamic" ) func TestBalancer(t *testing.T) { diff --git a/pkg/server/service/managerfactory.go b/pkg/server/service/managerfactory.go index 5db06ef40a..524ae01d9e 100644 --- a/pkg/server/service/managerfactory.go +++ b/pkg/server/service/managerfactory.go @@ -4,12 +4,12 @@ import ( "net/http" "github.com/gorilla/mux" - "github.com/traefik/traefik/v2/pkg/api" - "github.com/traefik/traefik/v2/pkg/api/dashboard" - "github.com/traefik/traefik/v2/pkg/config/runtime" - "github.com/traefik/traefik/v2/pkg/config/static" - "github.com/traefik/traefik/v2/pkg/metrics" - "github.com/traefik/traefik/v2/pkg/safe" + "github.com/traefik/traefik/v3/pkg/api" + "github.com/traefik/traefik/v3/pkg/api/dashboard" + "github.com/traefik/traefik/v3/pkg/config/runtime" + "github.com/traefik/traefik/v3/pkg/config/static" + "github.com/traefik/traefik/v3/pkg/metrics" + "github.com/traefik/traefik/v3/pkg/safe" ) // ManagerFactory a factory of service manager. diff --git a/pkg/server/service/proxy_test.go b/pkg/server/service/proxy_test.go index 8abc51cd2c..8bea51829b 100644 --- a/pkg/server/service/proxy_test.go +++ b/pkg/server/service/proxy_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/traefik/traefik/v2/pkg/testhelpers" + "github.com/traefik/traefik/v3/pkg/testhelpers" ) type staticTransport struct { diff --git a/pkg/server/service/roundtripper.go b/pkg/server/service/roundtripper.go index a4c01ef060..d7ab54c7a0 100644 --- a/pkg/server/service/roundtripper.go +++ b/pkg/server/service/roundtripper.go @@ -16,8 +16,8 @@ import ( "github.com/spiffe/go-spiffe/v2/spiffeid" "github.com/spiffe/go-spiffe/v2/spiffetls/tlsconfig" "github.com/spiffe/go-spiffe/v2/svid/x509svid" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - traefiktls "github.com/traefik/traefik/v2/pkg/tls" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + traefiktls "github.com/traefik/traefik/v3/pkg/tls" "golang.org/x/net/http2" ) diff --git a/pkg/server/service/roundtripper_test.go b/pkg/server/service/roundtripper_test.go index d11e2f6936..971604d927 100644 --- a/pkg/server/service/roundtripper_test.go +++ b/pkg/server/service/roundtripper_test.go @@ -21,8 +21,8 @@ import ( "github.com/spiffe/go-spiffe/v2/svid/x509svid" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - traefiktls "github.com/traefik/traefik/v2/pkg/tls" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + traefiktls "github.com/traefik/traefik/v3/pkg/tls" ) func Int32(i int32) *int32 { diff --git a/pkg/server/service/service.go b/pkg/server/service/service.go index d4295b9c6a..9883d79a29 100644 --- a/pkg/server/service/service.go +++ b/pkg/server/service/service.go @@ -14,19 +14,19 @@ import ( "time" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/config/runtime" - "github.com/traefik/traefik/v2/pkg/healthcheck" - "github.com/traefik/traefik/v2/pkg/logs" - "github.com/traefik/traefik/v2/pkg/metrics" - "github.com/traefik/traefik/v2/pkg/middlewares/accesslog" - metricsMiddle "github.com/traefik/traefik/v2/pkg/middlewares/metrics" - "github.com/traefik/traefik/v2/pkg/safe" - "github.com/traefik/traefik/v2/pkg/server/cookie" - "github.com/traefik/traefik/v2/pkg/server/provider" - "github.com/traefik/traefik/v2/pkg/server/service/loadbalancer/failover" - "github.com/traefik/traefik/v2/pkg/server/service/loadbalancer/mirror" - "github.com/traefik/traefik/v2/pkg/server/service/loadbalancer/wrr" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/runtime" + "github.com/traefik/traefik/v3/pkg/healthcheck" + "github.com/traefik/traefik/v3/pkg/logs" + "github.com/traefik/traefik/v3/pkg/metrics" + "github.com/traefik/traefik/v3/pkg/middlewares/accesslog" + metricsMiddle "github.com/traefik/traefik/v3/pkg/middlewares/metrics" + "github.com/traefik/traefik/v3/pkg/safe" + "github.com/traefik/traefik/v3/pkg/server/cookie" + "github.com/traefik/traefik/v3/pkg/server/provider" + "github.com/traefik/traefik/v3/pkg/server/service/loadbalancer/failover" + "github.com/traefik/traefik/v3/pkg/server/service/loadbalancer/mirror" + "github.com/traefik/traefik/v3/pkg/server/service/loadbalancer/wrr" ) const defaultMaxBodySize int64 = -1 diff --git a/pkg/server/service/service_test.go b/pkg/server/service/service_test.go index 36501caceb..10a6f6779b 100644 --- a/pkg/server/service/service_test.go +++ b/pkg/server/service/service_test.go @@ -9,10 +9,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/config/runtime" - "github.com/traefik/traefik/v2/pkg/server/provider" - "github.com/traefik/traefik/v2/pkg/testhelpers" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/runtime" + "github.com/traefik/traefik/v3/pkg/server/provider" + "github.com/traefik/traefik/v3/pkg/testhelpers" ) func TestGetLoadBalancer(t *testing.T) { diff --git a/pkg/server/service/smart_roundtripper.go b/pkg/server/service/smart_roundtripper.go index 5643e60edf..3b88b499a1 100644 --- a/pkg/server/service/smart_roundtripper.go +++ b/pkg/server/service/smart_roundtripper.go @@ -6,7 +6,7 @@ import ( "net/http" "time" - "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/dynamic" "golang.org/x/net/http/httpguts" "golang.org/x/net/http2" ) diff --git a/pkg/server/service/tcp/service.go b/pkg/server/service/tcp/service.go index 01f05094ae..bbc19b8cdc 100644 --- a/pkg/server/service/tcp/service.go +++ b/pkg/server/service/tcp/service.go @@ -9,10 +9,10 @@ import ( "time" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/config/runtime" - "github.com/traefik/traefik/v2/pkg/logs" - "github.com/traefik/traefik/v2/pkg/server/provider" - "github.com/traefik/traefik/v2/pkg/tcp" + "github.com/traefik/traefik/v3/pkg/config/runtime" + "github.com/traefik/traefik/v3/pkg/logs" + "github.com/traefik/traefik/v3/pkg/server/provider" + "github.com/traefik/traefik/v3/pkg/tcp" ) // Manager is the TCPHandlers factory. diff --git a/pkg/server/service/tcp/service_test.go b/pkg/server/service/tcp/service_test.go index c4da906092..cb94becb4b 100644 --- a/pkg/server/service/tcp/service_test.go +++ b/pkg/server/service/tcp/service_test.go @@ -6,10 +6,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/config/runtime" - "github.com/traefik/traefik/v2/pkg/server/provider" - "github.com/traefik/traefik/v2/pkg/tcp" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/runtime" + "github.com/traefik/traefik/v3/pkg/server/provider" + "github.com/traefik/traefik/v3/pkg/tcp" ) func TestManager_BuildTCP(t *testing.T) { diff --git a/pkg/server/service/udp/service.go b/pkg/server/service/udp/service.go index 7d15c19ff6..1772c19543 100644 --- a/pkg/server/service/udp/service.go +++ b/pkg/server/service/udp/service.go @@ -9,10 +9,10 @@ import ( "time" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/config/runtime" - "github.com/traefik/traefik/v2/pkg/logs" - "github.com/traefik/traefik/v2/pkg/server/provider" - "github.com/traefik/traefik/v2/pkg/udp" + "github.com/traefik/traefik/v3/pkg/config/runtime" + "github.com/traefik/traefik/v3/pkg/logs" + "github.com/traefik/traefik/v3/pkg/server/provider" + "github.com/traefik/traefik/v3/pkg/udp" ) // Manager handles UDP services creation. diff --git a/pkg/server/service/udp/service_test.go b/pkg/server/service/udp/service_test.go index 335a13a24a..6517c66a14 100644 --- a/pkg/server/service/udp/service_test.go +++ b/pkg/server/service/udp/service_test.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - "github.com/traefik/traefik/v2/pkg/config/runtime" - "github.com/traefik/traefik/v2/pkg/server/provider" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/runtime" + "github.com/traefik/traefik/v3/pkg/server/provider" ) func TestManager_BuildUDP(t *testing.T) { diff --git a/pkg/tcp/dialer.go b/pkg/tcp/dialer.go index ce812db857..267d1b05ba 100644 --- a/pkg/tcp/dialer.go +++ b/pkg/tcp/dialer.go @@ -14,8 +14,8 @@ import ( "github.com/spiffe/go-spiffe/v2/spiffeid" "github.com/spiffe/go-spiffe/v2/spiffetls/tlsconfig" "github.com/spiffe/go-spiffe/v2/svid/x509svid" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - traefiktls "github.com/traefik/traefik/v2/pkg/tls" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + traefiktls "github.com/traefik/traefik/v3/pkg/tls" "golang.org/x/net/proxy" ) diff --git a/pkg/tcp/dialer_test.go b/pkg/tcp/dialer_test.go index b94c058261..603f012b59 100644 --- a/pkg/tcp/dialer_test.go +++ b/pkg/tcp/dialer_test.go @@ -20,8 +20,8 @@ import ( "github.com/spiffe/go-spiffe/v2/svid/x509svid" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/traefik/traefik/v2/pkg/config/dynamic" - traefiktls "github.com/traefik/traefik/v2/pkg/tls" + "github.com/traefik/traefik/v3/pkg/config/dynamic" + traefiktls "github.com/traefik/traefik/v3/pkg/tls" ) // LocalhostCert is a PEM-encoded TLS cert diff --git a/pkg/tcp/proxy.go b/pkg/tcp/proxy.go index 7a32b713d2..b5dc96c693 100644 --- a/pkg/tcp/proxy.go +++ b/pkg/tcp/proxy.go @@ -10,7 +10,7 @@ import ( "github.com/pires/go-proxyproto" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/dynamic" ) // Proxy forwards a TCP request to a TCP service. diff --git a/pkg/tcp/proxy_test.go b/pkg/tcp/proxy_test.go index ec51df83d6..21176300c7 100644 --- a/pkg/tcp/proxy_test.go +++ b/pkg/tcp/proxy_test.go @@ -11,7 +11,7 @@ import ( "github.com/pires/go-proxyproto" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/dynamic" ) func fakeRedis(t *testing.T, listener net.Listener) { diff --git a/pkg/tcp/switcher.go b/pkg/tcp/switcher.go index 557f663a16..0b62bab8c2 100644 --- a/pkg/tcp/switcher.go +++ b/pkg/tcp/switcher.go @@ -1,7 +1,7 @@ package tcp import ( - "github.com/traefik/traefik/v2/pkg/safe" + "github.com/traefik/traefik/v3/pkg/safe" ) // HandlerSwitcher is a TCP handler switcher. diff --git a/pkg/testhelpers/config.go b/pkg/testhelpers/config.go index ab810e4f0d..3f379f6bd0 100644 --- a/pkg/testhelpers/config.go +++ b/pkg/testhelpers/config.go @@ -1,7 +1,7 @@ package testhelpers import ( - "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v3/pkg/config/dynamic" ) // BuildConfiguration is a helper to create a configuration. diff --git a/pkg/tls/certificate_store.go b/pkg/tls/certificate_store.go index 353efc95c4..20bdb317d6 100644 --- a/pkg/tls/certificate_store.go +++ b/pkg/tls/certificate_store.go @@ -10,7 +10,7 @@ import ( "github.com/patrickmn/go-cache" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/safe" + "github.com/traefik/traefik/v3/pkg/safe" ) // CertificateStore store for dynamic certificates. diff --git a/pkg/tls/certificate_store_test.go b/pkg/tls/certificate_store_test.go index a80516142b..cd08af2c53 100644 --- a/pkg/tls/certificate_store_test.go +++ b/pkg/tls/certificate_store_test.go @@ -10,7 +10,7 @@ import ( "github.com/patrickmn/go-cache" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/traefik/traefik/v2/pkg/safe" + "github.com/traefik/traefik/v3/pkg/safe" ) func TestGetBestCertificate(t *testing.T) { diff --git a/pkg/tls/tls.go b/pkg/tls/tls.go index fc97e265d0..93a9cab36e 100644 --- a/pkg/tls/tls.go +++ b/pkg/tls/tls.go @@ -1,6 +1,6 @@ package tls -import "github.com/traefik/traefik/v2/pkg/types" +import "github.com/traefik/traefik/v3/pkg/types" const certificateHeader = "-----BEGIN CERTIFICATE-----\n" diff --git a/pkg/tls/tlsmanager.go b/pkg/tls/tlsmanager.go index 2fd249a87b..cc24dea0f1 100644 --- a/pkg/tls/tlsmanager.go +++ b/pkg/tls/tlsmanager.go @@ -12,9 +12,9 @@ import ( "github.com/go-acme/lego/v4/challenge/dns01" "github.com/go-acme/lego/v4/challenge/tlsalpn01" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/logs" - "github.com/traefik/traefik/v2/pkg/tls/generate" - "github.com/traefik/traefik/v2/pkg/types" + "github.com/traefik/traefik/v3/pkg/logs" + "github.com/traefik/traefik/v3/pkg/tls/generate" + "github.com/traefik/traefik/v3/pkg/types" ) const ( diff --git a/pkg/tls/zz_generated.deepcopy.go b/pkg/tls/zz_generated.deepcopy.go index 95438c4683..6523c97b1d 100644 --- a/pkg/tls/zz_generated.deepcopy.go +++ b/pkg/tls/zz_generated.deepcopy.go @@ -30,7 +30,7 @@ THE SOFTWARE. package tls import ( - types "github.com/traefik/traefik/v2/pkg/types" + types "github.com/traefik/traefik/v3/pkg/types" ) // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. diff --git a/pkg/tracing/datadog/datadog.go b/pkg/tracing/datadog/datadog.go index 1e9969e371..be5c7c6ea9 100644 --- a/pkg/tracing/datadog/datadog.go +++ b/pkg/tracing/datadog/datadog.go @@ -7,7 +7,7 @@ import ( "github.com/opentracing/opentracing-go" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/logs" + "github.com/traefik/traefik/v3/pkg/logs" ddtracer "gopkg.in/DataDog/dd-trace-go.v1/ddtrace/opentracer" datadog "gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer" ) diff --git a/pkg/tracing/elastic/elastic.go b/pkg/tracing/elastic/elastic.go index 967f5fcb03..383cca2bdb 100644 --- a/pkg/tracing/elastic/elastic.go +++ b/pkg/tracing/elastic/elastic.go @@ -6,8 +6,8 @@ import ( "github.com/opentracing/opentracing-go" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/logs" - "github.com/traefik/traefik/v2/pkg/version" + "github.com/traefik/traefik/v3/pkg/logs" + "github.com/traefik/traefik/v3/pkg/version" "go.elastic.co/apm" "go.elastic.co/apm/module/apmot" "go.elastic.co/apm/transport" diff --git a/pkg/tracing/haystack/haystack.go b/pkg/tracing/haystack/haystack.go index 9c64dd36be..6e460dcfb1 100644 --- a/pkg/tracing/haystack/haystack.go +++ b/pkg/tracing/haystack/haystack.go @@ -8,7 +8,7 @@ import ( "github.com/ExpediaDotCom/haystack-client-go" "github.com/opentracing/opentracing-go" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/logs" + "github.com/traefik/traefik/v3/pkg/logs" ) // Name sets the name of this tracer. diff --git a/pkg/tracing/instana/instana.go b/pkg/tracing/instana/instana.go index 39c664468f..edb2ee14e5 100644 --- a/pkg/tracing/instana/instana.go +++ b/pkg/tracing/instana/instana.go @@ -6,7 +6,7 @@ import ( instana "github.com/instana/go-sensor" "github.com/opentracing/opentracing-go" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/logs" + "github.com/traefik/traefik/v3/pkg/logs" ) // Name sets the name of this tracer. diff --git a/pkg/tracing/jaeger/jaeger.go b/pkg/tracing/jaeger/jaeger.go index 206c206de1..64eeb8e180 100644 --- a/pkg/tracing/jaeger/jaeger.go +++ b/pkg/tracing/jaeger/jaeger.go @@ -6,7 +6,7 @@ import ( "github.com/opentracing/opentracing-go" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/logs" + "github.com/traefik/traefik/v3/pkg/logs" jaegercli "github.com/uber/jaeger-client-go" jaegercfg "github.com/uber/jaeger-client-go/config" "github.com/uber/jaeger-client-go/zipkin" diff --git a/pkg/tracing/opentelemetry/opentelemetry.go b/pkg/tracing/opentelemetry/opentelemetry.go index 6c568b0507..af12c67a36 100644 --- a/pkg/tracing/opentelemetry/opentelemetry.go +++ b/pkg/tracing/opentelemetry/opentelemetry.go @@ -8,8 +8,8 @@ import ( "github.com/opentracing/opentracing-go" "github.com/rs/zerolog/log" - "github.com/traefik/traefik/v2/pkg/types" - "github.com/traefik/traefik/v2/pkg/version" + "github.com/traefik/traefik/v3/pkg/types" + "github.com/traefik/traefik/v3/pkg/version" "go.opentelemetry.io/otel" oteltracer "go.opentelemetry.io/otel/bridge/opentracing" "go.opentelemetry.io/otel/exporters/otlp/otlptrace" diff --git a/pkg/tracing/opentelemetry/opentelemetry_test.go b/pkg/tracing/opentelemetry/opentelemetry_test.go index 9921586eec..40fcca1592 100644 --- a/pkg/tracing/opentelemetry/opentelemetry_test.go +++ b/pkg/tracing/opentelemetry/opentelemetry_test.go @@ -13,8 +13,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - mtracing "github.com/traefik/traefik/v2/pkg/middlewares/tracing" - "github.com/traefik/traefik/v2/pkg/tracing" + mtracing "github.com/traefik/traefik/v3/pkg/middlewares/tracing" + "github.com/traefik/traefik/v3/pkg/tracing" "go.opentelemetry.io/collector/pdata/ptrace/ptraceotlp" ) diff --git a/pkg/udp/switcher.go b/pkg/udp/switcher.go index d198a35878..bb596be04c 100644 --- a/pkg/udp/switcher.go +++ b/pkg/udp/switcher.go @@ -1,7 +1,7 @@ package udp import ( - "github.com/traefik/traefik/v2/pkg/safe" + "github.com/traefik/traefik/v3/pkg/safe" ) // HandlerSwitcher is a switcher implementation of the Handler interface. diff --git a/script/binary b/script/binary index 3a3e94b614..c1de7c9bbe 100755 --- a/script/binary +++ b/script/binary @@ -24,7 +24,7 @@ fi # shellcheck disable=SC2086 # shellcheck disable=SC2048 CGO_ENABLED=0 GOGC=off go build ${FLAGS[*]} -ldflags "-s -w \ - -X github.com/traefik/traefik/v2/pkg/version.Version=$VERSION \ - -X github.com/traefik/traefik/v2/pkg/version.Codename=$CODENAME \ - -X github.com/traefik/traefik/v2/pkg/version.BuildDate=$DATE" \ + -X github.com/traefik/traefik/v3/pkg/version.Version=$VERSION \ + -X github.com/traefik/traefik/v3/pkg/version.Codename=$CODENAME \ + -X github.com/traefik/traefik/v3/pkg/version.BuildDate=$DATE" \ -installsuffix nocgo -o dist/traefik ./cmd/traefik diff --git a/script/code-gen.sh b/script/code-gen.sh index de705c8148..6d3ca09a23 100755 --- a/script/code-gen.sh +++ b/script/code-gen.sh @@ -4,7 +4,7 @@ set -e -o pipefail PROJECT_MODULE="github.com/traefik/traefik" -MODULE_VERSION="v2" +MODULE_VERSION="v3" IMAGE_NAME="kubernetes-codegen:latest" CURRENT_DIR="$(pwd)"