From c0f1e74bed9815b0c18059daffb31c14b1972817 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Doumenjou Date: Wed, 16 Sep 2020 15:46:04 +0200 Subject: [PATCH] chore: move to Traefik organization. Co-authored-by: Romain --- .github/CODEOWNERS | 24 - .goreleaser.yml | 2 +- .semaphoreci/setup.sh | 6 +- .semaphoreci/vars | 2 +- .travis.yml | 12 +- .travis/traefiker_rsa.enc | Bin 1680 -> 3392 bytes CHANGELOG.md | 7994 ++++++++--------- LICENSE.md | 2 +- Makefile | 4 +- README.md | 10 +- build.Dockerfile | 4 +- cmd/configuration.go | 2 +- cmd/healthcheck/healthcheck.go | 2 +- cmd/traefik/plugins.go | 4 +- cmd/traefik/traefik.go | 48 +- cmd/version/version.go | 2 +- docs/content/contributing/advocating.md | 2 +- docs/content/contributing/building-testing.md | 14 +- docs/content/contributing/data-collection.md | 4 +- docs/content/contributing/documentation.md | 4 +- docs/content/contributing/maintainers.md | 8 +- .../content/contributing/submitting-issues.md | 4 +- .../contributing/submitting-pull-requests.md | 2 +- docs/content/contributing/thank-you.md | 4 +- .../getting-started/install-traefik.md | 10 +- docs/content/getting-started/quick-start.md | 2 +- docs/content/index.md | 2 +- docs/content/middlewares/overview.md | 2 +- docs/content/migration/v1-to-v2.md | 2 +- docs/content/plugins/overview.md | 4 +- docs/content/plugins/using-plugins.md | 48 +- docs/content/providers/docker.md | 2 +- docs/content/providers/kubernetes-ingress.md | 2 +- docs/content/providers/marathon.md | 2 +- .../reference/static-configuration/cli-ref.md | 6 +- .../reference/static-configuration/env-ref.md | 6 +- .../routing/providers/kubernetes-crd.md | 54 +- .../routing/providers/kubernetes-ingress.md | 12 +- .../user-guides/crd-acme/03-deployments.yml | 2 +- docs/content/user-guides/crd-acme/index.md | 2 +- .../acme-dns/docker-compose.yml | 2 +- .../acme-dns/docker-compose_secrets.yml | 2 +- .../acme-http/docker-compose.yml | 2 +- .../acme-tls/docker-compose.yml | 2 +- .../basic-example/docker-compose.yml | 2 +- .../docker-compose/basic-example/index.md | 2 +- docs/content/user-guides/marathon.md | 4 +- docs/mkdocs.yml | 4 +- docs/scripts/verify.sh | 2 +- docs/theme/main.html | 2 +- ...ainous-header.html => company-header.html} | 2 +- exp.Dockerfile | 10 +- go.mod | 4 +- go.sum | 4 +- integration/access_log_test.go | 6 +- integration/acme_test.go | 10 +- integration/consul_catalog_test.go | 2 +- integration/consul_test.go | 4 +- integration/docker_compose_test.go | 6 +- integration/docker_test.go | 8 +- integration/error_pages_test.go | 2 +- integration/etcd_test.go | 4 +- integration/fake_dns_server.go | 2 +- integration/file_test.go | 2 +- integration/fixtures/k8s/02-services.yml | 38 +- integration/grpc_test.go | 6 +- 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 | 6 +- integration/keepalive_test.go | 2 +- integration/log_rotation_test.go | 2 +- integration/marathon15_test.go | 6 +- integration/marathon_test.go | 6 +- integration/proxy_protocol_test.go | 2 +- integration/ratelimit_test.go | 2 +- integration/redis_test.go | 4 +- integration/resources/compose/access_log.yml | 18 +- integration/resources/compose/base.yml | 4 +- .../resources/compose/consul_catalog.yml | 8 +- integration/resources/compose/file.yml | 10 +- integration/resources/compose/healthcheck.yml | 4 +- .../resources/compose/hostresolver.yml | 2 +- integration/resources/compose/minimal.yml | 2 +- .../resources/compose/proxy-protocol.yml | 2 +- integration/resources/compose/ratelimit.yml | 2 +- .../resources/compose/reqacceptgrace.yml | 2 +- integration/resources/compose/rest.yml | 2 +- integration/resources/compose/retry.yml | 2 +- integration/resources/compose/stats.yml | 4 +- integration/resources/compose/tcp.yml | 12 +- .../resources/compose/tlsclientheaders.yml | 2 +- integration/resources/compose/tracing.yml | 2 +- integration/resources/compose/udp.yml | 8 +- integration/resources/compose/whitelist.yml | 8 +- 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/try/try.go | 2 +- integration/udp_test.go | 2 +- integration/websocket_test.go | 2 +- integration/zk_test.go | 4 +- internal/gendoc.go | 4 +- pkg/anonymize/anonymize_config_test.go | 28 +- pkg/api/dashboard.go | 2 +- pkg/api/handler.go | 8 +- pkg/api/handler_entrypoint.go | 4 +- 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 | 6 +- pkg/api/handler_overview_test.go | 24 +- pkg/api/handler_tcp.go | 4 +- pkg/api/handler_tcp_test.go | 6 +- pkg/api/handler_test.go | 6 +- pkg/api/handler_udp.go | 4 +- pkg/api/handler_udp_test.go | 6 +- pkg/cli/loader_env.go | 2 +- pkg/cli/loader_file.go | 2 +- pkg/cli/loader_flag.go | 2 +- pkg/collector/collector.go | 8 +- pkg/config/dynamic/config.go | 2 +- pkg/config/dynamic/http_config.go | 2 +- pkg/config/dynamic/middlewares.go | 2 +- pkg/config/dynamic/tcp_config.go | 2 +- pkg/config/dynamic/zz_generated.deepcopy.go | 6 +- pkg/config/label/label.go | 2 +- pkg/config/label/label_test.go | 2 +- 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/static_config.go | 50 +- pkg/healthcheck/healthcheck.go | 6 +- pkg/healthcheck/healthcheck_test.go | 4 +- pkg/metrics/datadog.go | 6 +- pkg/metrics/datadog_test.go | 2 +- pkg/metrics/influxdb.go | 6 +- pkg/metrics/influxdb_test.go | 2 +- pkg/metrics/prometheus.go | 8 +- pkg/metrics/prometheus_test.go | 6 +- pkg/metrics/statsd.go | 6 +- pkg/metrics/statsd_test.go | 2 +- .../accesslog/capture_response_writer.go | 2 +- pkg/middlewares/accesslog/logger.go | 4 +- pkg/middlewares/accesslog/logger_test.go | 2 +- pkg/middlewares/addprefix/add_prefix.go | 8 +- pkg/middlewares/addprefix/add_prefix_test.go | 4 +- pkg/middlewares/auth/basic_auth.go | 10 +- pkg/middlewares/auth/basic_auth_test.go | 4 +- pkg/middlewares/auth/digest_auth.go | 10 +- 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/chain/chain.go | 6 +- .../circuitbreaker/circuit_breaker.go | 8 +- pkg/middlewares/compress/compress.go | 8 +- pkg/middlewares/compress/compress_test.go | 4 +- pkg/middlewares/customerrors/custom_errors.go | 10 +- .../customerrors/custom_errors_test.go | 4 +- .../empty_backend_handler.go | 2 +- .../empty_backend_handler_test.go | 2 +- pkg/middlewares/extractor.go | 4 +- .../forwardedheaders/forwarded_header.go | 2 +- pkg/middlewares/handler_switcher.go | 2 +- pkg/middlewares/headers/header.go | 4 +- pkg/middlewares/headers/header_test.go | 2 +- pkg/middlewares/headers/headers.go | 8 +- pkg/middlewares/headers/headers_test.go | 4 +- pkg/middlewares/headers/responsewriter.go | 2 +- pkg/middlewares/headers/secure.go | 2 +- pkg/middlewares/headers/secure_test.go | 2 +- pkg/middlewares/inflightreq/inflight_req.go | 8 +- pkg/middlewares/ipwhitelist/ip_whitelist.go | 10 +- .../ipwhitelist/ip_whitelist_test.go | 2 +- pkg/middlewares/metrics/metrics.go | 10 +- pkg/middlewares/middleware.go | 2 +- .../passtlsclientcert/pass_tls_client_cert.go | 8 +- .../pass_tls_client_cert_test.go | 4 +- pkg/middlewares/pipelining/pipelining.go | 4 +- pkg/middlewares/ratelimiter/rate_limiter.go | 8 +- .../ratelimiter/rate_limiter_test.go | 4 +- pkg/middlewares/recovery/recovery.go | 4 +- pkg/middlewares/redirect/redirect.go | 2 +- pkg/middlewares/redirect/redirect_regex.go | 6 +- .../redirect/redirect_regex_test.go | 4 +- pkg/middlewares/redirect/redirect_scheme.go | 6 +- .../redirect/redirect_scheme_test.go | 2 +- pkg/middlewares/replacepath/replace_path.go | 8 +- .../replacepath/replace_path_test.go | 2 +- .../replacepathregex/replace_path_regex.go | 10 +- .../replace_path_regex_test.go | 4 +- .../requestdecorator/hostresolver.go | 2 +- .../requestdecorator/request_decorator.go | 2 +- .../request_decorator_test.go | 4 +- pkg/middlewares/retry/retry.go | 10 +- pkg/middlewares/retry/retry_test.go | 6 +- pkg/middlewares/stripprefix/strip_prefix.go | 8 +- .../stripprefix/strip_prefix_test.go | 4 +- .../stripprefixregex/strip_prefix_regex.go | 10 +- .../strip_prefix_regex_test.go | 6 +- pkg/middlewares/tracing/entrypoint.go | 6 +- 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/pilot/pilot.go | 10 +- pkg/pilot/pilot_test.go | 6 +- pkg/plugins/builder.go | 4 +- pkg/plugins/plugins.go | 2 +- pkg/provider/acme/account.go | 2 +- pkg/provider/acme/challenge_http.go | 4 +- pkg/provider/acme/challenge_tls.go | 4 +- pkg/provider/acme/local_store.go | 4 +- pkg/provider/acme/provider.go | 14 +- pkg/provider/acme/provider_test.go | 4 +- pkg/provider/aggregator/aggregator.go | 12 +- pkg/provider/configuration.go | 4 +- pkg/provider/consulcatalog/config.go | 10 +- pkg/provider/consulcatalog/config_test.go | 2 +- 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 | 16 +- pkg/provider/docker/label.go | 2 +- pkg/provider/ecs/config.go | 10 +- 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/kubernetes/crd/client.go | 8 +- .../kubernetes/crd/client_mock_test.go | 4 +- .../kubernetes/crd/fixtures/services.yml | 8 +- .../kubernetes/crd/fixtures/tcp/services.yml | 8 +- .../kubernetes/crd/fixtures/udp/services.yml | 6 +- .../crd/fixtures/with_mirroring.yml | 4 +- .../crd/fixtures/with_mirroring2.yml | 4 +- .../crd/fixtures/with_namespaces.yml | 6 +- .../crd/fixtures/with_services_lb0.yml | 2 +- .../crd/fixtures/with_services_lb1.yml | 8 +- .../crd/fixtures/with_services_lb2.yml | 2 +- .../crd/fixtures/with_services_lb3.yml | 4 +- .../crd/fixtures/with_services_only.yml | 2 +- .../clientset/versioned/clientset.go | 4 +- .../crd/generated/clientset/versioned/doc.go | 2 +- .../versioned/fake/clientset_generated.go | 8 +- .../generated/clientset/versioned/fake/doc.go | 2 +- .../clientset/versioned/fake/register.go | 18 +- .../clientset/versioned/scheme/doc.go | 2 +- .../clientset/versioned/scheme/register.go | 18 +- .../versioned/typed/traefik/v1alpha1/doc.go | 2 +- .../typed/traefik/v1alpha1/fake/doc.go | 2 +- .../v1alpha1/fake/fake_ingressroute.go | 5 +- .../v1alpha1/fake/fake_ingressroutetcp.go | 5 +- .../v1alpha1/fake/fake_ingressrouteudp.go | 5 +- .../traefik/v1alpha1/fake/fake_middleware.go | 5 +- .../traefik/v1alpha1/fake/fake_tlsoption.go | 5 +- .../traefik/v1alpha1/fake/fake_tlsstore.go | 5 +- .../v1alpha1/fake/fake_traefik_client.go | 4 +- .../v1alpha1/fake/fake_traefikservice.go | 5 +- .../traefik/v1alpha1/generated_expansion.go | 2 +- .../typed/traefik/v1alpha1/ingressroute.go | 6 +- .../typed/traefik/v1alpha1/ingressroutetcp.go | 6 +- .../typed/traefik/v1alpha1/ingressrouteudp.go | 6 +- .../typed/traefik/v1alpha1/middleware.go | 6 +- .../typed/traefik/v1alpha1/tlsoption.go | 6 +- .../typed/traefik/v1alpha1/tlsstore.go | 6 +- .../typed/traefik/v1alpha1/traefik_client.go | 6 +- .../typed/traefik/v1alpha1/traefikservice.go | 6 +- .../informers/externalversions/factory.go | 8 +- .../informers/externalversions/generic.go | 4 +- .../internalinterfaces/factory_interfaces.go | 4 +- .../externalversions/traefik/interface.go | 6 +- .../traefik/v1alpha1/ingressroute.go | 10 +- .../traefik/v1alpha1/ingressroutetcp.go | 10 +- .../traefik/v1alpha1/ingressrouteudp.go | 10 +- .../traefik/v1alpha1/interface.go | 4 +- .../traefik/v1alpha1/middleware.go | 10 +- .../traefik/v1alpha1/tlsoption.go | 10 +- .../traefik/v1alpha1/tlsstore.go | 10 +- .../traefik/v1alpha1/traefikservice.go | 10 +- .../traefik/v1alpha1/expansion_generated.go | 2 +- .../listers/traefik/v1alpha1/ingressroute.go | 4 +- .../traefik/v1alpha1/ingressroutetcp.go | 4 +- .../traefik/v1alpha1/ingressrouteudp.go | 4 +- .../listers/traefik/v1alpha1/middleware.go | 4 +- .../listers/traefik/v1alpha1/tlsoption.go | 4 +- .../listers/traefik/v1alpha1/tlsstore.go | 4 +- .../traefik/v1alpha1/traefikservice.go | 4 +- pkg/provider/kubernetes/crd/kubernetes.go | 14 +- .../kubernetes/crd/kubernetes_http.go | 10 +- pkg/provider/kubernetes/crd/kubernetes_tcp.go | 8 +- .../kubernetes/crd/kubernetes_test.go | 6 +- pkg/provider/kubernetes/crd/kubernetes_udp.go | 6 +- .../crd/traefik/v1alpha1/ingressroute.go | 4 +- .../crd/traefik/v1alpha1/ingressroutetcp.go | 2 +- .../crd/traefik/v1alpha1/middleware.go | 2 +- .../crd/traefik/v1alpha1/service.go | 2 +- .../traefik/v1alpha1/zz_generated.deepcopy.go | 6 +- .../kubernetes/ingress/annotations.go | 4 +- .../kubernetes/ingress/annotations_test.go | 4 +- pkg/provider/kubernetes/ingress/client.go | 2 +- .../kubernetes/ingress/client_mock_test.go | 2 +- pkg/provider/kubernetes/ingress/kubernetes.go | 12 +- .../kubernetes/ingress/kubernetes_test.go | 8 +- pkg/provider/kubernetes/k8s/parser.go | 2 +- pkg/provider/kv/consul/consul.go | 4 +- pkg/provider/kv/etcd/etcd.go | 4 +- pkg/provider/kv/kv.go | 12 +- pkg/provider/kv/kv_test.go | 6 +- pkg/provider/kv/redis/redis.go | 4 +- pkg/provider/kv/storewrapper.go | 2 +- pkg/provider/kv/zk/zk.go | 4 +- pkg/provider/marathon/config.go | 10 +- pkg/provider/marathon/config_test.go | 2 +- pkg/provider/marathon/fake_client_test.go | 2 +- pkg/provider/marathon/label.go | 2 +- pkg/provider/marathon/marathon.go | 12 +- pkg/provider/marathon/readiness.go | 2 +- pkg/provider/provider.go | 4 +- pkg/provider/rancher/config.go | 10 +- pkg/provider/rancher/config_test.go | 2 +- pkg/provider/rancher/label.go | 2 +- pkg/provider/rancher/rancher.go | 10 +- pkg/provider/rest/rest.go | 8 +- pkg/provider/traefik/internal.go | 12 +- pkg/provider/traefik/internal_test.go | 8 +- pkg/rules/rules.go | 4 +- pkg/rules/rules_test.go | 4 +- pkg/safe/routine.go | 2 +- pkg/server/aggregator.go | 8 +- pkg/server/aggregator_test.go | 4 +- pkg/server/configurationwatcher.go | 8 +- pkg/server/configurationwatcher_test.go | 8 +- pkg/server/cookie/cookie.go | 2 +- pkg/server/cookie/cookie_test.go | 12 +- pkg/server/middleware/chainbuilder.go | 18 +- pkg/server/middleware/middlewares.go | 42 +- pkg/server/middleware/middlewares_test.go | 6 +- pkg/server/middleware/plugins.go | 4 +- pkg/server/provider/provider.go | 2 +- pkg/server/router/router.go | 16 +- pkg/server/router/router_test.go | 18 +- pkg/server/router/tcp/router.go | 14 +- pkg/server/router/tcp/router_test.go | 8 +- pkg/server/router/udp/router.go | 10 +- pkg/server/router/udp/router_test.go | 6 +- pkg/server/routerfactory.go | 26 +- pkg/server/routerfactory_test.go | 16 +- pkg/server/server.go | 10 +- pkg/server/server_entrypoint_tcp.go | 16 +- pkg/server/server_entrypoint_tcp_test.go | 4 +- pkg/server/server_entrypoint_udp.go | 6 +- pkg/server/server_entrypoint_udp_test.go | 4 +- pkg/server/server_signals.go | 2 +- pkg/server/service/internalhandler.go | 2 +- .../service/loadbalancer/mirror/mirror.go | 6 +- .../loadbalancer/mirror/mirror_test.go | 2 +- pkg/server/service/loadbalancer/wrr/wrr.go | 4 +- .../service/loadbalancer/wrr/wrr_test.go | 2 +- pkg/server/service/managerfactory.go | 10 +- pkg/server/service/proxy.go | 4 +- pkg/server/service/proxy_test.go | 2 +- pkg/server/service/roundtripper.go | 6 +- pkg/server/service/service.go | 28 +- pkg/server/service/service_test.go | 8 +- pkg/server/service/tcp/service.go | 8 +- pkg/server/service/tcp/service_test.go | 6 +- pkg/server/service/udp/service.go | 8 +- pkg/server/service/udp/service_test.go | 6 +- pkg/tcp/proxy.go | 2 +- pkg/tcp/router.go | 4 +- pkg/tcp/switcher.go | 2 +- pkg/tcp/wrr_load_balancer.go | 2 +- pkg/testhelpers/config.go | 2 +- pkg/tls/certificate.go | 4 +- pkg/tls/certificate_store.go | 4 +- pkg/tls/certificate_store_test.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/haystack/logger.go | 2 +- pkg/tracing/instana/instana.go | 2 +- pkg/tracing/jaeger/jaeger.go | 2 +- pkg/tracing/jaeger/logger.go | 2 +- pkg/tracing/operation_name.go | 2 +- pkg/tracing/tracing.go | 2 +- pkg/tracing/zipkin/zipkin.go | 2 +- pkg/types/tls.go | 2 +- pkg/types/zz_generated.deepcopy.go | 2 +- pkg/udp/proxy.go | 2 +- pkg/udp/switcher.go | 2 +- pkg/udp/wrr_load_balancer.go | 2 +- pkg/version/version.go | 4 +- script/binary | 6 +- script/boilerplate.go.tmpl | 2 +- script/crossbinary-default | 2 +- script/deploy.sh | 4 +- script/update-generated-crd-code.sh | 12 +- traefik.sample.toml | 2 +- webui/src/components/_commons/NavBar.vue | 4 +- 421 files changed, 5213 insertions(+), 5234 deletions(-) delete mode 100644 .github/CODEOWNERS rename docs/theme/partials/{containous-header.html => company-header.html} (99%) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS deleted file mode 100644 index f6315449b..000000000 --- a/.github/CODEOWNERS +++ /dev/null @@ -1,24 +0,0 @@ -provider/kubernetes/** @containous/kubernetes -provider/rancher/** @containous/rancher -provider/marathon/** @containous/marathon -provider/docker/** @containous/docker - -docs/user-guide/kubernetes.md @containous/kubernetes -docs/user-guide/marathon.md @containous/marathon -docs/user-guide/swarm.md @containous/docker -docs/user-guide/swarm-mode.md @containous/docker - -docs/configuration/backends/docker.md @containous/docker -docs/configuration/backends/kubernetes.md @containous/kubernetes -docs/configuration/backends/marathon.md @containous/marathon -docs/configuration/backends/rancher.md @containous/rancher - -examples/k8s/ @containous/kubernetes -examples/compose-k8s.yaml @containous/kubernetes -examples/k8s.namespace.yaml @containous/kubernetes -examples/compose-rancher.yml @containous/rancher -examples/compose-marathon.yml @containous/marathon - -vendor/github.com/gambol99/go-marathon @containous/marathon -vendor/github.com/rancher @containous/rancher -vendor/k8s.io/ @containous/kubernetes diff --git a/.goreleaser.yml b/.goreleaser.yml index a2fd7a3f2..545ca5281 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -11,7 +11,7 @@ builds: env: - CGO_ENABLED=0 ldflags: - - -s -w -X github.com/containous/traefik/v2/pkg/version.Version={{.Version}} -X github.com/containous/traefik/v2/pkg/version.Codename={{.Env.CODENAME}} -X github.com/containous/traefik/v2/pkg/version.BuildDate={{.Date}} + - -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}} goos: - linux diff --git a/.semaphoreci/setup.sh b/.semaphoreci/setup.sh index 5cf007dc2..7ff12527b 100755 --- a/.semaphoreci/setup.sh +++ b/.semaphoreci/setup.sh @@ -1,6 +1,6 @@ # For personnal CI -# mv /home/runner/workspace/src/github.com// /home/runner/workspace/src/github.com/containous/ -# cd /home/runner/workspace/src/github.com/containous/traefik/ +# mv /home/runner/workspace/src/github.com// /home/runner/workspace/src/github.com/traefik/ +# cd /home/runner/workspace/src/github.com/traefik/traefik/ for s in apache2 cassandra elasticsearch memcached mysql mongod postgresql sphinxsearch rethinkdb rabbitmq-server redis-server; do sudo service $s stop; done sudo swapoff -a sudo dd if=/dev/zero of=/swapfile bs=1M count=3072 @@ -10,7 +10,7 @@ sudo rm -rf /home/runner/.rbenv sudo rm -rf /usr/local/golang/{1.4.3,1.5.4,1.6.4,1.7.6,1.8.6,1.9.7,1.10.3,1.11} #export DOCKER_VERSION=18.06.3 source .semaphoreci/vars -if [ -z "${PULL_REQUEST_NUMBER}" ]; then SHOULD_TEST="-*-"; else TEMP_STORAGE=$(curl --silent https://patch-diff.githubusercontent.com/raw/containous/traefik/pull/${PULL_REQUEST_NUMBER}.diff | patch --dry-run -p1 -R || true); fi +if [ -z "${PULL_REQUEST_NUMBER}" ]; then SHOULD_TEST="-*-"; else TEMP_STORAGE=$(curl --silent https://patch-diff.githubusercontent.com/raw/traefik/traefik/pull/${PULL_REQUEST_NUMBER}.diff | patch --dry-run -p1 -R || true); fi echo ${SHOULD_TEST} if [ -n "$TEMP_STORAGE" ]; then SHOULD_TEST=$(echo "$TEMP_STORAGE" | grep -Ev '(.md|.yaml|.yml)' || :); fi echo ${TEMP_STORAGE} diff --git a/.semaphoreci/vars b/.semaphoreci/vars index bd5b1d60f..2d4afa8f7 100644 --- a/.semaphoreci/vars +++ b/.semaphoreci/vars @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -e -export REPO='containous/traefik' +export REPO='traefik/traefik' if VERSION=$(git describe --exact-match --abbrev=0 --tags); then diff --git a/.travis.yml b/.travis.yml index e09f8b802..17c1766dc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,10 +29,10 @@ before_deploy: if [ "$TRAVIS_TAG" ]; then make release-packages; fi; - curl -sfL https://raw.githubusercontent.com/containous/structor/master/godownloader.sh | bash -s -- -b "${GOPATH}/bin" ${STRUCTOR_VERSION} + curl -sfL https://raw.githubusercontent.com/traefik/structor/master/godownloader.sh | bash -s -- -b "${GOPATH}/bin" ${STRUCTOR_VERSION} curl -sSfL https://raw.githubusercontent.com/traefik/mixtus/master/godownloader.sh | sh -s -- -b "${GOPATH}/bin" ${MIXTUS_VERSION} - structor -o containous -r traefik --dockerfile-url="https://raw.githubusercontent.com/containous/traefik/v1.7/docs.Dockerfile" --menu.js-url="https://raw.githubusercontent.com/containous/structor/master/traefik-menu.js.gotmpl" --rqts-url="https://raw.githubusercontent.com/containous/structor/master/requirements-override.txt" --force-edit-url --exp-branch=master --debug; - mixtus --dst-doc-path="./traefik" --dst-owner=traefik --dst-repo-name=doc --git-user-email="30906710+traefiker@users.noreply.github.com" --git-user-name=traefiker --src-doc-path="./site" --src-owner=containous --src-repo-name=traefik; + structor -o traefik -r traefik --dockerfile-url="https://raw.githubusercontent.com/traefik/traefik/v1.7/docs.Dockerfile" --menu.js-url="https://raw.githubusercontent.com/traefik/structor/master/traefik-menu.js.gotmpl" --rqts-url="https://raw.githubusercontent.com/traefik/structor/master/requirements-override.txt" --force-edit-url --exp-branch=master --debug; + mixtus --dst-doc-path="./traefik" --dst-owner=traefik --dst-repo-name=doc --git-user-email="30906710+traefiker@users.noreply.github.com" --git-user-name=traefiker --src-doc-path="./site" --src-owner=traefik --src-repo-name=traefik; fi deploy: @@ -42,13 +42,13 @@ deploy: skip_cleanup: true file_glob: true on: - repo: containous/traefik + repo: traefik/traefik tags: true - provider: script script: sh script/deploy.sh skip_cleanup: true on: - repo: containous/traefik + repo: traefik/traefik tags: true - provider: pages edge: false @@ -56,5 +56,5 @@ deploy: local_dir: site skip_cleanup: true on: - repo: containous/traefik + repo: traefik/traefik all_branches: true diff --git a/.travis/traefiker_rsa.enc b/.travis/traefiker_rsa.enc index 23991bcfeb0c9c584cc9d4691cb0d04da7aa2552..3c16cd35dc61503e7c7a462356458f0b09c9c138 100644 GIT binary patch literal 3392 zcmV-G4ZrdMWq5GxU@IU4zlDFFNTH{;m6r}Y{#@cNNt~vg;SgwXoG@3BOzy8kECf(V z{dGj@)X@5+juA5eH`5ogGSD%g3!9ct8tnrj5tf>YYWK#LnZ8 zeI(U`NWMxat|q^%!I-fdcP? z_W>Ha2^(IKmEEc3RjPr^SD5YYq%}$+yI9Lf?n3Rr)P&^%D~0Y(xM`T zyb5)azV6*R7+v6>Y@As=$yx~@1D*Dxv*j=SyFyS5Q*j$&8t9rqoCY{s4^mlL&ghI% zxt>ScQI;<9xn;J#Z0G$;mxqt0tDnWD(nY!ua#?AEFTjf(WcfoG_RmP-5H=R&xYUe; zs8pKH1q_M*v~OE7%o3w!80~()Li04Jclr=ha9F&~Y||$59k?hSYV=x2p{7QdXQS9k z#kf(~Is24bVM!wGKLSl_EVR7e9PR^^kU8)V^iyh_;%`g71{h&R0mY z(D>fY16~CjJgi?Pn0%iV7V#d)qQkxfqEm z-euAp38gwK$d~etPE1HU^7PQ6Kn$7w2hzs(^0eB%ZR9^P1nHpY44D@tBp;>t!}{RwAdE2!5lrf{;P$a zJ&8VKVCrm0FDdpg{ti^q%pZ%Edb7=TZ?|7l-Ik=rE(%~m-V@lV$2A{KCJet(5b%=n zn3-YG@Iw8Y7@_)H>Le7JdWz2$*_%l0I7A3YqSf(%wSo)*bdfSvyr&~T^s>9 z(+CFBQ6D!`*5FV>YGa&*t4H9+m3_$w6zs-k50K8^>hczhj5TM759?L22|@X6F#>P? zRe!9Vj}$&+oH%@=urmqf(k)Q&;(&ayF$gzYMX<0e$LKlY>ji|L!S}g(w*Y^+>DLsg zB}QjgP@VWEk-o@#k=IZ!m2An?Ar38HPCZq((3sS8x|UV9l z!BR=v9Y{c^>wur%+cRSZ2_S~5(>Jk^MRta?tweD2*KmleqfQnqvO*59#-@dF(_S?s zoF942OFjY`v&21E*Z?{diwD>GD*`Nw>P(rr$JYLuOj5T=ILV%*Aud043s2V_bhn*U zUCBNkkuMpq$~QYu^LO>p^mtdpttlTFN7BoQLQpYoYp_NSQ9c)LwFImiVH{wIOGWh$ zna|n!ZI;1`JD*xsGx4QY*tavycH8=)t-Z*@jg{w4k>HQ@6#^F;3|yw}(=*OV_MZpQ zZ+->tQqc#lR+v*1DeKW3nukb(02?SnR{B)ZLSKe2;~`0qr5Hku?#+$ggMc3^5yBS* zUk2YILqzzNie*>_>36zp+$%~59i-B`<~Z0dtk2gC^<(}-k$tO&Hshm!W3#+@EwzuR zV1vpx?bB0++9j}=8es0Gi`7o1DAOJ)%8M1Jhfj5TwvoZmCzLupNgq2MYXjIiT#&<_*~L`c>J~dP_Ax8IN+0##O(RdQ z6EctLW-;uDLhF?JOB5Lz8~}NhCEK7bp;j`C831f==YdZDk1|xQxVB~yG&h+XAS}JU zix7T2|4N_@r+H1%EfT+u5~K5Z#oA0V8RJK^nSs+Z@>#r4Vt_mENs?TvdT-v{>D*sd z=9ErrBX#?OJzYJy%=|$+$7EPEKz#Wax%rs>Mz|vT_JU{0`C>E*+y+c+f31E)0kL8r zssF@;&F~Nem9<*hPWOfw=f`~M`f-r0zvHdse%{v85oMxP|;ciwYX{ka)450X; z>5>LitVz)*I#6op59}!gS$8wTI>nw}XI{26tB8KTi}(;`hTk{F&WEtNvgnNu(|#A8R6iEOF==$n-K(^lDsGR2|7L&on;& zZ?KH(HhVH=mw55u2q0<75J%^SpuK-e-3%!k9@ej4WT}+IY*ST*OIb)($X=TC-%~G( z$aIdU7YU%Ur^04Kp1UF1^?O7-0lZw_`-^2ZJ9uBsMyH7&X#!bYQg{R#+2I37Of#{plGKxLbCW&HiUQ3bCNS9E!j8b z9RaoiRx31T#P_G>ar^mCk53eJnM@~n#_4i(aYLUWBhD4hiCXpF%n29$Wp81CPLkTw zk_(A?S~qRhg~IOA8V^G&lJ~B`eX60*Rhnw+tpd94%H=^5rx?EVE$B=1F?qlQNE9W zuHmH6-?eb#inxgKqi0w`SUBH=$CjOEd+>yVBS@B{qc^3pu5Q8fKjRxk#!!4yyEb-rh;bcE?7~|(yB1R zu#uq=V5R}D5vksX+Xw=gyPNs5qfwXXrqg?JmR6AKYahQ5CbyD+>HgFBHbPOH9U&@Z z!`3p~NUL98#Z1E>+b($1?!lOr7B+7OOmS`k8MH#CYL)Eox^>iRFG&&+;*R|Dyi7 zakG=0-V=)M7Hz?0F|AOx6WP0>zK?nb`sc7aZs&8~HxVU^@ClO|$gLt+?&B~^wpX+s z(WPvs8NiTc9}AEMz0qK4?Gz&p8@a{`+gWFCV!~XK3SRVK$p0?(yy8(vFb0CgJ|zek zN$^BFfh5Zg6-ZViz%h5uOt>sIoKPhD!}NJ<0r2M_p`Yw}?7V1Ik_1w4_$&E5@R%FN zfLIs=h)enP(55M4wkTgpH8B0FIeqknCjpQ=bh#TnD&j+Gq=PEpz`%;~Z*~zfmi+iG zgIA@oI9|D0&CuoZrB^1u%xSiu{|-RBvPf?c;mTr+6q;N}uQ{RVRcRQBom#3Lno>yI zzqO{UhovIbwLb=YzbbqqyM2}?H)vXEu1hqwu*9APD$-{tWM32N7s7Wc5dIsQf;mvK z0qz;-4DsE;8T4Zilj8S9%`(9nRU%Slz&(O4Xa`GVG=@^xiMSN~CrJW=0>;5`$q-19QJ&&G%Q}cJUVtSbtJ`G`j!R9N=zuQ&j zODDgX7)DV`U3N%W=`K= z@Klmvjz^-9sypN)vET9itQe|!Wg(N#Wa+Rz1wfbzWM`Y4%Of&w2N%*2A3t?wgINCB z|Ef8T|1`U(W0hJRnj_QUnvV_H=;pru=NqUNlMKF1r7%ejnmV+*>5#SBhZl)C^l$0V zS(kqzVQ zpzw-(BX~fr*hM?pma$Hcm>zpHn2%FH^KFA!7?L^=K(6?0CPY* zguehl2xvwE&07U?vJH&0)T{^fWdwb0l7Mls+`bcn!!K-+wz_*@GP%c)9Gn(J)|^gj zD;vWQTza1RdsKm(iT(Fq2(nr+?Q&e5SjX37v#N5?b9}mnZT}s5V43S>uuAONog`N@ ze`YY+k-NPe9Ag3>*nfbQJ+LIsJ^P$wbdiR7C-<2^zt-S)_Nua}uJz+p$D<@l8*zs( zUq;@|MbJNY{)S7+eR}5yI_)X)rwo=&u!$U>i@PZKkgVKh*B8*0zqUVnL0wlS z(!B^!5!#Mj^&Rdg@O=16#g$O<2`Ty@NtFr7G63gj_T|QZQD*M^TmA~G9;S8zTA`^Y zHjV8wMZORnfdh{`p_Oi1K%v5EpIj0DyI6K0|+?4$L;~Niag=H%y%`T zJ|6nfTV&Xy3ON?F&j2`t{1 zB`{;nLFt%zWQP;E1K!L64*8Z_%zB{J56%}Oi~_ zLWX73w>*!{+iXwYj0KiD{n$BWTnnn5Tqd%OgbG7KCoc8*h0pW%}qZ0eqs5;%LfePUlgMWJ_NXLZ$(vP`)w*RK*RA9>1Rh zcRVbmQB=5mU6l1n#~M^x>@yuAeA}9Sj=-A8MSS}KN?X{=J4u$Q3WxQZ#VhY`q0CxL zjGAKIs}uXKcAH9#yK7ZLMJDY!KnUJ;W12yFL9!u8M#A{!$9Kb1`k;`<(1AX_wc5~s z*iZ(bc#4KSB$l*J80X+E;zjeKiqb;raMsVp{RZxuJiZ%_*p0*}*GfqR6R%pI?sssI zaInsbxuW^#qDnTLD;gk!e~Oy(6q_{O~DUxrByLc>riV?I&x&*(iBP=@9)cI4z8lsAB21ZNe36o_4ow=f`b? Marathon Backend [\#465](https://github.com/containous/traefik/issues/465) -- Websocket: Unable to hijack the connection [\#452](https://github.com/containous/traefik/issues/452) -- kubernetes: Received event spamming? [\#449](https://github.com/containous/traefik/issues/449) -- kubernetes: backends not updated when i scale replication controller? [\#448](https://github.com/containous/traefik/issues/448) -- Add href link on frontend [\#436](https://github.com/containous/traefik/issues/436) -- Multiple Domains Rule [\#430](https://github.com/containous/traefik/issues/430) +- HTTP headers case gets modified [\#466](https://github.com/traefik/traefik/issues/466) +- File frontend \> Marathon Backend [\#465](https://github.com/traefik/traefik/issues/465) +- Websocket: Unable to hijack the connection [\#452](https://github.com/traefik/traefik/issues/452) +- kubernetes: Received event spamming? [\#449](https://github.com/traefik/traefik/issues/449) +- kubernetes: backends not updated when i scale replication controller? [\#448](https://github.com/traefik/traefik/issues/448) +- Add href link on frontend [\#436](https://github.com/traefik/traefik/issues/436) +- Multiple Domains Rule [\#430](https://github.com/traefik/traefik/issues/430) **Merged pull requests:** -- Disable constraints in doc until 1.1 [\#479](https://github.com/containous/traefik/pull/479) ([emilevauge](https://github.com/emilevauge)) -- Sort nodes before creating consul catalog config [\#478](https://github.com/containous/traefik/pull/478) ([keis](https://github.com/keis)) -- Fix spamming events in listenProviders [\#477](https://github.com/containous/traefik/pull/477) ([emilevauge](https://github.com/emilevauge)) -- Fix empty responses [\#476](https://github.com/containous/traefik/pull/476) ([emilevauge](https://github.com/emilevauge)) -- Fix acme renew [\#472](https://github.com/containous/traefik/pull/472) ([emilevauge](https://github.com/emilevauge)) -- Fix typo in error message. [\#471](https://github.com/containous/traefik/pull/471) ([KevinBusse](https://github.com/KevinBusse)) -- Fix errors load config [\#470](https://github.com/containous/traefik/pull/470) ([emilevauge](https://github.com/emilevauge)) -- Typo: Replace French words by English ones [\#469](https://github.com/containous/traefik/pull/469) ([kumy](https://github.com/kumy)) -- Fix marathon TLS/basic auth [\#468](https://github.com/containous/traefik/pull/468) ([emilevauge](https://github.com/emilevauge)) -- Fix memory leak in listenProviders [\#464](https://github.com/containous/traefik/pull/464) ([emilevauge](https://github.com/emilevauge)) -- Fix websocket connection Hijack [\#460](https://github.com/containous/traefik/pull/460) ([emilevauge](https://github.com/emilevauge)) -- Fix default KV configuration [\#450](https://github.com/containous/traefik/pull/450) ([emilevauge](https://github.com/emilevauge)) -- Fix panic if listContainers fails… [\#443](https://github.com/containous/traefik/pull/443) ([vdemeester](https://github.com/vdemeester)) -- mount acme folder instead of file [\#441](https://github.com/containous/traefik/pull/441) ([NicolasGeraud](https://github.com/NicolasGeraud)) -- feat\(constraints\): Supports constraints for docker backend [\#438](https://github.com/containous/traefik/pull/438) ([samber](https://github.com/samber)) +- Disable constraints in doc until 1.1 [\#479](https://github.com/traefik/traefik/pull/479) ([emilevauge](https://github.com/emilevauge)) +- Sort nodes before creating consul catalog config [\#478](https://github.com/traefik/traefik/pull/478) ([keis](https://github.com/keis)) +- Fix spamming events in listenProviders [\#477](https://github.com/traefik/traefik/pull/477) ([emilevauge](https://github.com/emilevauge)) +- Fix empty responses [\#476](https://github.com/traefik/traefik/pull/476) ([emilevauge](https://github.com/emilevauge)) +- Fix acme renew [\#472](https://github.com/traefik/traefik/pull/472) ([emilevauge](https://github.com/emilevauge)) +- Fix typo in error message. [\#471](https://github.com/traefik/traefik/pull/471) ([KevinBusse](https://github.com/KevinBusse)) +- Fix errors load config [\#470](https://github.com/traefik/traefik/pull/470) ([emilevauge](https://github.com/emilevauge)) +- Typo: Replace French words by English ones [\#469](https://github.com/traefik/traefik/pull/469) ([kumy](https://github.com/kumy)) +- Fix marathon TLS/basic auth [\#468](https://github.com/traefik/traefik/pull/468) ([emilevauge](https://github.com/emilevauge)) +- Fix memory leak in listenProviders [\#464](https://github.com/traefik/traefik/pull/464) ([emilevauge](https://github.com/emilevauge)) +- Fix websocket connection Hijack [\#460](https://github.com/traefik/traefik/pull/460) ([emilevauge](https://github.com/emilevauge)) +- Fix default KV configuration [\#450](https://github.com/traefik/traefik/pull/450) ([emilevauge](https://github.com/emilevauge)) +- Fix panic if listContainers fails… [\#443](https://github.com/traefik/traefik/pull/443) ([vdemeester](https://github.com/vdemeester)) +- mount acme folder instead of file [\#441](https://github.com/traefik/traefik/pull/441) ([NicolasGeraud](https://github.com/NicolasGeraud)) +- feat\(constraints\): Supports constraints for docker backend [\#438](https://github.com/traefik/traefik/pull/438) ([samber](https://github.com/samber)) -## [v1.0.0-rc2](https://github.com/containous/traefik/tree/v1.0.0-rc2) (2016-06-07) -[Full Changelog](https://github.com/containous/traefik/compare/v1.0.0-rc1...v1.0.0-rc2) +## [v1.0.0-rc2](https://github.com/traefik/traefik/tree/v1.0.0-rc2) (2016-06-07) +[Full Changelog](https://github.com/traefik/traefik/compare/v1.0.0-rc1...v1.0.0-rc2) **Implemented enhancements:** -- Add @samber to maintainers [\#440](https://github.com/containous/traefik/pull/440) ([emilevauge](https://github.com/emilevauge)) +- Add @samber to maintainers [\#440](https://github.com/traefik/traefik/pull/440) ([emilevauge](https://github.com/emilevauge)) **Fixed bugs:** -- Panic on help [\#429](https://github.com/containous/traefik/issues/429) -- Bad default values in configuration [\#427](https://github.com/containous/traefik/issues/427) +- Panic on help [\#429](https://github.com/traefik/traefik/issues/429) +- Bad default values in configuration [\#427](https://github.com/traefik/traefik/issues/427) **Closed issues:** -- Traefik doesn't listen on IPv4 ports [\#434](https://github.com/containous/traefik/issues/434) -- Not listening on port 80 [\#432](https://github.com/containous/traefik/issues/432) -- docs need updating for new frontend rules format [\#423](https://github.com/containous/traefik/issues/423) -- Does traefik supports for Mac? \(For devlelopment\) [\#417](https://github.com/containous/traefik/issues/417) +- Traefik doesn't listen on IPv4 ports [\#434](https://github.com/traefik/traefik/issues/434) +- Not listening on port 80 [\#432](https://github.com/traefik/traefik/issues/432) +- docs need updating for new frontend rules format [\#423](https://github.com/traefik/traefik/issues/423) +- Does traefik supports for Mac? \(For devlelopment\) [\#417](https://github.com/traefik/traefik/issues/417) **Merged pull requests:** -- Allow multiple rules [\#435](https://github.com/containous/traefik/pull/435) ([fclaeys](https://github.com/fclaeys)) -- Add routes priorities [\#433](https://github.com/containous/traefik/pull/433) ([emilevauge](https://github.com/emilevauge)) -- Fix default configuration [\#428](https://github.com/containous/traefik/pull/428) ([emilevauge](https://github.com/emilevauge)) -- Fix marathon groups subdomain [\#426](https://github.com/containous/traefik/pull/426) ([emilevauge](https://github.com/emilevauge)) -- Fix travis tag check [\#422](https://github.com/containous/traefik/pull/422) ([emilevauge](https://github.com/emilevauge)) -- log info about TOML configuration file using [\#420](https://github.com/containous/traefik/pull/420) ([cocap10](https://github.com/cocap10)) -- Doc about skipping some integration tests with '-check.f ConsulCatalogSuite' [\#418](https://github.com/containous/traefik/pull/418) ([samber](https://github.com/samber)) +- Allow multiple rules [\#435](https://github.com/traefik/traefik/pull/435) ([fclaeys](https://github.com/fclaeys)) +- Add routes priorities [\#433](https://github.com/traefik/traefik/pull/433) ([emilevauge](https://github.com/emilevauge)) +- Fix default configuration [\#428](https://github.com/traefik/traefik/pull/428) ([emilevauge](https://github.com/emilevauge)) +- Fix marathon groups subdomain [\#426](https://github.com/traefik/traefik/pull/426) ([emilevauge](https://github.com/emilevauge)) +- Fix travis tag check [\#422](https://github.com/traefik/traefik/pull/422) ([emilevauge](https://github.com/emilevauge)) +- log info about TOML configuration file using [\#420](https://github.com/traefik/traefik/pull/420) ([cocap10](https://github.com/cocap10)) +- Doc about skipping some integration tests with '-check.f ConsulCatalogSuite' [\#418](https://github.com/traefik/traefik/pull/418) ([samber](https://github.com/samber)) diff --git a/LICENSE.md b/LICENSE.md index 0d13136e9..137c5700a 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2016-2020 Containous SAS +Copyright (c) 2016-2020 Containous SAS; 2020 Traefik Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Makefile b/Makefile index 072a88f07..02fc7793d 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ GIT_BRANCH := $(subst heads/,,$(shell git rev-parse --abbrev-ref HEAD 2>/dev/nul TRAEFIK_DEV_IMAGE := traefik-dev$(if $(GIT_BRANCH),:$(subst /,-,$(GIT_BRANCH))) REPONAME := $(shell echo $(REPO) | tr '[:upper:]' '[:lower:]') -TRAEFIK_IMAGE := $(if $(REPONAME),$(REPONAME),"containous/traefik") +TRAEFIK_IMAGE := $(if $(REPONAME),$(REPONAME),"traefik/traefik") INTEGRATION_OPTS := $(if $(MAKE_DOCKER_HOST),-e "DOCKER_HOST=$(MAKE_DOCKER_HOST)", -e "TEST_CONTAINER=1" -v "/var/run/docker.sock:/var/run/docker.sock") DOCKER_BUILD_ARGS := $(if $(DOCKER_VERSION), "--build-arg=DOCKER_VERSION=$(DOCKER_VERSION)",) @@ -29,7 +29,7 @@ TRAEFIK_ENVS := \ -e CI \ -e CONTAINER=DOCKER # Indicator for integration tests that we are running inside a container. -TRAEFIK_MOUNT := -v "$(CURDIR)/$(BIND_DIR):/go/src/github.com/containous/traefik/$(BIND_DIR)" +TRAEFIK_MOUNT := -v "$(CURDIR)/$(BIND_DIR):/go/src/github.com/traefik/traefik/$(BIND_DIR)" DOCKER_RUN_OPTS := $(TRAEFIK_ENVS) $(TRAEFIK_MOUNT) "$(TRAEFIK_DEV_IMAGE)" DOCKER_NON_INTERACTIVE ?= false DOCKER_RUN_TRAEFIK := docker run --add-host=host.docker.internal:127.0.0.1 $(INTEGRATION_OPTS) $(if $(DOCKER_NON_INTERACTIVE), , -it) $(DOCKER_RUN_OPTS) diff --git a/README.md b/README.md index 628c5c303..47b9dd850 100644 --- a/README.md +++ b/README.md @@ -5,9 +5,9 @@ [![Build Status SemaphoreCI](https://semaphoreci.com/api/v1/containous/traefik/branches/master/shields_badge.svg)](https://semaphoreci.com/containous/traefik) [![Docs](https://img.shields.io/badge/docs-current-brightgreen.svg)](https://docs.traefik.io) -[![Go Report Card](https://goreportcard.com/badge/containous/traefik)](https://goreportcard.com/report/containous/traefik) +[![Go Report Card](https://goreportcard.com/badge/traefik/traefik)](https://goreportcard.com/report/traefik/traefik) [![](https://images.microbadger.com/badges/image/traefik.svg)](https://microbadger.com/images/traefik) -[![License](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/containous/traefik/blob/master/LICENSE.md) +[![License](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/traefik/traefik/blob/master/LICENSE.md) [![Join the community support forum at https://community.containo.us/](https://img.shields.io/badge/style-register-green.svg?style=social&label=Discourse)](https://community.containo.us/) [![Twitter](https://img.shields.io/twitter/follow/traefik.svg?style=social)](https://twitter.com/intent/follow?screen_name=traefik) @@ -102,13 +102,13 @@ If you need commercial support, please contact [Containo.us](https://containo.us ## Download -- Grab the latest binary from the [releases](https://github.com/containous/traefik/releases) page and run it with the [sample configuration file](https://raw.githubusercontent.com/containous/traefik/master/traefik.sample.toml): +- Grab the latest binary from the [releases](https://github.com/traefik/traefik/releases) page and run it with the [sample configuration file](https://raw.githubusercontent.com/traefik/traefik/master/traefik.sample.toml): ```shell ./traefik --configFile=traefik.toml ``` -- Or use the official tiny Docker image and run it with the [sample configuration file](https://raw.githubusercontent.com/containous/traefik/master/traefik.sample.toml): +- Or use the official tiny Docker image and run it with the [sample configuration file](https://raw.githubusercontent.com/traefik/traefik/master/traefik.sample.toml): ```shell docker run -d -p 8080:8080 -p 80:80 -v $PWD/traefik.toml:/etc/traefik/traefik.toml traefik @@ -117,7 +117,7 @@ docker run -d -p 8080:8080 -p 80:80 -v $PWD/traefik.toml:/etc/traefik/traefik.to - Or get the sources: ```shell -git clone https://github.com/containous/traefik +git clone https://github.com/traefik/traefik ``` ## Introductory Videos diff --git a/build.Dockerfile b/build.Dockerfile index a00bb2323..e1a0537a8 100644 --- a/build.Dockerfile +++ b/build.Dockerfile @@ -27,11 +27,11 @@ RUN curl -sfL https://raw.githubusercontent.com/client9/misspell/master/install # Download goreleaser binary to bin folder in $GOPATH RUN curl -sfL https://install.goreleaser.com/github.com/goreleaser/goreleaser.sh | sh -WORKDIR /go/src/github.com/containous/traefik +WORKDIR /go/src/github.com/traefik/traefik # Download go modules COPY go.mod . COPY go.sum . RUN GO111MODULE=on GOPROXY=https://proxy.golang.org go mod download -COPY . /go/src/github.com/containous/traefik +COPY . /go/src/github.com/traefik/traefik diff --git a/cmd/configuration.go b/cmd/configuration.go index fe8e1b79f..3e4f38f92 100644 --- a/cmd/configuration.go +++ b/cmd/configuration.go @@ -3,8 +3,8 @@ package cmd import ( "time" - "github.com/containous/traefik/v2/pkg/config/static" ptypes "github.com/traefik/paerser/types" + "github.com/traefik/traefik/v2/pkg/config/static" ) // TraefikCmdConfiguration wraps the static configuration and extra parameters. diff --git a/cmd/healthcheck/healthcheck.go b/cmd/healthcheck/healthcheck.go index 1360673b7..c63ee6341 100644 --- a/cmd/healthcheck/healthcheck.go +++ b/cmd/healthcheck/healthcheck.go @@ -7,8 +7,8 @@ import ( "os" "time" - "github.com/containous/traefik/v2/pkg/config/static" "github.com/traefik/paerser/cli" + "github.com/traefik/traefik/v2/pkg/config/static" ) // NewCmd builds a new HealthCheck command. diff --git a/cmd/traefik/plugins.go b/cmd/traefik/plugins.go index 8291a6c88..aa4e9bcbe 100644 --- a/cmd/traefik/plugins.go +++ b/cmd/traefik/plugins.go @@ -1,8 +1,8 @@ package main import ( - "github.com/containous/traefik/v2/pkg/config/static" - "github.com/containous/traefik/v2/pkg/plugins" + "github.com/traefik/traefik/v2/pkg/config/static" + "github.com/traefik/traefik/v2/pkg/plugins" ) const outputDir = "./plugins-storage/" diff --git a/cmd/traefik/traefik.go b/cmd/traefik/traefik.go index 15f88fb37..2d7aa3825 100644 --- a/cmd/traefik/traefik.go +++ b/cmd/traefik/traefik.go @@ -11,34 +11,34 @@ import ( "strings" "time" - "github.com/containous/traefik/v2/autogen/genstatic" - "github.com/containous/traefik/v2/cmd" - "github.com/containous/traefik/v2/cmd/healthcheck" - cmdVersion "github.com/containous/traefik/v2/cmd/version" - tcli "github.com/containous/traefik/v2/pkg/cli" - "github.com/containous/traefik/v2/pkg/collector" - "github.com/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/config/runtime" - "github.com/containous/traefik/v2/pkg/config/static" - "github.com/containous/traefik/v2/pkg/log" - "github.com/containous/traefik/v2/pkg/metrics" - "github.com/containous/traefik/v2/pkg/middlewares/accesslog" - "github.com/containous/traefik/v2/pkg/pilot" - "github.com/containous/traefik/v2/pkg/plugins" - "github.com/containous/traefik/v2/pkg/provider/acme" - "github.com/containous/traefik/v2/pkg/provider/aggregator" - "github.com/containous/traefik/v2/pkg/provider/traefik" - "github.com/containous/traefik/v2/pkg/safe" - "github.com/containous/traefik/v2/pkg/server" - "github.com/containous/traefik/v2/pkg/server/middleware" - "github.com/containous/traefik/v2/pkg/server/service" - traefiktls "github.com/containous/traefik/v2/pkg/tls" - "github.com/containous/traefik/v2/pkg/types" - "github.com/containous/traefik/v2/pkg/version" "github.com/coreos/go-systemd/daemon" assetfs "github.com/elazarl/go-bindata-assetfs" "github.com/sirupsen/logrus" "github.com/traefik/paerser/cli" + "github.com/traefik/traefik/v2/autogen/genstatic" + "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/log" + "github.com/traefik/traefik/v2/pkg/metrics" + "github.com/traefik/traefik/v2/pkg/middlewares/accesslog" + "github.com/traefik/traefik/v2/pkg/pilot" + "github.com/traefik/traefik/v2/pkg/plugins" + "github.com/traefik/traefik/v2/pkg/provider/acme" + "github.com/traefik/traefik/v2/pkg/provider/aggregator" + "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" + traefiktls "github.com/traefik/traefik/v2/pkg/tls" + "github.com/traefik/traefik/v2/pkg/types" + "github.com/traefik/traefik/v2/pkg/version" "github.com/vulcand/oxy/roundrobin" ) diff --git a/cmd/version/version.go b/cmd/version/version.go index 2bbd802ca..03557ff58 100644 --- a/cmd/version/version.go +++ b/cmd/version/version.go @@ -7,8 +7,8 @@ import ( "runtime" "text/template" - "github.com/containous/traefik/v2/pkg/version" "github.com/traefik/paerser/cli" + "github.com/traefik/traefik/v2/pkg/version" ) var versionTemplate = `Version: {{.Version}} diff --git a/docs/content/contributing/advocating.md b/docs/content/contributing/advocating.md index 1052f8caf..791338526 100644 --- a/docs/content/contributing/advocating.md +++ b/docs/content/contributing/advocating.md @@ -7,4 +7,4 @@ There are many ways to contribute to the project, and there is one that always s If you're talking about Traefik, [let us know](https://blog.containo.us/spread-the-love-ba5a40aa72e7) and we'll promote your enthusiasm! -Also, if you've written about Traefik or shared useful information you'd like to promote, feel free to add links in the [dedicated wiki page on Github](https://github.com/containous/traefik/wiki/Awesome-Traefik). +Also, if you've written about Traefik or shared useful information you'd like to promote, feel free to add links in the [dedicated wiki page on Github](https://github.com/traefik/traefik/wiki/Awesome-Traefik). diff --git a/docs/content/contributing/building-testing.md b/docs/content/contributing/building-testing.md index fd0cad182..665852872 100644 --- a/docs/content/contributing/building-testing.md +++ b/docs/content/contributing/building-testing.md @@ -35,7 +35,7 @@ Step 1/10 : FROM golang:1.14-alpine [...] Successfully built 5c3c1a911277 Successfully tagged traefik-dev:4475--feature-documentation -docker run -e "TEST_CONTAINER=1" -v "/var/run/docker.sock:/var/run/docker.sock" -it -e OS_ARCH_ARG -e OS_PLATFORM_ARG -e TESTFLAGS -e VERBOSE -e VERSION -e CODENAME -e TESTDIRS -e CI -e CONTAINER=DOCKER -v "/home/ldez/sources/go/src/github.com/containous/traefik/"dist":/go/src/github.com/containous/traefik/"dist"" "traefik-dev:4475--feature-documentation" ./script/make.sh generate binary +docker run -e "TEST_CONTAINER=1" -v "/var/run/docker.sock:/var/run/docker.sock" -it -e OS_ARCH_ARG -e OS_PLATFORM_ARG -e TESTFLAGS -e VERBOSE -e VERSION -e CODENAME -e TESTDIRS -e CI -e CONTAINER=DOCKER -v "/home/ldez/sources/go/src/github.com/traefik/traefik/"dist":/go/src/github.com/traefik/traefik/"dist"" "traefik-dev:4475--feature-documentation" ./script/make.sh generate binary ---> Making bundle: generate (in .) removed 'autogen/genstatic/gen.go' @@ -68,7 +68,7 @@ Requirements: !!! tip "Source Directory" - It is recommended that you clone Traefik into the `~/go/src/github.com/containous/traefik` directory. + It is recommended that you clone Traefik into the `~/go/src/github.com/traefik/traefik` directory. This is the official golang workspace hierarchy that will allow dependencies to be properly resolved. !!! note "Environment" @@ -104,7 +104,7 @@ Once you've set up your go environment and cloned the source repository, you can Beforehand, you need to get [go-bindata](https://github.com/containous/go-bindata) (the first time) in order to be able to use the `go generate` command (which is part of the build process). ```bash -cd ~/go/src/github.com/containous/traefik +cd ~/go/src/github.com/traefik/traefik # Get go-bindata. (Important: the ellipses are required.) GO111MODULE=off go get github.com/containous/go-bindata/... @@ -124,7 +124,7 @@ go generate go build ./cmd/traefik ``` -You will find the Traefik executable (`traefik`) in the `~/go/src/github.com/containous/traefik` directory. +You will find the Traefik executable (`traefik`) in the `~/go/src/github.com/traefik/traefik` directory. ## Testing @@ -138,13 +138,13 @@ Run all tests (unit and integration) using the `test` target. $ make test-unit docker build -t "traefik-dev:your-feature-branch" -f build.Dockerfile . # […] -docker run --rm -it -e OS_ARCH_ARG -e OS_PLATFORM_ARG -e TESTFLAGS -v "/home/user/go/src/github/containous/traefik/dist:/go/src/github.com/containous/traefik/dist" "traefik-dev:your-feature-branch" ./script/make.sh generate test-unit +docker run --rm -it -e OS_ARCH_ARG -e OS_PLATFORM_ARG -e TESTFLAGS -v "/home/user/go/src/github/traefik/traefik/dist:/go/src/github.com/traefik/traefik/dist" "traefik-dev:your-feature-branch" ./script/make.sh generate test-unit ---> Making bundle: generate (in .) removed 'gen.go' ---> Making bundle: test-unit (in .) + go test -cover -coverprofile=cover.out . -ok github.com/containous/traefik 0.005s coverage: 4.1% of statements +ok github.com/traefik/traefik 0.005s coverage: 4.1% of statements Test success ``` @@ -172,7 +172,7 @@ More: https://labix.org/gocheck Unit tests can be run from the cloned directory using `$ go test ./...` which should return `ok`, similar to: ```test -ok _/home/user/go/src/github/containous/traefik 0.004s +ok _/home/user/go/src/github/traefik/traefik 0.004s ``` Integration tests must be run from the `integration/` directory and require the `-integration` switch: `$ cd integration && go test -integration ./...`. diff --git a/docs/content/contributing/data-collection.md b/docs/content/contributing/data-collection.md index a91ef9e2b..e82f4812a 100644 --- a/docs/content/contributing/data-collection.md +++ b/docs/content/contributing/data-collection.md @@ -29,7 +29,7 @@ For this very reason, the sendAnonymousUsage option is mandatory: we want you to ## Collected Data -This feature comes from the public proposal [here](https://github.com/containous/traefik/issues/2369). +This feature comes from the public proposal [here](https://github.com/traefik/traefik/issues/2369). In order to help us learn more about how Traefik is being used and improve it, we collect anonymous usage statistics from running instances. Those data help us prioritize our developments and focus on what's important for our users (for example, which provider is popular, and which is not). @@ -90,6 +90,6 @@ Once a day (the first call begins 10 minutes after the start of Traefik), we col ## The Code for Data Collection -If you want to dig into more details, here is the source code of the collecting system: [collector.go](https://github.com/containous/traefik/blob/master/pkg/collector/collector.go) +If you want to dig into more details, here is the source code of the collecting system: [collector.go](https://github.com/traefik/traefik/blob/master/pkg/collector/collector.go) By default we anonymize all configuration fields, except fields tagged with `export=true`. diff --git a/docs/content/contributing/documentation.md b/docs/content/contributing/documentation.md index eb5f176f1..374d36671 100644 --- a/docs/content/contributing/documentation.md +++ b/docs/content/contributing/documentation.md @@ -20,7 +20,7 @@ You can build the documentation and test it locally (with live reloading), using $ make docs docker build -t traefik-docs -f docs.Dockerfile . # […] -docker run --rm -v /home/user/go/github/containous/traefik:/mkdocs -p 8000:8000 traefik-docs mkdocs serve +docker run --rm -v /home/user/go/github/traefik/traefik:/mkdocs -p 8000:8000 traefik-docs mkdocs serve # […] [I 170828 20:47:48 server:283] Serving on http://0.0.0.0:8000 [I 170828 20:47:48 handlers:60] Start watching changes @@ -75,7 +75,7 @@ To check that the documentation meets standard expectations (no dead links, html $ make docs-verify docker build -t traefik-docs-verify ./script/docs-verify-docker-image ## Build Validator image ... -docker run --rm -v /home/travis/build/containous/traefik:/app traefik-docs-verify ## Check for dead links and w3c compliance +docker run --rm -v /home/travis/build/traefik/traefik:/app traefik-docs-verify ## Check for dead links and w3c compliance === Checking HTML content... Running ["HtmlCheck", "ImageCheck", "ScriptCheck", "LinkCheck"] on /app/site/basics/index.html on *.html... ``` diff --git a/docs/content/contributing/maintainers.md b/docs/content/contributing/maintainers.md index b95a54663..9c4dde672 100644 --- a/docs/content/contributing/maintainers.md +++ b/docs/content/contributing/maintainers.md @@ -20,7 +20,7 @@ ## Contributions Daily Meeting -* 3 Maintainers should attend to a Contributions Daily Meeting where we sort and label new issues ([is:issue label:status/0-needs-triage](https://github.com/containous/traefik/issues?utf8=%E2%9C%93&q=is%3Aissue+label%3Astatus%2F0-needs-triage+)), and review every Pull Requests +* 3 Maintainers should attend to a Contributions Daily Meeting where we sort and label new issues ([is:issue label:status/0-needs-triage](https://github.com/traefik/traefik/issues?utf8=%E2%9C%93&q=is%3Aissue+label%3Astatus%2F0-needs-triage+)), and review every Pull Requests * Every pull request should be checked during the Contributions Daily Meeting * Even if it’s already assigned * Even PR labelled with `contributor/waiting-for-corrections` or `contributor/waiting-for-feedback` @@ -43,7 +43,7 @@ We use [PRM](https://github.com/ldez/prm) to manage locally pull requests. ## Bots -### [Myrmica Lobicornis](https://github.com/containous/lobicornis/) +### [Myrmica Lobicornis](https://github.com/traefik/lobicornis/) Update and Merge Pull Request. @@ -67,12 +67,12 @@ This label is used when: * Merging branches into the master * Preparing the release -### [Myrmica Bibikoffi](https://github.com/containous/bibikoffi/) +### [Myrmica Bibikoffi](https://github.com/traefik/bibikoffi/) * closes stale issues [cron] * use some criterion as number of days between creation, last update, labels, ... -### [Myrmica Aloba](https://github.com/containous/aloba) +### [Myrmica Aloba](https://github.com/traefik/aloba) Manage GitHub labels. diff --git a/docs/content/contributing/submitting-issues.md b/docs/content/contributing/submitting-issues.md index 4370eda67..1fa0bf61a 100644 --- a/docs/content/contributing/submitting-issues.md +++ b/docs/content/contributing/submitting-issues.md @@ -3,7 +3,7 @@ Help Us Help You! {: .subtitle } -We use the [GitHub issue tracker](https://github.com/containous/traefik/issues) to keep track of issues in Traefik. +We use the [GitHub issue tracker](https://github.com/traefik/traefik/issues) to keep track of issues in Traefik. The process of sorting and checking the issues is a daunting task, and requires a lot of work (more than an hour a day ... just for sorting). To save us some time and get quicker feedback, be sure to follow the guide lines below. @@ -22,7 +22,7 @@ The title must be short and descriptive. (~60 characters) ## Description -Follow the [issue template](https://github.com/containous/traefik/blob/master/.github/ISSUE_TEMPLATE.md) as much as possible. +Follow the [issue template](https://github.com/traefik/traefik/blob/master/.github/ISSUE_TEMPLATE.md) as much as possible. Explain us in which conditions you encountered the issue, what is your context. diff --git a/docs/content/contributing/submitting-pull-requests.md b/docs/content/contributing/submitting-pull-requests.md index 1de31241a..b388e4fa0 100644 --- a/docs/content/contributing/submitting-pull-requests.md +++ b/docs/content/contributing/submitting-pull-requests.md @@ -15,7 +15,7 @@ The title must be short and descriptive. (~60 characters) ## Description -Follow the [pull request template](https://github.com/containous/traefik/blob/master/.github/PULL_REQUEST_TEMPLATE.md) as much as possible. +Follow the [pull request template](https://github.com/traefik/traefik/blob/master/.github/PULL_REQUEST_TEMPLATE.md) as much as possible. Explain the conditions which led you to write this PR: give us context. The context should lead to something, an idea or a problem that you’re facing. diff --git a/docs/content/contributing/thank-you.md b/docs/content/contributing/thank-you.md index ab4dd7153..55411ef4f 100644 --- a/docs/content/contributing/thank-you.md +++ b/docs/content/contributing/thank-you.md @@ -3,8 +3,8 @@ _You_ Made It {: .subtitle} -Traefik truly is an [open-source project](https://github.com/containous/traefik/), -and wouldn't have become what it is today without the help of our [many contributors](https://github.com/containous/traefik/graphs/contributors) (at the time of writing this), +Traefik truly is an [open-source project](https://github.com/traefik/traefik/), +and wouldn't have become what it is today without the help of our [many contributors](https://github.com/traefik/traefik/graphs/contributors) (at the time of writing this), not accounting for people having helped with issues, tests, comments, articles, ... or just enjoying it and letting others know. So once again, thank you for your invaluable help on making Traefik such a good product. diff --git a/docs/content/getting-started/install-traefik.md b/docs/content/getting-started/install-traefik.md index eca174a22..a91cb5075 100644 --- a/docs/content/getting-started/install-traefik.md +++ b/docs/content/getting-started/install-traefik.md @@ -9,7 +9,7 @@ You can install Traefik with the following flavors: ## Use the Official Docker Image -Choose one of the [official Docker images](https://hub.docker.com/_/traefik) and run it with the [sample configuration file](https://raw.githubusercontent.com/containous/traefik/v2.3/traefik.sample.toml): +Choose one of the [official Docker images](https://hub.docker.com/_/traefik) and run it with the [sample configuration file](https://raw.githubusercontent.com/traefik/traefik/v2.3/traefik.sample.toml): ```bash docker run -d -p 8080:8080 -p 80:80 \ @@ -32,7 +32,7 @@ For more details, go to the [Docker provider documentation](../providers/docker. The Traefik Chart from [Helm's default charts repository](https://github.com/helm/charts/tree/master/stable/traefik) is still using [Traefik v1.7](https://docs.traefik.io/v1.7). -Traefik can be installed in Kubernetes using the Helm chart from . +Traefik can be installed in Kubernetes using the Helm chart from . Ensure that the following requirements are met: @@ -42,7 +42,7 @@ Ensure that the following requirements are met: Add Traefik's chart repository to Helm: ```bash -helm repo add traefik https://containous.github.io/traefik-helm-chart +helm repo add traefik https://traefik.github.io/traefik-helm-chart ``` You can update the chart repository by running: @@ -76,7 +76,7 @@ helm install traefik traefik/traefik {: #helm-custom-values } The values are not (yet) documented, but are self-explanatory: - you can look at the [default `values.yaml`](https://github.com/containous/traefik-helm-chart/blob/master/traefik/values.yaml) file to explore possibilities. + you can look at the [default `values.yaml`](https://github.com/traefik/traefik-helm-chart/blob/master/traefik/values.yaml) file to explore possibilities. You can also set Traefik command line flags using `additionalArguments`. Example of installation with logging set to `DEBUG`: @@ -128,7 +128,7 @@ spec: ## Use the Binary Distribution -Grab the latest binary from the [releases](https://github.com/containous/traefik/releases) page. +Grab the latest binary from the [releases](https://github.com/traefik/traefik/releases) page. ??? info "Check the integrity of the downloaded file" diff --git a/docs/content/getting-started/quick-start.md b/docs/content/getting-started/quick-start.md index e483b2758..3fc1ba690 100644 --- a/docs/content/getting-started/quick-start.md +++ b/docs/content/getting-started/quick-start.md @@ -48,7 +48,7 @@ Edit your `docker-compose.yml` file and add the following at the end of your fil # ... whoami: # A container that exposes an API to show its IP address - image: containous/whoami + image: traefik/whoami labels: - "traefik.http.routers.whoami.rule=Host(`whoami.docker.localhost`)" ``` diff --git a/docs/content/index.md b/docs/content/index.md index 4806ab7ca..c84bd380c 100644 --- a/docs/content/index.md +++ b/docs/content/index.md @@ -3,7 +3,7 @@ ![Architecture](assets/img/traefik-architecture.png) -Traefik is an [open-source](https://github.com/containous/traefik) *Edge Router* that makes publishing your services a fun and easy experience. +Traefik is an [open-source](https://github.com/traefik/traefik) *Edge Router* that makes publishing your services a fun and easy experience. It receives requests on behalf of your system and finds out which components are responsible for handling them. What sets Traefik apart, besides its many features, is that it automatically discovers the right configuration for your services. diff --git a/docs/content/middlewares/overview.md b/docs/content/middlewares/overview.md index 622db7e86..557811d41 100644 --- a/docs/content/middlewares/overview.md +++ b/docs/content/middlewares/overview.md @@ -17,7 +17,7 @@ Pieces of middleware can be combined in chains to fit every scenario. # As a Docker Label whoami: # A container that exposes an API to show its IP address - image: containous/whoami + image: traefik/whoami labels: # Create a middleware named `foo-add-prefix` - "traefik.http.middlewares.foo-add-prefix.addprefix.prefix=/foo" diff --git a/docs/content/migration/v1-to-v2.md b/docs/content/migration/v1-to-v2.md index fb8e0f983..812dfeb67 100644 --- a/docs/content/migration/v1-to-v2.md +++ b/docs/content/migration/v1-to-v2.md @@ -10,7 +10,7 @@ feature by feature, of how the configuration looked like in v1, and how it now l !!! info "Migration Helper" - We created a tool to help during the migration: [traefik-migration-tool](https://github.com/containous/traefik-migration-tool) + We created a tool to help during the migration: [traefik-migration-tool](https://github.com/traefik/traefik-migration-tool) This tool allows to: diff --git a/docs/content/plugins/overview.md b/docs/content/plugins/overview.md index afa5c2716..5f8950892 100644 --- a/docs/content/plugins/overview.md +++ b/docs/content/plugins/overview.md @@ -32,7 +32,7 @@ To complete the connection, Traefik Pilot will issue a token that must be added Traefik users can create their own plugins and contribute them to the Traefik Pilot catalog to share them with the community. -Plugins are written in [Go](https://golang.org/) and their code is executed by an [embedded Go interpreter](https://github.com/containous/yaegi). +Plugins are written in [Go](https://golang.org/) and their code is executed by an [embedded Go interpreter](https://github.com/traefik/yaegi). There is no need to compile binaries and all plugins are 100% cross-platform. -To learn more and see code for example Traefik plugins, please see the [developer documentation](https://github.com/containous/plugindemo). +To learn more and see code for example Traefik plugins, please see the [developer documentation](https://github.com/traefik/plugindemo). diff --git a/docs/content/plugins/using-plugins.md b/docs/content/plugins/using-plugins.md index 65810a9b6..592262166 100644 --- a/docs/content/plugins/using-plugins.md +++ b/docs/content/plugins/using-plugins.md @@ -12,24 +12,24 @@ Plugins are hosted on GitHub, but you can browse plugins to add to your register To add a new plugin to a Traefik instance, you must modify that instance's static configuration. The code to be added is provided by the Traefik Pilot UI when you choose **Install the Plugin**. -In the example below, we add the [`blockpath`](http://github.com/containous/plugin-blockpath) and [`rewritebody`](https://github.com/containous/plugin-rewritebody) plugins: +In the example below, we add the [`blockpath`](http://github.com/traefik/plugin-blockpath) and [`rewritebody`](https://github.com/traefik/plugin-rewritebody) plugins: ```toml tab="File (TOML)" [entryPoints] -  [entryPoints.web] -    address = ":80" + [entryPoints.web] + address = ":80" -[experimental] - [experimental.pilot] - token = "xxxxxxxxx" +[pilot] + token = "xxxxxxxxx" -  [experimental.plugins] -    [experimental.plugins.block] -      modulename = "github.com/containous/plugin-blockpath" -      version = "v0.1.2" -    [experimental.plugins.rewrite] -      modulename = "github.com/containous/plugin-rewritebody" -      version = "v0.2.0" +[experimental.plugins] + [experimental.plugins.block] + modulename = "github.com/traefik/plugin-blockpath" + version = "v0.2.0" + + [experimental.plugins.rewrite] + modulename = "github.com/traefik/plugin-rewritebody" + version = "v0.3.0" ``` ```yaml tab="File (YAML)" @@ -37,26 +37,26 @@ entryPoints: web: address: :80 -experimental: - pilot: +pilot: token: xxxxxxxxx +experimental: plugins: block: - modulename: github.com/containous/plugin-blockpath - version: v0.1.2 - rewrite: - modulename: github.com/containous/plugin-rewritebody + modulename: github.com/traefik/plugin-blockpath version: v0.2.0 + rewrite: + modulename: github.com/traefik/plugin-rewritebody + version: v0.3.0 ``` ```bash tab="CLI" --entryPoints.web.address=:80 ---experimental.pilot.token=xxxxxxxxx ---experimental.plugins.block.modulename=github.com/containous/plugin-blockpath ---experimental.plugins.block.version=v0.1.2 ---experimental.plugins.rewrite.modulename=github.com/containous/plugin-rewritebody ---experimental.plugins.rewrite.version=v0.2.0 +--pilot.token=xxxxxxxxx +--experimental.plugins.block.modulename=github.com/traefik/plugin-blockpath +--experimental.plugins.block.version=v0.2.0 +--experimental.plugins.rewrite.modulename=github.com/traefik/plugin-rewritebody +--experimental.plugins.rewrite.version=v0.3.0 ``` ## Configuring Plugins diff --git a/docs/content/providers/docker.md b/docs/content/providers/docker.md index 6fd3a5b2e..dbc02d4f5 100644 --- a/docs/content/providers/docker.md +++ b/docs/content/providers/docker.md @@ -168,7 +168,7 @@ You can specify which Docker API Endpoint to use with the directive [`endpoint`] - [Don't expose the Docker socket (not even to a container)](https://www.lvh.io/posts/dont-expose-the-docker-socket-not-even-to-a-container/) - [A thread on Stack Overflow about sharing the `/var/run/docker.sock` file](https://news.ycombinator.com/item?id=17983623) - [To DinD or not to DinD](https://blog.loof.fr/2018/01/to-dind-or-not-do-dind.html) - - [Traefik issue GH-4174 about security with Docker socket](https://github.com/containous/traefik/issues/4174) + - [Traefik issue GH-4174 about security with Docker socket](https://github.com/traefik/traefik/issues/4174) - [Inspecting Docker Activity with Socat](https://developers.redhat.com/blog/2015/02/25/inspecting-docker-activity-with-socat/) - [Letting Traefik run on Worker Nodes](https://blog.mikesir87.io/2018/07/letting-traefik-run-on-worker-nodes/) - [Docker Socket Proxy from Tecnativa](https://github.com/Tecnativa/docker-socket-proxy) diff --git a/docs/content/providers/kubernetes-ingress.md b/docs/content/providers/kubernetes-ingress.md index e7bb545ed..7f7d70d36 100644 --- a/docs/content/providers/kubernetes-ingress.md +++ b/docs/content/providers/kubernetes-ingress.md @@ -391,4 +391,4 @@ providers: ### Further If one wants to know more about the various aspects of the Ingress spec that Traefik supports, -many examples of Ingresses definitions are located in the tests [data](https://github.com/containous/traefik/tree/v2.3/pkg/provider/kubernetes/ingress/fixtures) of the Traefik repository. +many examples of Ingresses definitions are located in the tests [data](https://github.com/traefik/traefik/tree/v2.3/pkg/provider/kubernetes/ingress/fixtures) of the Traefik repository. diff --git a/docs/content/providers/marathon.md b/docs/content/providers/marathon.md index 7fcf3ac49..5b7239f88 100644 --- a/docs/content/providers/marathon.md +++ b/docs/content/providers/marathon.md @@ -32,7 +32,7 @@ See also [Marathon user guide](../user-guides/marathon.md). "container": { "type": "DOCKER", "docker": { - "image": "containous/whoami", + "image": "traefik/whoami", "network": "BRIDGE", "portMappings": [ { diff --git a/docs/content/reference/static-configuration/cli-ref.md b/docs/content/reference/static-configuration/cli-ref.md index 9ffa87a87..964019f78 100644 --- a/docs/content/reference/static-configuration/cli-ref.md +++ b/docs/content/reference/static-configuration/cli-ref.md @@ -168,9 +168,6 @@ plugin's GOPATH. `--experimental.devplugin.modulename`: plugin's module name. -`--experimental.pilot.token`: -Traefik Pilot token. - `--experimental.plugins..modulename`: plugin's module name. @@ -288,6 +285,9 @@ Prefix to use for metrics collection. (Default: ```traefik```) `--metrics.statsd.pushinterval`: StatsD push interval. (Default: ```10```) +`--pilot.token`: +Traefik Pilot token. + `--ping`: Enable ping. (Default: ```false```) diff --git a/docs/content/reference/static-configuration/env-ref.md b/docs/content/reference/static-configuration/env-ref.md index 11fbd4be2..bdb2aa31e 100644 --- a/docs/content/reference/static-configuration/env-ref.md +++ b/docs/content/reference/static-configuration/env-ref.md @@ -168,9 +168,6 @@ plugin's GOPATH. `TRAEFIK_EXPERIMENTAL_DEVPLUGIN_MODULENAME`: plugin's module name. -`TRAEFIK_EXPERIMENTAL_PILOT_TOKEN`: -Traefik Pilot token. - `TRAEFIK_EXPERIMENTAL_PLUGINS__MODULENAME`: plugin's module name. @@ -288,6 +285,9 @@ Prefix to use for metrics collection. (Default: ```traefik```) `TRAEFIK_METRICS_STATSD_PUSHINTERVAL`: StatsD push interval. (Default: ```10```) +`TRAEFIK_PILOT_TOKEN`: +Traefik Pilot token. + `TRAEFIK_PING`: Enable ping. (Default: ```false```) diff --git a/docs/content/routing/providers/kubernetes-crd.md b/docs/content/routing/providers/kubernetes-crd.md index 64d22e2bc..4256180e9 100644 --- a/docs/content/routing/providers/kubernetes-crd.md +++ b/docs/content/routing/providers/kubernetes-crd.md @@ -160,24 +160,24 @@ The Kubernetes Ingress Controller, The Custom Resource Way. name: whoami namespace: default labels: - app: containous + app: traefiklabs name: whoami spec: replicas: 2 selector: matchLabels: - app: containous + app: traefiklabs task: whoami template: metadata: labels: - app: containous + app: traefiklabs task: whoami spec: containers: - - name: containouswhoami - image: containous/whoami + - name: whoami + image: traefik/whoami ports: - containerPort: 80 @@ -193,7 +193,7 @@ The Kubernetes Ingress Controller, The Custom Resource Way. - name: http port: 80 selector: - app: containous + app: traefiklabs task: whoami --- @@ -203,24 +203,24 @@ The Kubernetes Ingress Controller, The Custom Resource Way. name: whoamitcp namespace: default labels: - app: containous + app: traefiklabs name: whoamitcp spec: replicas: 2 selector: matchLabels: - app: containous + app: traefiklabs task: whoamitcp template: metadata: labels: - app: containous + app: traefiklabs task: whoamitcp spec: containers: - - name: containouswhoamitcp - image: containous/whoamitcp + - name: whoamitcp + image: traefik/whoamitcp ports: - containerPort: 8080 @@ -236,7 +236,7 @@ The Kubernetes Ingress Controller, The Custom Resource Way. - protocol: TCP port: 8080 selector: - app: containous + app: traefiklabs task: whoamitcp --- @@ -246,24 +246,24 @@ The Kubernetes Ingress Controller, The Custom Resource Way. name: whoamiudp namespace: default labels: - app: containous + app: traefiklabs name: whoamiudp spec: replicas: 2 selector: matchLabels: - app: containous + app: traefiklabs task: whoamiudp template: metadata: labels: - app: containous + app: traefiklabs task: whoamiudp spec: containers: - - name: containouswhoamiudp - image: containous/whoamiudp:dev + - name: whoamiudp + image: traefik/whoamiudp:latest ports: - containerPort: 8080 @@ -278,7 +278,7 @@ The Kubernetes Ingress Controller, The Custom Resource Way. ports: - port: 8080 selector: - app: containous + app: traefiklabs task: whoamiudp ``` @@ -687,7 +687,7 @@ More information in the dedicated server [load balancing](../services/index.md#l - name: http port: 80 selector: - app: containous + app: traefiklabs task: app1 --- apiVersion: v1 @@ -701,7 +701,7 @@ More information in the dedicated server [load balancing](../services/index.md#l - name: http port: 80 selector: - app: containous + app: traefiklabs task: app2 ``` @@ -780,7 +780,7 @@ More information in the dedicated [Weighted Round Robin](../services/index.md#we - name: http port: 80 selector: - app: containous + app: traefiklabs task: app1 --- apiVersion: v1 @@ -794,7 +794,7 @@ More information in the dedicated [Weighted Round Robin](../services/index.md#we - name: http port: 80 selector: - app: containous + app: traefiklabs task: app2 --- apiVersion: v1 @@ -808,7 +808,7 @@ More information in the dedicated [Weighted Round Robin](../services/index.md#we - name: http port: 80 selector: - app: containous + app: traefiklabs task: app3 ``` @@ -891,7 +891,7 @@ More information in the dedicated [mirroring](../services/index.md#mirroring-ser - name: http port: 80 selector: - app: containous + app: traefiklabs task: app1 --- apiVersion: v1 @@ -905,7 +905,7 @@ More information in the dedicated [mirroring](../services/index.md#mirroring-ser - name: http port: 80 selector: - app: containous + app: traefiklabs task: app2 ``` @@ -1026,7 +1026,7 @@ and there is a second level because each whoami service is a `replicaset` and is spec: containers: - name: whoami1 - image: containous/whoami + image: traefik/whoami ports: - name: web containerPort: 80 @@ -1052,7 +1052,7 @@ and there is a second level because each whoami service is a `replicaset` and is spec: containers: - name: whoami2 - image: containous/whoami + image: traefik/whoami ports: - name: web containerPort: 80 diff --git a/docs/content/routing/providers/kubernetes-ingress.md b/docs/content/routing/providers/kubernetes-ingress.md index 1744d27ff..d4b982198 100644 --- a/docs/content/routing/providers/kubernetes-ingress.md +++ b/docs/content/routing/providers/kubernetes-ingress.md @@ -151,24 +151,24 @@ which in turn will create the resulting routers, services, handlers, etc. metadata: name: whoami labels: - app: containous + app: traefiklabs name: whoami spec: replicas: 2 selector: matchLabels: - app: containous + app: traefiklabs task: whoami template: metadata: labels: - app: containous + app: traefiklabs task: whoami spec: containers: - - name: containouswhoami - image: containous/whoami + - name: whoami + image: traefik/whoami ports: - containerPort: 80 @@ -183,7 +183,7 @@ which in turn will create the resulting routers, services, handlers, etc. - name: http port: 80 selector: - app: containous + app: traefiklabs task: whoami ``` diff --git a/docs/content/user-guides/crd-acme/03-deployments.yml b/docs/content/user-guides/crd-acme/03-deployments.yml index 567c91965..129a58c0c 100644 --- a/docs/content/user-guides/crd-acme/03-deployments.yml +++ b/docs/content/user-guides/crd-acme/03-deployments.yml @@ -68,7 +68,7 @@ spec: spec: containers: - name: whoami - image: containous/whoami + image: traefik/whoami ports: - name: web containerPort: 80 diff --git a/docs/content/user-guides/crd-acme/index.md b/docs/content/user-guides/crd-acme/index.md index 8b14a5bd4..100f63b89 100644 --- a/docs/content/user-guides/crd-acme/index.md +++ b/docs/content/user-guides/crd-acme/index.md @@ -51,7 +51,7 @@ Also note the RBAC authorization resources; they'll be referenced through the `s ### Services -Then, the services. One for Traefik itself, and one for the app it routes for, i.e. in this case our demo HTTP server: [whoami](https://github.com/containous/whoami). +Then, the services. One for Traefik itself, and one for the app it routes for, i.e. in this case our demo HTTP server: [whoami](https://github.com/traefik/whoami). ```yaml --8<-- "content/user-guides/crd-acme/02-services.yml" diff --git a/docs/content/user-guides/docker-compose/acme-dns/docker-compose.yml b/docs/content/user-guides/docker-compose/acme-dns/docker-compose.yml index 1af0f4883..2247fa959 100644 --- a/docs/content/user-guides/docker-compose/acme-dns/docker-compose.yml +++ b/docs/content/user-guides/docker-compose/acme-dns/docker-compose.yml @@ -31,7 +31,7 @@ services: - "/var/run/docker.sock:/var/run/docker.sock:ro" whoami: - image: "containous/whoami" + image: "traefik/whoami" container_name: "simple-service" labels: - "traefik.enable=true" diff --git a/docs/content/user-guides/docker-compose/acme-dns/docker-compose_secrets.yml b/docs/content/user-guides/docker-compose/acme-dns/docker-compose_secrets.yml index 3e7bba928..a3646f2eb 100644 --- a/docs/content/user-guides/docker-compose/acme-dns/docker-compose_secrets.yml +++ b/docs/content/user-guides/docker-compose/acme-dns/docker-compose_secrets.yml @@ -46,7 +46,7 @@ services: - "/var/run/docker.sock:/var/run/docker.sock:ro" whoami: - image: "containous/whoami" + image: "traefik/whoami" container_name: "simple-service" labels: - "traefik.enable=true" diff --git a/docs/content/user-guides/docker-compose/acme-http/docker-compose.yml b/docs/content/user-guides/docker-compose/acme-http/docker-compose.yml index c9dbb325b..54d6e5a58 100644 --- a/docs/content/user-guides/docker-compose/acme-http/docker-compose.yml +++ b/docs/content/user-guides/docker-compose/acme-http/docker-compose.yml @@ -26,7 +26,7 @@ services: - "/var/run/docker.sock:/var/run/docker.sock:ro" whoami: - image: "containous/whoami" + image: "traefik/whoami" container_name: "simple-service" labels: - "traefik.enable=true" diff --git a/docs/content/user-guides/docker-compose/acme-tls/docker-compose.yml b/docs/content/user-guides/docker-compose/acme-tls/docker-compose.yml index fca8bb10f..33350731d 100644 --- a/docs/content/user-guides/docker-compose/acme-tls/docker-compose.yml +++ b/docs/content/user-guides/docker-compose/acme-tls/docker-compose.yml @@ -23,7 +23,7 @@ services: - "/var/run/docker.sock:/var/run/docker.sock:ro" whoami: - image: "containous/whoami" + image: "traefik/whoami" container_name: "simple-service" labels: - "traefik.enable=true" diff --git a/docs/content/user-guides/docker-compose/basic-example/docker-compose.yml b/docs/content/user-guides/docker-compose/basic-example/docker-compose.yml index da8548f28..6622a4d3e 100644 --- a/docs/content/user-guides/docker-compose/basic-example/docker-compose.yml +++ b/docs/content/user-guides/docker-compose/basic-example/docker-compose.yml @@ -18,7 +18,7 @@ services: - "/var/run/docker.sock:/var/run/docker.sock:ro" whoami: - image: "containous/whoami" + image: "traefik/whoami" container_name: "simple-service" labels: - "traefik.enable=true" diff --git a/docs/content/user-guides/docker-compose/basic-example/index.md b/docs/content/user-guides/docker-compose/basic-example/index.md index a6350dc9f..aef9910e5 100644 --- a/docs/content/user-guides/docker-compose/basic-example/index.md +++ b/docs/content/user-guides/docker-compose/basic-example/index.md @@ -35,7 +35,7 @@ This will also be used as a starting point for the other docker-compose guides. ## Details -- As an example we use [whoami](https://github.com/containous/whoami) (a tiny Go server that prints os information and HTTP request to output) which was used to define our `simple-service` container. +- As an example we use [whoami](https://github.com/traefik/whoami) (a tiny Go server that prints os information and HTTP request to output) which was used to define our `simple-service` container. - We define an entry point, along with the exposure of the matching port within docker-compose, which basically allow us to "open and accept" HTTP traffic: diff --git a/docs/content/user-guides/marathon.md b/docs/content/user-guides/marathon.md index 6d416ee58..8fa26aecc 100644 --- a/docs/content/user-guides/marathon.md +++ b/docs/content/user-guides/marathon.md @@ -105,7 +105,7 @@ As such, there is no way to handle this situation deterministically. Finally, Marathon health checks are not mandatory (the default is to use the task state as reported by Mesos), so requiring them for Traefik would raise the entry barrier for Marathon users. -Traefik used to use the health check results as a strict requirement but moved away from it as [users reported the dramatic consequences](https://github.com/containous/traefik/issues/653). +Traefik used to use the health check results as a strict requirement but moved away from it as [users reported the dramatic consequences](https://github.com/traefik/traefik/issues/653). #### Draining @@ -117,4 +117,4 @@ However, implementing this fully within Traefik seems like a non-trivial underta Additionally, the approach is less flexible compared to a custom termination handler since only the latter allows for the implementation of custom termination sequences that go beyond simple request draining (e.g., persisting a snapshot state to disk prior to terminating). -The feature is currently not implemented; a request for draining in general is at [issue 41](https://github.com/containous/traefik/issues/41). +The feature is currently not implemented; a request for draining in general is at [issue 41](https://github.com/traefik/traefik/issues/41). diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml index 0e5feebbf..5870029e9 100644 --- a/docs/mkdocs.yml +++ b/docs/mkdocs.yml @@ -5,7 +5,7 @@ site_url: https://docs.traefik.io dev_addr: 0.0.0.0:8000 repo_name: 'GitHub' -repo_url: 'https://github.com/containous/traefik' +repo_url: 'https://github.com/traefik/traefik' docs_dir: 'content' @@ -26,7 +26,7 @@ theme: prev: 'Previous' next: 'Next' -copyright: "Copyright © 2016-2020 Containous" +copyright: "Copyright © 2016-2020 Containous; 2020 Traefik Labs" extra_css: - assets/styles/root.css diff --git a/docs/scripts/verify.sh b/docs/scripts/verify.sh index b4ba696fe..848d83d52 100755 --- a/docs/scripts/verify.sh +++ b/docs/scripts/verify.sh @@ -21,7 +21,7 @@ find "${PATH_TO_SITE}" -type f -not -path "/app/site/theme/*" \ --check_external_hash \ --alt_ignore="/traefik.logo.png/" \ --http_status_ignore="0,500,501,503" \ - --url_ignore="/https://groups.google.com/a/traefik.io/forum/#!forum/security/,/localhost:/,/127.0.0.1:/,/fonts.gstatic.com/,/.minikube/,/github.com\/containous\/traefik\/*edit*/,/github.com\/containous\/traefik\/$/,/docs.traefik.io/,/github\.com\/golang\/oauth2\/blob\/36a7019397c4c86cf59eeab3bc0d188bac444277\/.+/,/www.akamai.com/,/pilot.traefik.io\/profile/,/containo.us/,/docs.mae.sh/,/www.mkdocs.org/,/squidfunk.github.io/,/ietf.org/" \ + --url_ignore="/https://groups.google.com/a/traefik.io/forum/#!forum/security/,/localhost:/,/127.0.0.1:/,/fonts.gstatic.com/,/.minikube/,/github.com\/containous\/traefik\/*edit*/,/github.com\/containous\/traefik\/$/,/github.com\/traefik\/traefik\/*edit*/,/github.com\/traefik\/traefik\/$/,/docs.traefik.io/,/github\.com\/golang\/oauth2\/blob\/36a7019397c4c86cf59eeab3bc0d188bac444277\/.+/,/www.akamai.com/,/pilot.traefik.io\/profile/,/containo.us/,/docs.mae.sh/,/www.mkdocs.org/,/squidfunk.github.io/,/ietf.org/" \ '{}' 1>/dev/null ## HTML-proofer options at https://github.com/gjtorikian/html-proofer#configuration diff --git a/docs/theme/main.html b/docs/theme/main.html index 176befcce..8abec98bf 100644 --- a/docs/theme/main.html +++ b/docs/theme/main.html @@ -11,7 +11,7 @@ {% endblock %} {% block header %} - {% include "partials/containous-header.html" %} + {% include "partials/company-header.html" %} {% include "partials/header.html" %} {% endblock %} diff --git a/docs/theme/partials/containous-header.html b/docs/theme/partials/company-header.html similarity index 99% rename from docs/theme/partials/containous-header.html rename to docs/theme/partials/company-header.html index ade0a1ace..f1acb902a 100644 --- a/docs/theme/partials/containous-header.html +++ b/docs/theme/partials/company-header.html @@ -197,7 +197,7 @@
-

Interested in joining Containous?

+

Interested in joining Traefik Labs?

1 { body := req.Body defer body.Close() diff --git a/pkg/middlewares/retry/retry_test.go b/pkg/middlewares/retry/retry_test.go index a9fbc6150..88ae06c75 100644 --- a/pkg/middlewares/retry/retry_test.go +++ b/pkg/middlewares/retry/retry_test.go @@ -10,12 +10,12 @@ import ( "strings" "testing" - "github.com/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/middlewares/emptybackendhandler" - "github.com/containous/traefik/v2/pkg/testhelpers" "github.com/gorilla/websocket" "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/emptybackendhandler" + "github.com/traefik/traefik/v2/pkg/testhelpers" "github.com/vulcand/oxy/forward" "github.com/vulcand/oxy/roundrobin" ) diff --git a/pkg/middlewares/stripprefix/strip_prefix.go b/pkg/middlewares/stripprefix/strip_prefix.go index 1a0fd8bbc..406b13ab2 100644 --- a/pkg/middlewares/stripprefix/strip_prefix.go +++ b/pkg/middlewares/stripprefix/strip_prefix.go @@ -5,11 +5,11 @@ import ( "net/http" "strings" - "github.com/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/log" - "github.com/containous/traefik/v2/pkg/middlewares" - "github.com/containous/traefik/v2/pkg/tracing" "github.com/opentracing/opentracing-go/ext" + "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/middlewares" + "github.com/traefik/traefik/v2/pkg/tracing" ) const ( diff --git a/pkg/middlewares/stripprefix/strip_prefix_test.go b/pkg/middlewares/stripprefix/strip_prefix_test.go index 13a5aedb2..717acdef3 100644 --- a/pkg/middlewares/stripprefix/strip_prefix_test.go +++ b/pkg/middlewares/stripprefix/strip_prefix_test.go @@ -6,10 +6,10 @@ import ( "net/http/httptest" "testing" - "github.com/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/testhelpers" "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" ) func TestStripPrefix(t *testing.T) { diff --git a/pkg/middlewares/stripprefixregex/strip_prefix_regex.go b/pkg/middlewares/stripprefixregex/strip_prefix_regex.go index 4feda225e..ee0722ad3 100644 --- a/pkg/middlewares/stripprefixregex/strip_prefix_regex.go +++ b/pkg/middlewares/stripprefixregex/strip_prefix_regex.go @@ -6,12 +6,12 @@ import ( "regexp" "strings" - "github.com/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/log" - "github.com/containous/traefik/v2/pkg/middlewares" - "github.com/containous/traefik/v2/pkg/middlewares/stripprefix" - "github.com/containous/traefik/v2/pkg/tracing" "github.com/opentracing/opentracing-go/ext" + "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/middlewares" + "github.com/traefik/traefik/v2/pkg/middlewares/stripprefix" + "github.com/traefik/traefik/v2/pkg/tracing" ) const ( diff --git a/pkg/middlewares/stripprefixregex/strip_prefix_regex_test.go b/pkg/middlewares/stripprefixregex/strip_prefix_regex_test.go index 6e0293083..763985ba9 100644 --- a/pkg/middlewares/stripprefixregex/strip_prefix_regex_test.go +++ b/pkg/middlewares/stripprefixregex/strip_prefix_regex_test.go @@ -6,11 +6,11 @@ import ( "net/http/httptest" "testing" - "github.com/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/middlewares/stripprefix" - "github.com/containous/traefik/v2/pkg/testhelpers" "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" ) func TestStripPrefixRegex(t *testing.T) { diff --git a/pkg/middlewares/tracing/entrypoint.go b/pkg/middlewares/tracing/entrypoint.go index 007a9c6e3..54f28cb86 100644 --- a/pkg/middlewares/tracing/entrypoint.go +++ b/pkg/middlewares/tracing/entrypoint.go @@ -5,11 +5,11 @@ import ( "net/http" "github.com/containous/alice" - "github.com/containous/traefik/v2/pkg/log" - "github.com/containous/traefik/v2/pkg/middlewares" - "github.com/containous/traefik/v2/pkg/tracing" "github.com/opentracing/opentracing-go" "github.com/opentracing/opentracing-go/ext" + "github.com/traefik/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/middlewares" + "github.com/traefik/traefik/v2/pkg/tracing" ) const ( diff --git a/pkg/middlewares/tracing/entrypoint_test.go b/pkg/middlewares/tracing/entrypoint_test.go index 79bd89db6..604c8c012 100644 --- a/pkg/middlewares/tracing/entrypoint_test.go +++ b/pkg/middlewares/tracing/entrypoint_test.go @@ -6,10 +6,10 @@ import ( "net/http/httptest" "testing" - "github.com/containous/traefik/v2/pkg/tracing" "github.com/opentracing/opentracing-go/ext" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/traefik/traefik/v2/pkg/tracing" ) func TestEntryPointMiddleware(t *testing.T) { diff --git a/pkg/middlewares/tracing/forwarder.go b/pkg/middlewares/tracing/forwarder.go index 4c689a06a..c65d322e1 100644 --- a/pkg/middlewares/tracing/forwarder.go +++ b/pkg/middlewares/tracing/forwarder.go @@ -4,10 +4,10 @@ import ( "context" "net/http" - "github.com/containous/traefik/v2/pkg/log" - "github.com/containous/traefik/v2/pkg/middlewares" - "github.com/containous/traefik/v2/pkg/tracing" "github.com/opentracing/opentracing-go/ext" + "github.com/traefik/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/middlewares" + "github.com/traefik/traefik/v2/pkg/tracing" ) const ( diff --git a/pkg/middlewares/tracing/forwarder_test.go b/pkg/middlewares/tracing/forwarder_test.go index f5872b649..d8b1cbb99 100644 --- a/pkg/middlewares/tracing/forwarder_test.go +++ b/pkg/middlewares/tracing/forwarder_test.go @@ -6,10 +6,10 @@ import ( "net/http/httptest" "testing" - "github.com/containous/traefik/v2/pkg/tracing" "github.com/opentracing/opentracing-go/ext" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/traefik/traefik/v2/pkg/tracing" ) func TestNewForwarder(t *testing.T) { diff --git a/pkg/middlewares/tracing/wrapper.go b/pkg/middlewares/tracing/wrapper.go index 9363d9e07..86efd52e6 100644 --- a/pkg/middlewares/tracing/wrapper.go +++ b/pkg/middlewares/tracing/wrapper.go @@ -5,9 +5,9 @@ import ( "net/http" "github.com/containous/alice" - "github.com/containous/traefik/v2/pkg/log" - "github.com/containous/traefik/v2/pkg/tracing" "github.com/opentracing/opentracing-go/ext" + "github.com/traefik/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/tracing" ) // Tracable embeds tracing information. diff --git a/pkg/pilot/pilot.go b/pkg/pilot/pilot.go index 9f230916f..eafdd6176 100644 --- a/pkg/pilot/pilot.go +++ b/pkg/pilot/pilot.go @@ -10,11 +10,11 @@ import ( "time" "github.com/cenkalti/backoff/v4" - "github.com/containous/traefik/v2/pkg/config/runtime" - "github.com/containous/traefik/v2/pkg/log" - "github.com/containous/traefik/v2/pkg/metrics" - "github.com/containous/traefik/v2/pkg/safe" - "github.com/containous/traefik/v2/pkg/version" + "github.com/traefik/traefik/v2/pkg/config/runtime" + "github.com/traefik/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/metrics" + "github.com/traefik/traefik/v2/pkg/safe" + "github.com/traefik/traefik/v2/pkg/version" ) const baseURL = "https://instance-info.pilot.traefik.io/public" diff --git a/pkg/pilot/pilot_test.go b/pkg/pilot/pilot_test.go index 8c0aa8d99..6661ccb69 100644 --- a/pkg/pilot/pilot_test.go +++ b/pkg/pilot/pilot_test.go @@ -9,10 +9,10 @@ import ( "testing" "time" - "github.com/containous/traefik/v2/pkg/config/runtime" - "github.com/containous/traefik/v2/pkg/metrics" - "github.com/containous/traefik/v2/pkg/safe" "github.com/stretchr/testify/require" + "github.com/traefik/traefik/v2/pkg/config/runtime" + "github.com/traefik/traefik/v2/pkg/metrics" + "github.com/traefik/traefik/v2/pkg/safe" ) func TestTick(t *testing.T) { diff --git a/pkg/plugins/builder.go b/pkg/plugins/builder.go index 58527475c..3416c7ee4 100644 --- a/pkg/plugins/builder.go +++ b/pkg/plugins/builder.go @@ -8,9 +8,9 @@ import ( "reflect" "strings" - "github.com/containous/yaegi/interp" - "github.com/containous/yaegi/stdlib" "github.com/mitchellh/mapstructure" + "github.com/traefik/yaegi/interp" + "github.com/traefik/yaegi/stdlib" ) const devPluginName = "dev" diff --git a/pkg/plugins/plugins.go b/pkg/plugins/plugins.go index 448747113..26302f671 100644 --- a/pkg/plugins/plugins.go +++ b/pkg/plugins/plugins.go @@ -6,7 +6,7 @@ import ( "fmt" "strings" - "github.com/containous/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/log" ) // Setup setup plugins environment. diff --git a/pkg/provider/acme/account.go b/pkg/provider/acme/account.go index 66ca15710..4f12e14a2 100644 --- a/pkg/provider/acme/account.go +++ b/pkg/provider/acme/account.go @@ -7,9 +7,9 @@ import ( "crypto/rsa" "crypto/x509" - "github.com/containous/traefik/v2/pkg/log" "github.com/go-acme/lego/v4/certcrypto" "github.com/go-acme/lego/v4/registration" + "github.com/traefik/traefik/v2/pkg/log" ) // 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 42575a54c..2dbd7d9f5 100644 --- a/pkg/provider/acme/challenge_http.go +++ b/pkg/provider/acme/challenge_http.go @@ -7,11 +7,11 @@ import ( "time" "github.com/cenkalti/backoff/v4" - "github.com/containous/traefik/v2/pkg/log" - "github.com/containous/traefik/v2/pkg/safe" "github.com/go-acme/lego/v4/challenge" "github.com/go-acme/lego/v4/challenge/http01" "github.com/gorilla/mux" + "github.com/traefik/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/safe" ) var _ challenge.ProviderTimeout = (*challengeHTTP)(nil) diff --git a/pkg/provider/acme/challenge_tls.go b/pkg/provider/acme/challenge_tls.go index d841e7fbc..c5b1f41d2 100644 --- a/pkg/provider/acme/challenge_tls.go +++ b/pkg/provider/acme/challenge_tls.go @@ -3,10 +3,10 @@ package acme import ( "crypto/tls" - "github.com/containous/traefik/v2/pkg/log" - "github.com/containous/traefik/v2/pkg/types" "github.com/go-acme/lego/v4/challenge" "github.com/go-acme/lego/v4/challenge/tlsalpn01" + "github.com/traefik/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/types" ) var _ challenge.Provider = (*challengeTLSALPN)(nil) diff --git a/pkg/provider/acme/local_store.go b/pkg/provider/acme/local_store.go index 8edad959d..81c509cbc 100644 --- a/pkg/provider/acme/local_store.go +++ b/pkg/provider/acme/local_store.go @@ -7,8 +7,8 @@ import ( "os" "sync" - "github.com/containous/traefik/v2/pkg/log" - "github.com/containous/traefik/v2/pkg/safe" + "github.com/traefik/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/safe" ) var _ Store = (*LocalStore)(nil) diff --git a/pkg/provider/acme/provider.go b/pkg/provider/acme/provider.go index 6a7c2d101..715a591f8 100644 --- a/pkg/provider/acme/provider.go +++ b/pkg/provider/acme/provider.go @@ -12,13 +12,6 @@ import ( "sync" "time" - "github.com/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/log" - "github.com/containous/traefik/v2/pkg/rules" - "github.com/containous/traefik/v2/pkg/safe" - traefiktls "github.com/containous/traefik/v2/pkg/tls" - "github.com/containous/traefik/v2/pkg/types" - "github.com/containous/traefik/v2/pkg/version" "github.com/go-acme/lego/v4/certificate" "github.com/go-acme/lego/v4/challenge" "github.com/go-acme/lego/v4/challenge/dns01" @@ -26,6 +19,13 @@ import ( "github.com/go-acme/lego/v4/providers/dns" "github.com/go-acme/lego/v4/registration" ptypes "github.com/traefik/paerser/types" + "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/rules" + "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" ) // oscpMustStaple enables OSCP 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 27022910e..5174f3c14 100644 --- a/pkg/provider/acme/provider_test.go +++ b/pkg/provider/acme/provider_test.go @@ -5,10 +5,10 @@ import ( "crypto/tls" "testing" - "github.com/containous/traefik/v2/pkg/safe" - "github.com/containous/traefik/v2/pkg/types" "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" ) func TestGetUncheckedCertificates(t *testing.T) { diff --git a/pkg/provider/aggregator/aggregator.go b/pkg/provider/aggregator/aggregator.go index eab7d9d38..c74e880f6 100644 --- a/pkg/provider/aggregator/aggregator.go +++ b/pkg/provider/aggregator/aggregator.go @@ -3,12 +3,12 @@ package aggregator import ( "encoding/json" - "github.com/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/config/static" - "github.com/containous/traefik/v2/pkg/log" - "github.com/containous/traefik/v2/pkg/provider" - "github.com/containous/traefik/v2/pkg/provider/file" - "github.com/containous/traefik/v2/pkg/safe" + "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v2/pkg/config/static" + "github.com/traefik/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/provider" + "github.com/traefik/traefik/v2/pkg/provider/file" + "github.com/traefik/traefik/v2/pkg/safe" ) // ProviderAggregator aggregates providers. diff --git a/pkg/provider/configuration.go b/pkg/provider/configuration.go index 083f6a2c7..32cfd9b1b 100644 --- a/pkg/provider/configuration.go +++ b/pkg/provider/configuration.go @@ -10,8 +10,8 @@ import ( "unicode" "github.com/Masterminds/sprig" - "github.com/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v2/pkg/log" ) // Merge Merges multiple configurations. diff --git a/pkg/provider/consulcatalog/config.go b/pkg/provider/consulcatalog/config.go index 679600880..66f43dd22 100644 --- a/pkg/provider/consulcatalog/config.go +++ b/pkg/provider/consulcatalog/config.go @@ -6,12 +6,12 @@ import ( "fmt" "net" - "github.com/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/config/label" - "github.com/containous/traefik/v2/pkg/log" - "github.com/containous/traefik/v2/pkg/provider" - "github.com/containous/traefik/v2/pkg/provider/constraints" "github.com/hashicorp/consul/api" + "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v2/pkg/config/label" + "github.com/traefik/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/provider" + "github.com/traefik/traefik/v2/pkg/provider/constraints" ) func (p *Provider) buildConfiguration(ctx context.Context, items []itemData) *dynamic.Configuration { diff --git a/pkg/provider/consulcatalog/config_test.go b/pkg/provider/consulcatalog/config_test.go index 732fe9dcc..73713215e 100644 --- a/pkg/provider/consulcatalog/config_test.go +++ b/pkg/provider/consulcatalog/config_test.go @@ -5,10 +5,10 @@ import ( "fmt" "testing" - "github.com/containous/traefik/v2/pkg/config/dynamic" "github.com/hashicorp/consul/api" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/traefik/traefik/v2/pkg/config/dynamic" ) func Int(v int) *int { return &v } diff --git a/pkg/provider/consulcatalog/consul_catalog.go b/pkg/provider/consulcatalog/consul_catalog.go index 12aeb1456..55ecaad1a 100644 --- a/pkg/provider/consulcatalog/consul_catalog.go +++ b/pkg/provider/consulcatalog/consul_catalog.go @@ -9,15 +9,15 @@ import ( "time" "github.com/cenkalti/backoff/v4" - "github.com/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/job" - "github.com/containous/traefik/v2/pkg/log" - "github.com/containous/traefik/v2/pkg/provider" - "github.com/containous/traefik/v2/pkg/provider/constraints" - "github.com/containous/traefik/v2/pkg/safe" - "github.com/containous/traefik/v2/pkg/types" "github.com/hashicorp/consul/api" 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/log" + "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" ) // DefaultTemplateRule The default template for the default rule. diff --git a/pkg/provider/consulcatalog/label.go b/pkg/provider/consulcatalog/label.go index a60ae96c0..45e2ebc32 100644 --- a/pkg/provider/consulcatalog/label.go +++ b/pkg/provider/consulcatalog/label.go @@ -1,7 +1,7 @@ package consulcatalog import ( - "github.com/containous/traefik/v2/pkg/config/label" + "github.com/traefik/traefik/v2/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 3fb4e3f7c..fe1e6c655 100644 --- a/pkg/provider/docker/config.go +++ b/pkg/provider/docker/config.go @@ -7,12 +7,12 @@ import ( "net" "strings" - "github.com/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/config/label" - "github.com/containous/traefik/v2/pkg/log" - "github.com/containous/traefik/v2/pkg/provider" - "github.com/containous/traefik/v2/pkg/provider/constraints" "github.com/docker/go-connections/nat" + "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v2/pkg/config/label" + "github.com/traefik/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/provider" + "github.com/traefik/traefik/v2/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 c49594d1b..a487b2f5f 100644 --- a/pkg/provider/docker/config_test.go +++ b/pkg/provider/docker/config_test.go @@ -5,12 +5,12 @@ import ( "strconv" "testing" - "github.com/containous/traefik/v2/pkg/config/dynamic" docker "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/swarm" "github.com/docker/go-connections/nat" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/traefik/traefik/v2/pkg/config/dynamic" ) func Int(v int) *int { return &v } diff --git a/pkg/provider/docker/docker.go b/pkg/provider/docker/docker.go index 49f51eded..1aad0a8a5 100644 --- a/pkg/provider/docker/docker.go +++ b/pkg/provider/docker/docker.go @@ -12,13 +12,6 @@ import ( "time" "github.com/cenkalti/backoff/v4" - "github.com/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/job" - "github.com/containous/traefik/v2/pkg/log" - "github.com/containous/traefik/v2/pkg/provider" - "github.com/containous/traefik/v2/pkg/safe" - "github.com/containous/traefik/v2/pkg/types" - "github.com/containous/traefik/v2/pkg/version" "github.com/docker/cli/cli/connhelper" dockertypes "github.com/docker/docker/api/types" dockercontainertypes "github.com/docker/docker/api/types/container" @@ -30,6 +23,13 @@ import ( "github.com/docker/go-connections/nat" "github.com/docker/go-connections/sockets" 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/log" + "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" ) const ( @@ -365,7 +365,7 @@ func inspectContainers(ctx context.Context, dockerClient client.ContainerAPIClie return dockerData{} } - // This condition is here to avoid to have empty IP https://github.com/containous/traefik/issues/2459 + // This condition is here to avoid to have empty IP https://github.com/traefik/traefik/issues/2459 // We register only container which are running if containerInspected.ContainerJSONBase != nil && containerInspected.ContainerJSONBase.State != nil && containerInspected.ContainerJSONBase.State.Running { return parseContainer(containerInspected) diff --git a/pkg/provider/docker/label.go b/pkg/provider/docker/label.go index c83b90f72..f86de2166 100644 --- a/pkg/provider/docker/label.go +++ b/pkg/provider/docker/label.go @@ -3,7 +3,7 @@ package docker import ( "fmt" - "github.com/containous/traefik/v2/pkg/config/label" + "github.com/traefik/traefik/v2/pkg/config/label" ) const ( diff --git a/pkg/provider/ecs/config.go b/pkg/provider/ecs/config.go index 2bb0ad712..225669408 100644 --- a/pkg/provider/ecs/config.go +++ b/pkg/provider/ecs/config.go @@ -9,12 +9,12 @@ import ( "strings" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/config/label" - "github.com/containous/traefik/v2/pkg/log" - "github.com/containous/traefik/v2/pkg/provider" - "github.com/containous/traefik/v2/pkg/provider/constraints" "github.com/docker/go-connections/nat" + "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v2/pkg/config/label" + "github.com/traefik/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/provider" + "github.com/traefik/traefik/v2/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 89bd8195e..56aab1869 100644 --- a/pkg/provider/ecs/config_test.go +++ b/pkg/provider/ecs/config_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/containous/traefik/v2/pkg/config/dynamic" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/traefik/traefik/v2/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 cfc62ef3e..8e1b4b089 100644 --- a/pkg/provider/ecs/ecs.go +++ b/pkg/provider/ecs/ecs.go @@ -15,12 +15,12 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/ecs" "github.com/cenkalti/backoff/v4" - "github.com/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/job" - "github.com/containous/traefik/v2/pkg/log" - "github.com/containous/traefik/v2/pkg/provider" - "github.com/containous/traefik/v2/pkg/safe" "github.com/patrickmn/go-cache" + "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v2/pkg/job" + "github.com/traefik/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/provider" + "github.com/traefik/traefik/v2/pkg/safe" ) // Provider holds configurations of the provider. diff --git a/pkg/provider/ecs/label.go b/pkg/provider/ecs/label.go index d73a3703f..0f3b2a8b3 100644 --- a/pkg/provider/ecs/label.go +++ b/pkg/provider/ecs/label.go @@ -1,7 +1,7 @@ package ecs import ( - "github.com/containous/traefik/v2/pkg/config/label" + "github.com/traefik/traefik/v2/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 da59d5df3..b760cfac8 100644 --- a/pkg/provider/file/file.go +++ b/pkg/provider/file/file.go @@ -12,12 +12,12 @@ import ( "text/template" "github.com/Masterminds/sprig" - "github.com/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/log" - "github.com/containous/traefik/v2/pkg/provider" - "github.com/containous/traefik/v2/pkg/safe" - "github.com/containous/traefik/v2/pkg/tls" "github.com/traefik/paerser/file" + "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/provider" + "github.com/traefik/traefik/v2/pkg/safe" + "github.com/traefik/traefik/v2/pkg/tls" "gopkg.in/fsnotify.v1" ) diff --git a/pkg/provider/file/file_test.go b/pkg/provider/file/file_test.go index 7ec7e3494..be4755766 100644 --- a/pkg/provider/file/file_test.go +++ b/pkg/provider/file/file_test.go @@ -10,10 +10,10 @@ import ( "testing" "time" - "github.com/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/safe" "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" ) type ProvideTestCase struct { diff --git a/pkg/provider/http/http.go b/pkg/provider/http/http.go index 067952b81..732b2e89f 100644 --- a/pkg/provider/http/http.go +++ b/pkg/provider/http/http.go @@ -9,15 +9,15 @@ import ( "time" "github.com/cenkalti/backoff/v4" - "github.com/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/job" - "github.com/containous/traefik/v2/pkg/log" - "github.com/containous/traefik/v2/pkg/provider" - "github.com/containous/traefik/v2/pkg/safe" - "github.com/containous/traefik/v2/pkg/tls" - "github.com/containous/traefik/v2/pkg/types" "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/log" + "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" ) var _ provider.Provider = (*Provider)(nil) diff --git a/pkg/provider/http/http_test.go b/pkg/provider/http/http_test.go index 9a11f5c1c..a1cf4bd59 100644 --- a/pkg/provider/http/http_test.go +++ b/pkg/provider/http/http_test.go @@ -8,12 +8,12 @@ import ( "testing" "time" - "github.com/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/safe" - "github.com/containous/traefik/v2/pkg/tls" "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" ) func TestProvider_Init(t *testing.T) { diff --git a/pkg/provider/kubernetes/crd/client.go b/pkg/provider/kubernetes/crd/client.go index e13e8a34c..78e22e4cc 100644 --- a/pkg/provider/kubernetes/crd/client.go +++ b/pkg/provider/kubernetes/crd/client.go @@ -6,10 +6,10 @@ import ( "io/ioutil" "time" - "github.com/containous/traefik/v2/pkg/log" - "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned" - "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/informers/externalversions" - "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + "github.com/traefik/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned" + "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/generated/informers/externalversions" + "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" corev1 "k8s.io/api/core/v1" kubeerror "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/provider/kubernetes/crd/client_mock_test.go b/pkg/provider/kubernetes/crd/client_mock_test.go index 5097120a3..07793c345 100644 --- a/pkg/provider/kubernetes/crd/client_mock_test.go +++ b/pkg/provider/kubernetes/crd/client_mock_test.go @@ -5,8 +5,8 @@ import ( "io/ioutil" "path/filepath" - "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" - "github.com/containous/traefik/v2/pkg/provider/kubernetes/k8s" + "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + "github.com/traefik/traefik/v2/pkg/provider/kubernetes/k8s" corev1 "k8s.io/api/core/v1" "k8s.io/client-go/kubernetes/scheme" ) diff --git a/pkg/provider/kubernetes/crd/fixtures/services.yml b/pkg/provider/kubernetes/crd/fixtures/services.yml index 0616140dd..72b2e1b16 100644 --- a/pkg/provider/kubernetes/crd/fixtures/services.yml +++ b/pkg/provider/kubernetes/crd/fixtures/services.yml @@ -9,7 +9,7 @@ spec: - name: web port: 80 selector: - app: containous + app: traefiklabs task: whoami --- @@ -39,7 +39,7 @@ spec: - name: web port: 8080 selector: - app: containous + app: traefiklabs task: whoami2 --- @@ -70,7 +70,7 @@ spec: port: 443 targetPort: 8443 selector: - app: containous + app: traefiklabs task: whoami2 --- @@ -101,7 +101,7 @@ spec: port: 8443 scheme: https selector: - app: containous + app: traefiklabs task: whoami3 --- diff --git a/pkg/provider/kubernetes/crd/fixtures/tcp/services.yml b/pkg/provider/kubernetes/crd/fixtures/tcp/services.yml index 373d8bb9a..7aabcb9be 100644 --- a/pkg/provider/kubernetes/crd/fixtures/tcp/services.yml +++ b/pkg/provider/kubernetes/crd/fixtures/tcp/services.yml @@ -9,7 +9,7 @@ spec: - name: myapp port: 8000 selector: - app: containous + app: traefiklabs task: whoamitcp --- @@ -39,7 +39,7 @@ spec: - name: myapp2 port: 8080 selector: - app: containous + app: traefiklabs task: whoamitcp2 --- @@ -69,7 +69,7 @@ spec: - name: websecure port: 443 selector: - app: containous + app: traefiklabs task: whoamitcptls2 --- @@ -99,7 +99,7 @@ spec: - name: myapp3 port: 8083 selector: - app: containous + app: traefiklabs task: whoamitcp3 --- diff --git a/pkg/provider/kubernetes/crd/fixtures/udp/services.yml b/pkg/provider/kubernetes/crd/fixtures/udp/services.yml index e29b194d4..c1a589cb6 100644 --- a/pkg/provider/kubernetes/crd/fixtures/udp/services.yml +++ b/pkg/provider/kubernetes/crd/fixtures/udp/services.yml @@ -9,7 +9,7 @@ spec: - name: myapp port: 8000 selector: - app: containous + app: traefiklabs task: whoamiudp --- @@ -39,7 +39,7 @@ spec: - name: myapp2 port: 8080 selector: - app: containous + app: traefiklabs task: whoamiudp2 --- @@ -69,7 +69,7 @@ spec: - name: myapp3 port: 8083 selector: - app: containous + app: traefiklabs task: whoamiudp3 --- diff --git a/pkg/provider/kubernetes/crd/fixtures/with_mirroring.yml b/pkg/provider/kubernetes/crd/fixtures/with_mirroring.yml index 0999772d6..7a9fb49c9 100644 --- a/pkg/provider/kubernetes/crd/fixtures/with_mirroring.yml +++ b/pkg/provider/kubernetes/crd/fixtures/with_mirroring.yml @@ -25,7 +25,7 @@ spec: - name: web port: 8080 selector: - app: containous + app: traefiklabs task: whoami4 ------ @@ -55,7 +55,7 @@ spec: - name: web port: 8080 selector: - app: containous + app: traefiklabs task: whoami5 --- diff --git a/pkg/provider/kubernetes/crd/fixtures/with_mirroring2.yml b/pkg/provider/kubernetes/crd/fixtures/with_mirroring2.yml index 61f6ee4b1..b43b33c1c 100644 --- a/pkg/provider/kubernetes/crd/fixtures/with_mirroring2.yml +++ b/pkg/provider/kubernetes/crd/fixtures/with_mirroring2.yml @@ -25,7 +25,7 @@ spec: - name: web port: 8080 selector: - app: containous + app: traefiklabs task: whoami4 ------ @@ -55,7 +55,7 @@ spec: - name: web port: 8080 selector: - app: containous + app: traefiklabs task: whoami5 --- diff --git a/pkg/provider/kubernetes/crd/fixtures/with_namespaces.yml b/pkg/provider/kubernetes/crd/fixtures/with_namespaces.yml index efdb3dd08..9bdf1a004 100644 --- a/pkg/provider/kubernetes/crd/fixtures/with_namespaces.yml +++ b/pkg/provider/kubernetes/crd/fixtures/with_namespaces.yml @@ -55,7 +55,7 @@ spec: - name: web port: 8080 selector: - app: containous + app: traefiklabs task: whoami6 --- @@ -70,7 +70,7 @@ spec: - name: web port: 8080 selector: - app: containous + app: traefiklabs task: whoami5 --- @@ -85,7 +85,7 @@ spec: - name: web port: 8080 selector: - app: containous + app: traefiklabs task: whoami4 --- diff --git a/pkg/provider/kubernetes/crd/fixtures/with_services_lb0.yml b/pkg/provider/kubernetes/crd/fixtures/with_services_lb0.yml index 13471f742..7a1456498 100644 --- a/pkg/provider/kubernetes/crd/fixtures/with_services_lb0.yml +++ b/pkg/provider/kubernetes/crd/fixtures/with_services_lb0.yml @@ -25,7 +25,7 @@ spec: - name: web port: 8080 selector: - app: containous + app: traefiklabs task: whoami5 --- diff --git a/pkg/provider/kubernetes/crd/fixtures/with_services_lb1.yml b/pkg/provider/kubernetes/crd/fixtures/with_services_lb1.yml index 54dbd2fc2..078b261dc 100644 --- a/pkg/provider/kubernetes/crd/fixtures/with_services_lb1.yml +++ b/pkg/provider/kubernetes/crd/fixtures/with_services_lb1.yml @@ -70,7 +70,7 @@ spec: - name: web port: 80 selector: - app: containous + app: traefiklabs task: whoami4 --- @@ -85,7 +85,7 @@ spec: - name: web port: 8080 selector: - app: containous + app: traefiklabs task: whoami5 --- @@ -100,7 +100,7 @@ spec: - name: web port: 80 selector: - app: containous + app: traefiklabs task: whoami6 --- @@ -115,7 +115,7 @@ spec: - name: web port: 8080 selector: - app: containous + app: traefiklabs task: whoami7 --- diff --git a/pkg/provider/kubernetes/crd/fixtures/with_services_lb2.yml b/pkg/provider/kubernetes/crd/fixtures/with_services_lb2.yml index 3ba1bfb59..4d99705e9 100644 --- a/pkg/provider/kubernetes/crd/fixtures/with_services_lb2.yml +++ b/pkg/provider/kubernetes/crd/fixtures/with_services_lb2.yml @@ -39,7 +39,7 @@ spec: - name: web port: 8080 selector: - app: containous + app: traefiklabs task: whoami5 --- diff --git a/pkg/provider/kubernetes/crd/fixtures/with_services_lb3.yml b/pkg/provider/kubernetes/crd/fixtures/with_services_lb3.yml index a3067183b..939cf7c7b 100644 --- a/pkg/provider/kubernetes/crd/fixtures/with_services_lb3.yml +++ b/pkg/provider/kubernetes/crd/fixtures/with_services_lb3.yml @@ -40,7 +40,7 @@ spec: - name: web port: 8080 selector: - app: containous + app: traefiklabs task: whoami5 --- @@ -55,7 +55,7 @@ spec: - name: web port: 8080 selector: - app: containous + app: traefiklabs task: whoami4 --- diff --git a/pkg/provider/kubernetes/crd/fixtures/with_services_only.yml b/pkg/provider/kubernetes/crd/fixtures/with_services_only.yml index eee0f6a28..9dabe6147 100644 --- a/pkg/provider/kubernetes/crd/fixtures/with_services_only.yml +++ b/pkg/provider/kubernetes/crd/fixtures/with_services_only.yml @@ -25,7 +25,7 @@ spec: - name: web port: 8080 selector: - app: containous + app: traefiklabs task: whoami5 --- diff --git a/pkg/provider/kubernetes/crd/generated/clientset/versioned/clientset.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/clientset.go index 9b1cca906..e69b66d3a 100644 --- a/pkg/provider/kubernetes/crd/generated/clientset/versioned/clientset.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/clientset.go @@ -1,7 +1,7 @@ /* The MIT License (MIT) -Copyright (c) 2016-2020 Containous SAS +Copyright (c) 2016-2020 Containous SAS; 2020-2020 Traefik Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -29,7 +29,7 @@ package versioned import ( "fmt" - traefikv1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1" + traefikv1alpha1 "github.com/traefik/traefik/v2/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/doc.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/doc.go index aac2a543b..1f437c656 100644 --- a/pkg/provider/kubernetes/crd/generated/clientset/versioned/doc.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/doc.go @@ -1,7 +1,7 @@ /* The MIT License (MIT) -Copyright (c) 2016-2020 Containous SAS +Copyright (c) 2016-2020 Containous SAS; 2020-2020 Traefik Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal 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 83308c07b..b1c7a5716 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 @@ -1,7 +1,7 @@ /* The MIT License (MIT) -Copyright (c) 2016-2020 Containous SAS +Copyright (c) 2016-2020 Containous SAS; 2020-2020 Traefik Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -27,9 +27,9 @@ THE SOFTWARE. package fake import ( - clientset "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned" - traefikv1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1" - faketraefikv1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake" + 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" "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/doc.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/fake/doc.go index be4688295..744fc6ba7 100644 --- a/pkg/provider/kubernetes/crd/generated/clientset/versioned/fake/doc.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/fake/doc.go @@ -1,7 +1,7 @@ /* The MIT License (MIT) -Copyright (c) 2016-2020 Containous SAS +Copyright (c) 2016-2020 Containous SAS; 2020-2020 Traefik Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal 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 18d2c5ea6..b9c736626 100644 --- a/pkg/provider/kubernetes/crd/generated/clientset/versioned/fake/register.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/fake/register.go @@ -1,7 +1,7 @@ /* The MIT License (MIT) -Copyright (c) 2016-2020 Containous SAS +Copyright (c) 2016-2020 Containous SAS; 2020-2020 Traefik Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -27,7 +27,7 @@ THE SOFTWARE. package fake import ( - traefikv1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + traefikv1alpha1 "github.com/traefik/traefik/v2/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" @@ -35,14 +35,12 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" ) -var ( - scheme = runtime.NewScheme() - codecs = serializer.NewCodecFactory(scheme) - parameterCodec = runtime.NewParameterCodec(scheme) - localSchemeBuilder = runtime.SchemeBuilder{ - traefikv1alpha1.AddToScheme, - } -) +var scheme = runtime.NewScheme() +var codecs = serializer.NewCodecFactory(scheme) +var parameterCodec = runtime.NewParameterCodec(scheme) +var localSchemeBuilder = runtime.SchemeBuilder{ + traefikv1alpha1.AddToScheme, +} // AddToScheme adds all types of this clientset into the given scheme. This allows composition // of clientsets, like in: diff --git a/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme/doc.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme/doc.go index 9d57a642e..c383a59fb 100644 --- a/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme/doc.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme/doc.go @@ -1,7 +1,7 @@ /* The MIT License (MIT) -Copyright (c) 2016-2020 Containous SAS +Copyright (c) 2016-2020 Containous SAS; 2020-2020 Traefik Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal 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 3452dc7c3..54f91c3aa 100644 --- a/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme/register.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme/register.go @@ -1,7 +1,7 @@ /* The MIT License (MIT) -Copyright (c) 2016-2020 Containous SAS +Copyright (c) 2016-2020 Containous SAS; 2020-2020 Traefik Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -27,7 +27,7 @@ THE SOFTWARE. package scheme import ( - traefikv1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + traefikv1alpha1 "github.com/traefik/traefik/v2/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" @@ -35,14 +35,12 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" ) -var ( - Scheme = runtime.NewScheme() - Codecs = serializer.NewCodecFactory(Scheme) - ParameterCodec = runtime.NewParameterCodec(Scheme) - localSchemeBuilder = runtime.SchemeBuilder{ - traefikv1alpha1.AddToScheme, - } -) +var Scheme = runtime.NewScheme() +var Codecs = serializer.NewCodecFactory(Scheme) +var ParameterCodec = runtime.NewParameterCodec(Scheme) +var localSchemeBuilder = runtime.SchemeBuilder{ + traefikv1alpha1.AddToScheme, +} // AddToScheme adds all types of this clientset into the given scheme. This allows composition // of clientsets, like in: diff --git a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/doc.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/doc.go index fce329dc2..263711cb5 100644 --- a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/doc.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/doc.go @@ -1,7 +1,7 @@ /* The MIT License (MIT) -Copyright (c) 2016-2020 Containous SAS +Copyright (c) 2016-2020 Containous SAS; 2020-2020 Traefik Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/doc.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/doc.go index 885626c8f..a2906629f 100644 --- a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/doc.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/doc.go @@ -1,7 +1,7 @@ /* The MIT License (MIT) -Copyright (c) 2016-2020 Containous SAS +Copyright (c) 2016-2020 Containous SAS; 2020-2020 Traefik Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal 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 9b59b3913..c0d828430 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 @@ -1,7 +1,7 @@ /* The MIT License (MIT) -Copyright (c) 2016-2020 Containous SAS +Copyright (c) 2016-2020 Containous SAS; 2020-2020 Traefik Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -29,7 +29,7 @@ package fake import ( "context" - v1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + v1alpha1 "github.com/traefik/traefik/v2/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" @@ -85,6 +85,7 @@ func (c *FakeIngressRoutes) List(ctx context.Context, opts v1.ListOptions) (resu func (c *FakeIngressRoutes) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) { return c.Fake. InvokesWatch(testing.NewWatchAction(ingressroutesResource, c.ns, opts)) + } // Create takes the representation of a ingressRoute and creates it. Returns the server's representation of the ingressRoute, and an error, if there is any. 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 423819c4c..a247e3cdf 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 @@ -1,7 +1,7 @@ /* The MIT License (MIT) -Copyright (c) 2016-2020 Containous SAS +Copyright (c) 2016-2020 Containous SAS; 2020-2020 Traefik Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -29,7 +29,7 @@ package fake import ( "context" - v1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + v1alpha1 "github.com/traefik/traefik/v2/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" @@ -85,6 +85,7 @@ func (c *FakeIngressRouteTCPs) List(ctx context.Context, opts v1.ListOptions) (r func (c *FakeIngressRouteTCPs) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) { return c.Fake. InvokesWatch(testing.NewWatchAction(ingressroutetcpsResource, c.ns, opts)) + } // Create takes the representation of a ingressRouteTCP and creates it. Returns the server's representation of the ingressRouteTCP, and an error, if there is any. 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 7eb8fd1d7..631820800 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 @@ -1,7 +1,7 @@ /* The MIT License (MIT) -Copyright (c) 2016-2020 Containous SAS +Copyright (c) 2016-2020 Containous SAS; 2020-2020 Traefik Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -29,7 +29,7 @@ package fake import ( "context" - v1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + v1alpha1 "github.com/traefik/traefik/v2/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" @@ -85,6 +85,7 @@ func (c *FakeIngressRouteUDPs) List(ctx context.Context, opts v1.ListOptions) (r func (c *FakeIngressRouteUDPs) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) { return c.Fake. InvokesWatch(testing.NewWatchAction(ingressrouteudpsResource, c.ns, opts)) + } // Create takes the representation of a ingressRouteUDP and creates it. Returns the server's representation of the ingressRouteUDP, and an error, if there is any. 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 82bb6a8b3..2f1462466 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 @@ -1,7 +1,7 @@ /* The MIT License (MIT) -Copyright (c) 2016-2020 Containous SAS +Copyright (c) 2016-2020 Containous SAS; 2020-2020 Traefik Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -29,7 +29,7 @@ package fake import ( "context" - v1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + v1alpha1 "github.com/traefik/traefik/v2/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" @@ -85,6 +85,7 @@ func (c *FakeMiddlewares) List(ctx context.Context, opts v1.ListOptions) (result func (c *FakeMiddlewares) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) { return c.Fake. InvokesWatch(testing.NewWatchAction(middlewaresResource, c.ns, opts)) + } // Create takes the representation of a middleware and creates it. Returns the server's representation of the middleware, and an error, if there is any. 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 ca523a715..284d55f13 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 @@ -1,7 +1,7 @@ /* The MIT License (MIT) -Copyright (c) 2016-2020 Containous SAS +Copyright (c) 2016-2020 Containous SAS; 2020-2020 Traefik Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -29,7 +29,7 @@ package fake import ( "context" - v1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + v1alpha1 "github.com/traefik/traefik/v2/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" @@ -85,6 +85,7 @@ func (c *FakeTLSOptions) List(ctx context.Context, opts v1.ListOptions) (result func (c *FakeTLSOptions) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) { return c.Fake. InvokesWatch(testing.NewWatchAction(tlsoptionsResource, c.ns, opts)) + } // Create takes the representation of a tLSOption and creates it. Returns the server's representation of the tLSOption, and an error, if there is any. 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 f2d7b5e2b..70a68debb 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 @@ -1,7 +1,7 @@ /* The MIT License (MIT) -Copyright (c) 2016-2020 Containous SAS +Copyright (c) 2016-2020 Containous SAS; 2020-2020 Traefik Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -29,7 +29,7 @@ package fake import ( "context" - v1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + v1alpha1 "github.com/traefik/traefik/v2/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" @@ -85,6 +85,7 @@ func (c *FakeTLSStores) List(ctx context.Context, opts v1.ListOptions) (result * func (c *FakeTLSStores) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) { return c.Fake. InvokesWatch(testing.NewWatchAction(tlsstoresResource, c.ns, opts)) + } // Create takes the representation of a tLSStore and creates it. Returns the server's representation of the tLSStore, and an error, if there is any. 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 ff0fdea49..56e9b0386 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 @@ -1,7 +1,7 @@ /* The MIT License (MIT) -Copyright (c) 2016-2020 Containous SAS +Copyright (c) 2016-2020 Containous SAS; 2020-2020 Traefik Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -27,7 +27,7 @@ THE SOFTWARE. package fake import ( - v1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1" + v1alpha1 "github.com/traefik/traefik/v2/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 b9d8d3842..9f1e84a92 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 @@ -1,7 +1,7 @@ /* The MIT License (MIT) -Copyright (c) 2016-2020 Containous SAS +Copyright (c) 2016-2020 Containous SAS; 2020-2020 Traefik Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -29,7 +29,7 @@ package fake import ( "context" - v1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + v1alpha1 "github.com/traefik/traefik/v2/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" @@ -85,6 +85,7 @@ func (c *FakeTraefikServices) List(ctx context.Context, opts v1.ListOptions) (re func (c *FakeTraefikServices) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) { return c.Fake. InvokesWatch(testing.NewWatchAction(traefikservicesResource, c.ns, opts)) + } // Create takes the representation of a traefikService and creates it. Returns the server's representation of the traefikService, and an error, if there is any. diff --git a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/generated_expansion.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/generated_expansion.go index 4568ff0ef..6671f44dc 100644 --- a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/generated_expansion.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/generated_expansion.go @@ -1,7 +1,7 @@ /* The MIT License (MIT) -Copyright (c) 2016-2020 Containous SAS +Copyright (c) 2016-2020 Containous SAS; 2020-2020 Traefik Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal 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 79e53b189..a5b1aebd2 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 @@ -1,7 +1,7 @@ /* The MIT License (MIT) -Copyright (c) 2016-2020 Containous SAS +Copyright (c) 2016-2020 Containous SAS; 2020-2020 Traefik Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -30,8 +30,8 @@ import ( "context" "time" - scheme "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme" - v1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + 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" 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 fad67070d..32298de56 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 @@ -1,7 +1,7 @@ /* The MIT License (MIT) -Copyright (c) 2016-2020 Containous SAS +Copyright (c) 2016-2020 Containous SAS; 2020-2020 Traefik Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -30,8 +30,8 @@ import ( "context" "time" - scheme "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme" - v1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + 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" 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 59ee2db19..10f8d5e61 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 @@ -1,7 +1,7 @@ /* The MIT License (MIT) -Copyright (c) 2016-2020 Containous SAS +Copyright (c) 2016-2020 Containous SAS; 2020-2020 Traefik Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -30,8 +30,8 @@ import ( "context" "time" - scheme "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme" - v1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + 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" 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 a3ea4ace1..c5c0c0412 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 @@ -1,7 +1,7 @@ /* The MIT License (MIT) -Copyright (c) 2016-2020 Containous SAS +Copyright (c) 2016-2020 Containous SAS; 2020-2020 Traefik Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -30,8 +30,8 @@ import ( "context" "time" - scheme "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme" - v1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + 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" 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 b8089b7f4..3c040dc74 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 @@ -1,7 +1,7 @@ /* The MIT License (MIT) -Copyright (c) 2016-2020 Containous SAS +Copyright (c) 2016-2020 Containous SAS; 2020-2020 Traefik Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -30,8 +30,8 @@ import ( "context" "time" - scheme "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme" - v1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + 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" 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 5bffdcac7..ac0dacc15 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 @@ -1,7 +1,7 @@ /* The MIT License (MIT) -Copyright (c) 2016-2020 Containous SAS +Copyright (c) 2016-2020 Containous SAS; 2020-2020 Traefik Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -30,8 +30,8 @@ import ( "context" "time" - scheme "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme" - v1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + 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" 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 42bba3996..cc0376b4e 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 @@ -1,7 +1,7 @@ /* The MIT License (MIT) -Copyright (c) 2016-2020 Containous SAS +Copyright (c) 2016-2020 Containous SAS; 2020-2020 Traefik Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -27,8 +27,8 @@ THE SOFTWARE. package v1alpha1 import ( - "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme" - v1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + "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" 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 ee9a06524..2ab02fbf7 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 @@ -1,7 +1,7 @@ /* The MIT License (MIT) -Copyright (c) 2016-2020 Containous SAS +Copyright (c) 2016-2020 Containous SAS; 2020-2020 Traefik Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -30,8 +30,8 @@ import ( "context" "time" - scheme "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme" - v1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + 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" 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 5b734a857..c33546273 100644 --- a/pkg/provider/kubernetes/crd/generated/informers/externalversions/factory.go +++ b/pkg/provider/kubernetes/crd/generated/informers/externalversions/factory.go @@ -1,7 +1,7 @@ /* The MIT License (MIT) -Copyright (c) 2016-2020 Containous SAS +Copyright (c) 2016-2020 Containous SAS; 2020-2020 Traefik Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -31,9 +31,9 @@ import ( sync "sync" time "time" - versioned "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned" - internalinterfaces "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" - traefik "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik" + 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" 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 0513a3dff..b569af9fa 100644 --- a/pkg/provider/kubernetes/crd/generated/informers/externalversions/generic.go +++ b/pkg/provider/kubernetes/crd/generated/informers/externalversions/generic.go @@ -1,7 +1,7 @@ /* The MIT License (MIT) -Copyright (c) 2016-2020 Containous SAS +Copyright (c) 2016-2020 Containous SAS; 2020-2020 Traefik Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -29,7 +29,7 @@ package externalversions import ( "fmt" - v1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + v1alpha1 "github.com/traefik/traefik/v2/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 15cda191d..ac62231c4 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 @@ -1,7 +1,7 @@ /* The MIT License (MIT) -Copyright (c) 2016-2020 Containous SAS +Copyright (c) 2016-2020 Containous SAS; 2020-2020 Traefik Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -29,7 +29,7 @@ package internalinterfaces import ( time "time" - versioned "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned" + versioned "github.com/traefik/traefik/v2/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 5a47ec73f..7c659c1a8 100644 --- a/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/interface.go +++ b/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/interface.go @@ -1,7 +1,7 @@ /* The MIT License (MIT) -Copyright (c) 2016-2020 Containous SAS +Copyright (c) 2016-2020 Containous SAS; 2020-2020 Traefik Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -27,8 +27,8 @@ THE SOFTWARE. package traefik import ( - internalinterfaces "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1" + 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" ) // 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 902d0e239..013183cc1 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 @@ -1,7 +1,7 @@ /* The MIT License (MIT) -Copyright (c) 2016-2020 Containous SAS +Copyright (c) 2016-2020 Containous SAS; 2020-2020 Traefik Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -30,10 +30,10 @@ import ( "context" time "time" - versioned "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned" - internalinterfaces "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1" - traefikv1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + 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" 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 c90ce85cc..a4446a329 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 @@ -1,7 +1,7 @@ /* The MIT License (MIT) -Copyright (c) 2016-2020 Containous SAS +Copyright (c) 2016-2020 Containous SAS; 2020-2020 Traefik Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -30,10 +30,10 @@ import ( "context" time "time" - versioned "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned" - internalinterfaces "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1" - traefikv1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + 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" 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 600eccd70..c3015bebf 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 @@ -1,7 +1,7 @@ /* The MIT License (MIT) -Copyright (c) 2016-2020 Containous SAS +Copyright (c) 2016-2020 Containous SAS; 2020-2020 Traefik Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -30,10 +30,10 @@ import ( "context" time "time" - versioned "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned" - internalinterfaces "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1" - traefikv1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + 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" 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 31d683e23..0475cc4d8 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 @@ -1,7 +1,7 @@ /* The MIT License (MIT) -Copyright (c) 2016-2020 Containous SAS +Copyright (c) 2016-2020 Containous SAS; 2020-2020 Traefik Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -27,7 +27,7 @@ THE SOFTWARE. package v1alpha1 import ( - internalinterfaces "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" + internalinterfaces "github.com/traefik/traefik/v2/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 8f9f6d4e4..f85c4b2a8 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 @@ -1,7 +1,7 @@ /* The MIT License (MIT) -Copyright (c) 2016-2020 Containous SAS +Copyright (c) 2016-2020 Containous SAS; 2020-2020 Traefik Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -30,10 +30,10 @@ import ( "context" time "time" - versioned "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned" - internalinterfaces "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1" - traefikv1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + 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" 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 a8606a6fd..ac97af0aa 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 @@ -1,7 +1,7 @@ /* The MIT License (MIT) -Copyright (c) 2016-2020 Containous SAS +Copyright (c) 2016-2020 Containous SAS; 2020-2020 Traefik Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -30,10 +30,10 @@ import ( "context" time "time" - versioned "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned" - internalinterfaces "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1" - traefikv1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + 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" 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 12be1d747..1202a60b9 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 @@ -1,7 +1,7 @@ /* The MIT License (MIT) -Copyright (c) 2016-2020 Containous SAS +Copyright (c) 2016-2020 Containous SAS; 2020-2020 Traefik Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -30,10 +30,10 @@ import ( "context" time "time" - versioned "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned" - internalinterfaces "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1" - traefikv1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + 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" 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 16266c375..e12655dfd 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 @@ -1,7 +1,7 @@ /* The MIT License (MIT) -Copyright (c) 2016-2020 Containous SAS +Copyright (c) 2016-2020 Containous SAS; 2020-2020 Traefik Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -30,10 +30,10 @@ import ( "context" time "time" - versioned "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned" - internalinterfaces "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1" - traefikv1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + 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" 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/expansion_generated.go b/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/expansion_generated.go index f1137d956..85f385885 100644 --- a/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/expansion_generated.go +++ b/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/expansion_generated.go @@ -1,7 +1,7 @@ /* The MIT License (MIT) -Copyright (c) 2016-2020 Containous SAS +Copyright (c) 2016-2020 Containous SAS; 2020-2020 Traefik Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal 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 f8de3a0a1..1446b13fd 100644 --- a/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/ingressroute.go +++ b/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/ingressroute.go @@ -1,7 +1,7 @@ /* The MIT License (MIT) -Copyright (c) 2016-2020 Containous SAS +Copyright (c) 2016-2020 Containous SAS; 2020-2020 Traefik Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -27,7 +27,7 @@ THE SOFTWARE. package v1alpha1 import ( - v1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + v1alpha1 "github.com/traefik/traefik/v2/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 71972cabe..deb666af5 100644 --- a/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/ingressroutetcp.go +++ b/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/ingressroutetcp.go @@ -1,7 +1,7 @@ /* The MIT License (MIT) -Copyright (c) 2016-2020 Containous SAS +Copyright (c) 2016-2020 Containous SAS; 2020-2020 Traefik Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -27,7 +27,7 @@ THE SOFTWARE. package v1alpha1 import ( - v1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + v1alpha1 "github.com/traefik/traefik/v2/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 0d9eef69f..55d06b13c 100644 --- a/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/ingressrouteudp.go +++ b/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/ingressrouteudp.go @@ -1,7 +1,7 @@ /* The MIT License (MIT) -Copyright (c) 2016-2020 Containous SAS +Copyright (c) 2016-2020 Containous SAS; 2020-2020 Traefik Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -27,7 +27,7 @@ THE SOFTWARE. package v1alpha1 import ( - v1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + v1alpha1 "github.com/traefik/traefik/v2/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 d794e6dc4..7f1c6da26 100644 --- a/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/middleware.go +++ b/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/middleware.go @@ -1,7 +1,7 @@ /* The MIT License (MIT) -Copyright (c) 2016-2020 Containous SAS +Copyright (c) 2016-2020 Containous SAS; 2020-2020 Traefik Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -27,7 +27,7 @@ THE SOFTWARE. package v1alpha1 import ( - v1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + v1alpha1 "github.com/traefik/traefik/v2/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 c33397a35..ed7fc31fd 100644 --- a/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/tlsoption.go +++ b/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/tlsoption.go @@ -1,7 +1,7 @@ /* The MIT License (MIT) -Copyright (c) 2016-2020 Containous SAS +Copyright (c) 2016-2020 Containous SAS; 2020-2020 Traefik Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -27,7 +27,7 @@ THE SOFTWARE. package v1alpha1 import ( - v1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + v1alpha1 "github.com/traefik/traefik/v2/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 c7983fff4..7bbbce6c0 100644 --- a/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/tlsstore.go +++ b/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/tlsstore.go @@ -1,7 +1,7 @@ /* The MIT License (MIT) -Copyright (c) 2016-2020 Containous SAS +Copyright (c) 2016-2020 Containous SAS; 2020-2020 Traefik Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -27,7 +27,7 @@ THE SOFTWARE. package v1alpha1 import ( - v1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + v1alpha1 "github.com/traefik/traefik/v2/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 c684ffa52..061e6aa77 100644 --- a/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/traefikservice.go +++ b/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/traefikservice.go @@ -1,7 +1,7 @@ /* The MIT License (MIT) -Copyright (c) 2016-2020 Containous SAS +Copyright (c) 2016-2020 Containous SAS; 2020-2020 Traefik Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -27,7 +27,7 @@ THE SOFTWARE. package v1alpha1 import ( - v1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + v1alpha1 "github.com/traefik/traefik/v2/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 630be4239..d9d07b08d 100644 --- a/pkg/provider/kubernetes/crd/kubernetes.go +++ b/pkg/provider/kubernetes/crd/kubernetes.go @@ -13,15 +13,15 @@ import ( "time" "github.com/cenkalti/backoff/v4" - "github.com/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/job" - "github.com/containous/traefik/v2/pkg/log" - "github.com/containous/traefik/v2/pkg/provider" - "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" - "github.com/containous/traefik/v2/pkg/safe" - "github.com/containous/traefik/v2/pkg/tls" "github.com/mitchellh/hashstructure" 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/log" + "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" corev1 "k8s.io/api/core/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 26d024dc3..9a28bbf43 100644 --- a/pkg/provider/kubernetes/crd/kubernetes_http.go +++ b/pkg/provider/kubernetes/crd/kubernetes_http.go @@ -6,11 +6,11 @@ import ( "fmt" "strings" - "github.com/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/log" - "github.com/containous/traefik/v2/pkg/provider" - "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" - "github.com/containous/traefik/v2/pkg/tls" + "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v2/pkg/log" + "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" corev1 "k8s.io/api/core/v1" ) diff --git a/pkg/provider/kubernetes/crd/kubernetes_tcp.go b/pkg/provider/kubernetes/crd/kubernetes_tcp.go index 54f363401..49cff4e60 100644 --- a/pkg/provider/kubernetes/crd/kubernetes_tcp.go +++ b/pkg/provider/kubernetes/crd/kubernetes_tcp.go @@ -6,10 +6,10 @@ import ( "fmt" "strings" - "github.com/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/log" - "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" - "github.com/containous/traefik/v2/pkg/tls" + "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + "github.com/traefik/traefik/v2/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 e8d68affb..73ed3588f 100644 --- a/pkg/provider/kubernetes/crd/kubernetes_test.go +++ b/pkg/provider/kubernetes/crd/kubernetes_test.go @@ -4,10 +4,10 @@ import ( "context" "testing" - "github.com/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/provider" - "github.com/containous/traefik/v2/pkg/tls" "github.com/stretchr/testify/assert" + "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v2/pkg/provider" + "github.com/traefik/traefik/v2/pkg/tls" corev1 "k8s.io/api/core/v1" ) diff --git a/pkg/provider/kubernetes/crd/kubernetes_udp.go b/pkg/provider/kubernetes/crd/kubernetes_udp.go index 611000c5a..18d4f4b65 100644 --- a/pkg/provider/kubernetes/crd/kubernetes_udp.go +++ b/pkg/provider/kubernetes/crd/kubernetes_udp.go @@ -5,9 +5,9 @@ import ( "errors" "fmt" - "github.com/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/log" - "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/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 0f3ba4f8b..1a18ec3db 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/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/types" + "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v2/pkg/types" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/provider/kubernetes/crd/traefik/v1alpha1/ingressroutetcp.go b/pkg/provider/kubernetes/crd/traefik/v1alpha1/ingressroutetcp.go index a29386bf3..d30b1b572 100644 --- a/pkg/provider/kubernetes/crd/traefik/v1alpha1/ingressroutetcp.go +++ b/pkg/provider/kubernetes/crd/traefik/v1alpha1/ingressroutetcp.go @@ -1,7 +1,7 @@ package v1alpha1 import ( - "github.com/containous/traefik/v2/pkg/types" + "github.com/traefik/traefik/v2/pkg/types" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/provider/kubernetes/crd/traefik/v1alpha1/middleware.go b/pkg/provider/kubernetes/crd/traefik/v1alpha1/middleware.go index a76568703..9dfd1e57b 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/containous/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v2/pkg/config/dynamic" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/provider/kubernetes/crd/traefik/v1alpha1/service.go b/pkg/provider/kubernetes/crd/traefik/v1alpha1/service.go index f86d6054d..2e01f8506 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/containous/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v2/pkg/config/dynamic" 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 6b580ac39..fc46eb7b4 100644 --- a/pkg/provider/kubernetes/crd/traefik/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/provider/kubernetes/crd/traefik/v1alpha1/zz_generated.deepcopy.go @@ -3,7 +3,7 @@ /* The MIT License (MIT) -Copyright (c) 2016-2020 Containous SAS +Copyright (c) 2016-2020 Containous SAS; 2020-2020 Traefik Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -29,8 +29,8 @@ THE SOFTWARE. package v1alpha1 import ( - dynamic "github.com/containous/traefik/v2/pkg/config/dynamic" - types "github.com/containous/traefik/v2/pkg/types" + dynamic "github.com/traefik/traefik/v2/pkg/config/dynamic" + types "github.com/traefik/traefik/v2/pkg/types" runtime "k8s.io/apimachinery/pkg/runtime" ) diff --git a/pkg/provider/kubernetes/ingress/annotations.go b/pkg/provider/kubernetes/ingress/annotations.go index 3f510b926..8ec767464 100644 --- a/pkg/provider/kubernetes/ingress/annotations.go +++ b/pkg/provider/kubernetes/ingress/annotations.go @@ -4,8 +4,8 @@ import ( "regexp" "strings" - "github.com/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/config/label" + "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v2/pkg/config/label" ) const ( diff --git a/pkg/provider/kubernetes/ingress/annotations_test.go b/pkg/provider/kubernetes/ingress/annotations_test.go index c62642c8d..cd2b50d5e 100644 --- a/pkg/provider/kubernetes/ingress/annotations_test.go +++ b/pkg/provider/kubernetes/ingress/annotations_test.go @@ -3,10 +3,10 @@ package ingress import ( "testing" - "github.com/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/types" "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" ) func Test_parseRouterConfig(t *testing.T) { diff --git a/pkg/provider/kubernetes/ingress/client.go b/pkg/provider/kubernetes/ingress/client.go index fc54c48d5..0012465e5 100644 --- a/pkg/provider/kubernetes/ingress/client.go +++ b/pkg/provider/kubernetes/ingress/client.go @@ -7,9 +7,9 @@ import ( "io/ioutil" "time" - "github.com/containous/traefik/v2/pkg/log" "github.com/golang/protobuf/proto" "github.com/hashicorp/go-version" + "github.com/traefik/traefik/v2/pkg/log" corev1 "k8s.io/api/core/v1" extensionsv1beta1 "k8s.io/api/extensions/v1beta1" 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 3ef9093db..e6971a1c8 100644 --- a/pkg/provider/kubernetes/ingress/client_mock_test.go +++ b/pkg/provider/kubernetes/ingress/client_mock_test.go @@ -4,8 +4,8 @@ import ( "fmt" "io/ioutil" - "github.com/containous/traefik/v2/pkg/provider/kubernetes/k8s" "github.com/hashicorp/go-version" + "github.com/traefik/traefik/v2/pkg/provider/kubernetes/k8s" corev1 "k8s.io/api/core/v1" extensionsv1beta1 "k8s.io/api/extensions/v1beta1" networkingv1beta1 "k8s.io/api/networking/v1beta1" diff --git a/pkg/provider/kubernetes/ingress/kubernetes.go b/pkg/provider/kubernetes/ingress/kubernetes.go index eefc68679..02774c224 100644 --- a/pkg/provider/kubernetes/ingress/kubernetes.go +++ b/pkg/provider/kubernetes/ingress/kubernetes.go @@ -11,14 +11,14 @@ import ( "time" "github.com/cenkalti/backoff/v4" - "github.com/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/job" - "github.com/containous/traefik/v2/pkg/log" - "github.com/containous/traefik/v2/pkg/provider" - "github.com/containous/traefik/v2/pkg/safe" - "github.com/containous/traefik/v2/pkg/tls" "github.com/mitchellh/hashstructure" 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/log" + "github.com/traefik/traefik/v2/pkg/provider" + "github.com/traefik/traefik/v2/pkg/safe" + "github.com/traefik/traefik/v2/pkg/tls" corev1 "k8s.io/api/core/v1" networkingv1beta1 "k8s.io/api/networking/v1beta1" "k8s.io/apimachinery/pkg/labels" diff --git a/pkg/provider/kubernetes/ingress/kubernetes_test.go b/pkg/provider/kubernetes/ingress/kubernetes_test.go index f1daee211..253b62f47 100644 --- a/pkg/provider/kubernetes/ingress/kubernetes_test.go +++ b/pkg/provider/kubernetes/ingress/kubernetes_test.go @@ -8,11 +8,11 @@ import ( "strings" "testing" - "github.com/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/provider" - "github.com/containous/traefik/v2/pkg/tls" - "github.com/containous/traefik/v2/pkg/types" "github.com/stretchr/testify/assert" + "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" corev1 "k8s.io/api/core/v1" "k8s.io/api/networking/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/provider/kubernetes/k8s/parser.go b/pkg/provider/kubernetes/k8s/parser.go index 75f67c5c1..2e926bc64 100644 --- a/pkg/provider/kubernetes/k8s/parser.go +++ b/pkg/provider/kubernetes/k8s/parser.go @@ -5,7 +5,7 @@ import ( "regexp" "strings" - "github.com/containous/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/log" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/kubernetes/scheme" ) diff --git a/pkg/provider/kv/consul/consul.go b/pkg/provider/kv/consul/consul.go index 77eb44bb4..ecff63a62 100644 --- a/pkg/provider/kv/consul/consul.go +++ b/pkg/provider/kv/consul/consul.go @@ -2,8 +2,8 @@ package consul import ( "github.com/abronan/valkeyrie/store" - "github.com/containous/traefik/v2/pkg/provider" - "github.com/containous/traefik/v2/pkg/provider/kv" + "github.com/traefik/traefik/v2/pkg/provider" + "github.com/traefik/traefik/v2/pkg/provider/kv" ) var _ provider.Provider = (*Provider)(nil) diff --git a/pkg/provider/kv/etcd/etcd.go b/pkg/provider/kv/etcd/etcd.go index 3264140b3..57f5bc4e5 100644 --- a/pkg/provider/kv/etcd/etcd.go +++ b/pkg/provider/kv/etcd/etcd.go @@ -2,8 +2,8 @@ package etcd import ( "github.com/abronan/valkeyrie/store" - "github.com/containous/traefik/v2/pkg/provider" - "github.com/containous/traefik/v2/pkg/provider/kv" + "github.com/traefik/traefik/v2/pkg/provider" + "github.com/traefik/traefik/v2/pkg/provider/kv" ) var _ provider.Provider = (*Provider)(nil) diff --git a/pkg/provider/kv/kv.go b/pkg/provider/kv/kv.go index a661b3e94..d62b142c5 100644 --- a/pkg/provider/kv/kv.go +++ b/pkg/provider/kv/kv.go @@ -14,12 +14,12 @@ import ( "github.com/abronan/valkeyrie/store/redis" "github.com/abronan/valkeyrie/store/zookeeper" "github.com/cenkalti/backoff/v4" - "github.com/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/config/kv" - "github.com/containous/traefik/v2/pkg/job" - "github.com/containous/traefik/v2/pkg/log" - "github.com/containous/traefik/v2/pkg/safe" - "github.com/containous/traefik/v2/pkg/types" + "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/log" + "github.com/traefik/traefik/v2/pkg/safe" + "github.com/traefik/traefik/v2/pkg/types" ) // Provider holds configurations of the provider. diff --git a/pkg/provider/kv/kv_test.go b/pkg/provider/kv/kv_test.go index aa2ebf304..d2dcda5f9 100644 --- a/pkg/provider/kv/kv_test.go +++ b/pkg/provider/kv/kv_test.go @@ -7,12 +7,12 @@ import ( "time" "github.com/abronan/valkeyrie/store" - "github.com/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/tls" - "github.com/containous/traefik/v2/pkg/types" "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" ) func Test_buildConfiguration(t *testing.T) { diff --git a/pkg/provider/kv/redis/redis.go b/pkg/provider/kv/redis/redis.go index c4b33a67e..ee3796985 100644 --- a/pkg/provider/kv/redis/redis.go +++ b/pkg/provider/kv/redis/redis.go @@ -2,8 +2,8 @@ package redis import ( "github.com/abronan/valkeyrie/store" - "github.com/containous/traefik/v2/pkg/provider" - "github.com/containous/traefik/v2/pkg/provider/kv" + "github.com/traefik/traefik/v2/pkg/provider" + "github.com/traefik/traefik/v2/pkg/provider/kv" ) var _ provider.Provider = (*Provider)(nil) diff --git a/pkg/provider/kv/storewrapper.go b/pkg/provider/kv/storewrapper.go index 0c68a3b4f..3015f5ded 100644 --- a/pkg/provider/kv/storewrapper.go +++ b/pkg/provider/kv/storewrapper.go @@ -2,7 +2,7 @@ package kv import ( "github.com/abronan/valkeyrie/store" - "github.com/containous/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/log" ) type storeWrapper struct { diff --git a/pkg/provider/kv/zk/zk.go b/pkg/provider/kv/zk/zk.go index f71388e54..f8af67748 100644 --- a/pkg/provider/kv/zk/zk.go +++ b/pkg/provider/kv/zk/zk.go @@ -2,8 +2,8 @@ package zk import ( "github.com/abronan/valkeyrie/store" - "github.com/containous/traefik/v2/pkg/provider" - "github.com/containous/traefik/v2/pkg/provider/kv" + "github.com/traefik/traefik/v2/pkg/provider" + "github.com/traefik/traefik/v2/pkg/provider/kv" ) var _ provider.Provider = (*Provider)(nil) diff --git a/pkg/provider/marathon/config.go b/pkg/provider/marathon/config.go index f0cb27a02..3b8c94ad7 100644 --- a/pkg/provider/marathon/config.go +++ b/pkg/provider/marathon/config.go @@ -9,12 +9,12 @@ import ( "strconv" "strings" - "github.com/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/config/label" - "github.com/containous/traefik/v2/pkg/log" - "github.com/containous/traefik/v2/pkg/provider" - "github.com/containous/traefik/v2/pkg/provider/constraints" "github.com/gambol99/go-marathon" + "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v2/pkg/config/label" + "github.com/traefik/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/provider" + "github.com/traefik/traefik/v2/pkg/provider/constraints" ) func (p *Provider) buildConfiguration(ctx context.Context, applications *marathon.Applications) *dynamic.Configuration { diff --git a/pkg/provider/marathon/config_test.go b/pkg/provider/marathon/config_test.go index d8862e78e..6f4dac9b7 100644 --- a/pkg/provider/marathon/config_test.go +++ b/pkg/provider/marathon/config_test.go @@ -5,10 +5,10 @@ import ( "math" "testing" - "github.com/containous/traefik/v2/pkg/config/dynamic" "github.com/gambol99/go-marathon" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/traefik/traefik/v2/pkg/config/dynamic" ) func Int(v int) *int { return &v } diff --git a/pkg/provider/marathon/fake_client_test.go b/pkg/provider/marathon/fake_client_test.go index 978f5d57c..c30941482 100644 --- a/pkg/provider/marathon/fake_client_test.go +++ b/pkg/provider/marathon/fake_client_test.go @@ -3,9 +3,9 @@ package marathon import ( "errors" - "github.com/containous/traefik/v2/pkg/provider/marathon/mocks" "github.com/gambol99/go-marathon" "github.com/stretchr/testify/mock" + "github.com/traefik/traefik/v2/pkg/provider/marathon/mocks" ) type fakeClient struct { diff --git a/pkg/provider/marathon/label.go b/pkg/provider/marathon/label.go index eb7773ed6..f6da87870 100644 --- a/pkg/provider/marathon/label.go +++ b/pkg/provider/marathon/label.go @@ -3,8 +3,8 @@ package marathon import ( "math" - "github.com/containous/traefik/v2/pkg/config/label" "github.com/gambol99/go-marathon" + "github.com/traefik/traefik/v2/pkg/config/label" ) type configuration struct { diff --git a/pkg/provider/marathon/marathon.go b/pkg/provider/marathon/marathon.go index 2ba0f0fcd..b4e2d877f 100644 --- a/pkg/provider/marathon/marathon.go +++ b/pkg/provider/marathon/marathon.go @@ -10,15 +10,15 @@ import ( "time" "github.com/cenkalti/backoff/v4" - "github.com/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/job" - "github.com/containous/traefik/v2/pkg/log" - "github.com/containous/traefik/v2/pkg/provider" - "github.com/containous/traefik/v2/pkg/safe" - "github.com/containous/traefik/v2/pkg/types" "github.com/gambol99/go-marathon" "github.com/sirupsen/logrus" 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/log" + "github.com/traefik/traefik/v2/pkg/provider" + "github.com/traefik/traefik/v2/pkg/safe" + "github.com/traefik/traefik/v2/pkg/types" ) const ( diff --git a/pkg/provider/marathon/readiness.go b/pkg/provider/marathon/readiness.go index 1d462115f..df6559968 100644 --- a/pkg/provider/marathon/readiness.go +++ b/pkg/provider/marathon/readiness.go @@ -3,8 +3,8 @@ package marathon import ( "time" - "github.com/containous/traefik/v2/pkg/log" "github.com/gambol99/go-marathon" + "github.com/traefik/traefik/v2/pkg/log" ) const ( diff --git a/pkg/provider/provider.go b/pkg/provider/provider.go index df7d65734..70b053055 100644 --- a/pkg/provider/provider.go +++ b/pkg/provider/provider.go @@ -1,8 +1,8 @@ package provider import ( - "github.com/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/safe" + "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v2/pkg/safe" ) // Provider defines methods of a provider. diff --git a/pkg/provider/rancher/config.go b/pkg/provider/rancher/config.go index 4f7fd8685..711ed5bb1 100644 --- a/pkg/provider/rancher/config.go +++ b/pkg/provider/rancher/config.go @@ -7,11 +7,11 @@ import ( "net" "strings" - "github.com/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/config/label" - "github.com/containous/traefik/v2/pkg/log" - "github.com/containous/traefik/v2/pkg/provider" - "github.com/containous/traefik/v2/pkg/provider/constraints" + "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v2/pkg/config/label" + "github.com/traefik/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/provider" + "github.com/traefik/traefik/v2/pkg/provider/constraints" ) func (p *Provider) buildConfiguration(ctx context.Context, services []rancherData) *dynamic.Configuration { diff --git a/pkg/provider/rancher/config_test.go b/pkg/provider/rancher/config_test.go index 4c834cfc0..6111ab17b 100644 --- a/pkg/provider/rancher/config_test.go +++ b/pkg/provider/rancher/config_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/containous/traefik/v2/pkg/config/dynamic" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/traefik/traefik/v2/pkg/config/dynamic" ) func Int(v int) *int { return &v } diff --git a/pkg/provider/rancher/label.go b/pkg/provider/rancher/label.go index bf4749f0d..6e90a6098 100644 --- a/pkg/provider/rancher/label.go +++ b/pkg/provider/rancher/label.go @@ -1,7 +1,7 @@ package rancher import ( - "github.com/containous/traefik/v2/pkg/config/label" + "github.com/traefik/traefik/v2/pkg/config/label" ) type configuration struct { diff --git a/pkg/provider/rancher/rancher.go b/pkg/provider/rancher/rancher.go index b0329e894..e11db7c9e 100644 --- a/pkg/provider/rancher/rancher.go +++ b/pkg/provider/rancher/rancher.go @@ -7,12 +7,12 @@ import ( "time" "github.com/cenkalti/backoff/v4" - "github.com/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/job" - "github.com/containous/traefik/v2/pkg/log" - "github.com/containous/traefik/v2/pkg/provider" - "github.com/containous/traefik/v2/pkg/safe" rancher "github.com/rancher/go-rancher-metadata/metadata" + "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v2/pkg/job" + "github.com/traefik/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/provider" + "github.com/traefik/traefik/v2/pkg/safe" ) const ( diff --git a/pkg/provider/rest/rest.go b/pkg/provider/rest/rest.go index 09d989da8..14be6ab65 100644 --- a/pkg/provider/rest/rest.go +++ b/pkg/provider/rest/rest.go @@ -5,11 +5,11 @@ import ( "fmt" "net/http" - "github.com/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/log" - "github.com/containous/traefik/v2/pkg/provider" - "github.com/containous/traefik/v2/pkg/safe" "github.com/gorilla/mux" + "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/provider" + "github.com/traefik/traefik/v2/pkg/safe" "github.com/unrolled/render" ) diff --git a/pkg/provider/traefik/internal.go b/pkg/provider/traefik/internal.go index 4c341f56b..f0df731fa 100644 --- a/pkg/provider/traefik/internal.go +++ b/pkg/provider/traefik/internal.go @@ -7,12 +7,12 @@ import ( "net" "regexp" - "github.com/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/config/static" - "github.com/containous/traefik/v2/pkg/log" - "github.com/containous/traefik/v2/pkg/provider" - "github.com/containous/traefik/v2/pkg/safe" - "github.com/containous/traefik/v2/pkg/tls" + "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v2/pkg/config/static" + "github.com/traefik/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/provider" + "github.com/traefik/traefik/v2/pkg/safe" + "github.com/traefik/traefik/v2/pkg/tls" ) const defaultInternalEntryPointName = "traefik" diff --git a/pkg/provider/traefik/internal_test.go b/pkg/provider/traefik/internal_test.go index b9e0af9c4..547955413 100644 --- a/pkg/provider/traefik/internal_test.go +++ b/pkg/provider/traefik/internal_test.go @@ -8,12 +8,12 @@ import ( "path/filepath" "testing" - "github.com/containous/traefik/v2/pkg/config/static" - "github.com/containous/traefik/v2/pkg/ping" - "github.com/containous/traefik/v2/pkg/provider/rest" - "github.com/containous/traefik/v2/pkg/types" "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" ) var updateExpected = flag.Bool("update_expected", false, "Update expected files in fixtures") diff --git a/pkg/rules/rules.go b/pkg/rules/rules.go index 739c63113..469bcbe56 100644 --- a/pkg/rules/rules.go +++ b/pkg/rules/rules.go @@ -5,9 +5,9 @@ import ( "net/http" "strings" - "github.com/containous/traefik/v2/pkg/log" - "github.com/containous/traefik/v2/pkg/middlewares/requestdecorator" "github.com/gorilla/mux" + "github.com/traefik/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/middlewares/requestdecorator" "github.com/vulcand/predicate" ) diff --git a/pkg/rules/rules_test.go b/pkg/rules/rules_test.go index 68787ebf5..a6a79eace 100644 --- a/pkg/rules/rules_test.go +++ b/pkg/rules/rules_test.go @@ -5,11 +5,11 @@ import ( "net/http/httptest" "testing" - "github.com/containous/traefik/v2/pkg/middlewares/requestdecorator" - "github.com/containous/traefik/v2/pkg/testhelpers" "github.com/gorilla/mux" "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" ) func Test_addRoute(t *testing.T) { diff --git a/pkg/safe/routine.go b/pkg/safe/routine.go index 06fae8f55..71af2530d 100644 --- a/pkg/safe/routine.go +++ b/pkg/safe/routine.go @@ -7,7 +7,7 @@ import ( "sync" "github.com/cenkalti/backoff/v4" - "github.com/containous/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/log" ) type routineCtx func(ctx context.Context) diff --git a/pkg/server/aggregator.go b/pkg/server/aggregator.go index e23ee8f10..1a4f990de 100644 --- a/pkg/server/aggregator.go +++ b/pkg/server/aggregator.go @@ -1,10 +1,10 @@ package server import ( - "github.com/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/log" - "github.com/containous/traefik/v2/pkg/server/provider" - "github.com/containous/traefik/v2/pkg/tls" + "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/server/provider" + "github.com/traefik/traefik/v2/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 21d224916..1888961cd 100644 --- a/pkg/server/aggregator_test.go +++ b/pkg/server/aggregator_test.go @@ -3,9 +3,9 @@ package server import ( "testing" - "github.com/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/tls" "github.com/stretchr/testify/assert" + "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v2/pkg/tls" ) func Test_mergeConfiguration(t *testing.T) { diff --git a/pkg/server/configurationwatcher.go b/pkg/server/configurationwatcher.go index 0fcd1c204..260dcfb07 100644 --- a/pkg/server/configurationwatcher.go +++ b/pkg/server/configurationwatcher.go @@ -6,12 +6,12 @@ import ( "reflect" "time" - "github.com/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/log" - "github.com/containous/traefik/v2/pkg/provider" - "github.com/containous/traefik/v2/pkg/safe" "github.com/eapache/channels" "github.com/sirupsen/logrus" + "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/provider" + "github.com/traefik/traefik/v2/pkg/safe" ) // ConfigurationWatcher watches configuration changes. diff --git a/pkg/server/configurationwatcher_test.go b/pkg/server/configurationwatcher_test.go index 2078cc032..44c4454b1 100644 --- a/pkg/server/configurationwatcher_test.go +++ b/pkg/server/configurationwatcher_test.go @@ -7,11 +7,11 @@ import ( "testing" "time" - "github.com/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/safe" - th "github.com/containous/traefik/v2/pkg/testhelpers" - "github.com/containous/traefik/v2/pkg/tls" "github.com/stretchr/testify/assert" + "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v2/pkg/safe" + th "github.com/traefik/traefik/v2/pkg/testhelpers" + "github.com/traefik/traefik/v2/pkg/tls" ) type mockProvider struct { diff --git a/pkg/server/cookie/cookie.go b/pkg/server/cookie/cookie.go index 9c85c73f4..718e0ce15 100644 --- a/pkg/server/cookie/cookie.go +++ b/pkg/server/cookie/cookie.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/containous/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/log" ) const cookieNameLength = 6 diff --git a/pkg/server/cookie/cookie_test.go b/pkg/server/cookie/cookie_test.go index 799b906f3..125e9dce1 100644 --- a/pkg/server/cookie/cookie_test.go +++ b/pkg/server/cookie/cookie_test.go @@ -27,9 +27,9 @@ func TestGetName(t *testing.T) { }, { desc: "with backend name, with cookie name", - cookieName: "containous", - backendName: "treafik", - expectedCookieName: "containous", + cookieName: "cookie", + backendName: "backend", + expectedCookieName: "cookie", }, } @@ -76,8 +76,8 @@ func Test_sanitizeName(t *testing.T) { } func TestGenerateName(t *testing.T) { - cookieName := GenerateName("containous") + cookieName := GenerateName("backend") - assert.Len(t, "_8a7bc", 6) - assert.Equal(t, "_8a7bc", cookieName) + assert.Len(t, "_76eb3", 6) + assert.Equal(t, "_76eb3", cookieName) } diff --git a/pkg/server/middleware/chainbuilder.go b/pkg/server/middleware/chainbuilder.go index fec69b37e..1f7a70ef3 100644 --- a/pkg/server/middleware/chainbuilder.go +++ b/pkg/server/middleware/chainbuilder.go @@ -4,15 +4,15 @@ import ( "context" "github.com/containous/alice" - "github.com/containous/traefik/v2/pkg/config/static" - "github.com/containous/traefik/v2/pkg/log" - "github.com/containous/traefik/v2/pkg/metrics" - "github.com/containous/traefik/v2/pkg/middlewares/accesslog" - metricsmiddleware "github.com/containous/traefik/v2/pkg/middlewares/metrics" - "github.com/containous/traefik/v2/pkg/middlewares/requestdecorator" - mTracing "github.com/containous/traefik/v2/pkg/middlewares/tracing" - "github.com/containous/traefik/v2/pkg/tracing" - "github.com/containous/traefik/v2/pkg/tracing/jaeger" + "github.com/traefik/traefik/v2/pkg/config/static" + "github.com/traefik/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/metrics" + "github.com/traefik/traefik/v2/pkg/middlewares/accesslog" + metricsmiddleware "github.com/traefik/traefik/v2/pkg/middlewares/metrics" + "github.com/traefik/traefik/v2/pkg/middlewares/requestdecorator" + mTracing "github.com/traefik/traefik/v2/pkg/middlewares/tracing" + "github.com/traefik/traefik/v2/pkg/tracing" + "github.com/traefik/traefik/v2/pkg/tracing/jaeger" ) // 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 e38286bec..66b7aca45 100644 --- a/pkg/server/middleware/middlewares.go +++ b/pkg/server/middleware/middlewares.go @@ -8,27 +8,27 @@ import ( "strings" "github.com/containous/alice" - "github.com/containous/traefik/v2/pkg/config/runtime" - "github.com/containous/traefik/v2/pkg/middlewares/addprefix" - "github.com/containous/traefik/v2/pkg/middlewares/auth" - "github.com/containous/traefik/v2/pkg/middlewares/buffering" - "github.com/containous/traefik/v2/pkg/middlewares/chain" - "github.com/containous/traefik/v2/pkg/middlewares/circuitbreaker" - "github.com/containous/traefik/v2/pkg/middlewares/compress" - "github.com/containous/traefik/v2/pkg/middlewares/customerrors" - "github.com/containous/traefik/v2/pkg/middlewares/headers" - "github.com/containous/traefik/v2/pkg/middlewares/inflightreq" - "github.com/containous/traefik/v2/pkg/middlewares/ipwhitelist" - "github.com/containous/traefik/v2/pkg/middlewares/passtlsclientcert" - "github.com/containous/traefik/v2/pkg/middlewares/ratelimiter" - "github.com/containous/traefik/v2/pkg/middlewares/redirect" - "github.com/containous/traefik/v2/pkg/middlewares/replacepath" - "github.com/containous/traefik/v2/pkg/middlewares/replacepathregex" - "github.com/containous/traefik/v2/pkg/middlewares/retry" - "github.com/containous/traefik/v2/pkg/middlewares/stripprefix" - "github.com/containous/traefik/v2/pkg/middlewares/stripprefixregex" - "github.com/containous/traefik/v2/pkg/middlewares/tracing" - "github.com/containous/traefik/v2/pkg/server/provider" + "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/customerrors" + "github.com/traefik/traefik/v2/pkg/middlewares/headers" + "github.com/traefik/traefik/v2/pkg/middlewares/inflightreq" + "github.com/traefik/traefik/v2/pkg/middlewares/ipwhitelist" + "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" ) type middlewareStackType int diff --git a/pkg/server/middleware/middlewares_test.go b/pkg/server/middleware/middlewares_test.go index 68008b644..5d8db1aa8 100644 --- a/pkg/server/middleware/middlewares_test.go +++ b/pkg/server/middleware/middlewares_test.go @@ -7,11 +7,11 @@ import ( "net/http/httptest" "testing" - "github.com/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/config/runtime" - "github.com/containous/traefik/v2/pkg/server/provider" "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" ) func TestBuilder_BuildChainNilConfig(t *testing.T) { diff --git a/pkg/server/middleware/plugins.go b/pkg/server/middleware/plugins.go index da2d60970..6b73d91dd 100644 --- a/pkg/server/middleware/plugins.go +++ b/pkg/server/middleware/plugins.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" - "github.com/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/plugins" + "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v2/pkg/plugins" ) // PluginsBuilder the plugin's builder interface. diff --git a/pkg/server/provider/provider.go b/pkg/server/provider/provider.go index fdf66d7d1..be46c1201 100644 --- a/pkg/server/provider/provider.go +++ b/pkg/server/provider/provider.go @@ -4,7 +4,7 @@ import ( "context" "strings" - "github.com/containous/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/log" ) type contextKey int diff --git a/pkg/server/router/router.go b/pkg/server/router/router.go index 994e0a595..965dd9fa4 100644 --- a/pkg/server/router/router.go +++ b/pkg/server/router/router.go @@ -6,14 +6,14 @@ import ( "net/http" "github.com/containous/alice" - "github.com/containous/traefik/v2/pkg/config/runtime" - "github.com/containous/traefik/v2/pkg/log" - "github.com/containous/traefik/v2/pkg/middlewares/accesslog" - "github.com/containous/traefik/v2/pkg/middlewares/recovery" - "github.com/containous/traefik/v2/pkg/middlewares/tracing" - "github.com/containous/traefik/v2/pkg/rules" - "github.com/containous/traefik/v2/pkg/server/middleware" - "github.com/containous/traefik/v2/pkg/server/provider" + "github.com/traefik/traefik/v2/pkg/config/runtime" + "github.com/traefik/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/middlewares/accesslog" + "github.com/traefik/traefik/v2/pkg/middlewares/recovery" + "github.com/traefik/traefik/v2/pkg/middlewares/tracing" + "github.com/traefik/traefik/v2/pkg/rules" + "github.com/traefik/traefik/v2/pkg/server/middleware" + "github.com/traefik/traefik/v2/pkg/server/provider" ) const ( diff --git a/pkg/server/router/router_test.go b/pkg/server/router/router_test.go index ed41ed1d0..703de3c37 100644 --- a/pkg/server/router/router_test.go +++ b/pkg/server/router/router_test.go @@ -8,17 +8,17 @@ import ( "strings" "testing" - "github.com/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/config/runtime" - "github.com/containous/traefik/v2/pkg/config/static" - "github.com/containous/traefik/v2/pkg/middlewares/accesslog" - "github.com/containous/traefik/v2/pkg/middlewares/requestdecorator" - "github.com/containous/traefik/v2/pkg/server/middleware" - "github.com/containous/traefik/v2/pkg/server/service" - "github.com/containous/traefik/v2/pkg/testhelpers" - "github.com/containous/traefik/v2/pkg/types" "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/middlewares/accesslog" + "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/types" ) func TestRouterManager_Get(t *testing.T) { diff --git a/pkg/server/router/tcp/router.go b/pkg/server/router/tcp/router.go index f164039c7..ed8bc8ff9 100644 --- a/pkg/server/router/tcp/router.go +++ b/pkg/server/router/tcp/router.go @@ -9,13 +9,13 @@ import ( "net/http" "strings" - "github.com/containous/traefik/v2/pkg/config/runtime" - "github.com/containous/traefik/v2/pkg/log" - "github.com/containous/traefik/v2/pkg/rules" - "github.com/containous/traefik/v2/pkg/server/provider" - tcpservice "github.com/containous/traefik/v2/pkg/server/service/tcp" - "github.com/containous/traefik/v2/pkg/tcp" - traefiktls "github.com/containous/traefik/v2/pkg/tls" + "github.com/traefik/traefik/v2/pkg/config/runtime" + "github.com/traefik/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/rules" + "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" ) const ( diff --git a/pkg/server/router/tcp/router_test.go b/pkg/server/router/tcp/router_test.go index 935bbffe4..6a966b79d 100644 --- a/pkg/server/router/tcp/router_test.go +++ b/pkg/server/router/tcp/router_test.go @@ -4,11 +4,11 @@ import ( "context" "testing" - "github.com/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/config/runtime" - "github.com/containous/traefik/v2/pkg/server/service/tcp" - "github.com/containous/traefik/v2/pkg/tls" "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/tcp" + "github.com/traefik/traefik/v2/pkg/tls" ) func TestRuntimeConfiguration(t *testing.T) { diff --git a/pkg/server/router/udp/router.go b/pkg/server/router/udp/router.go index ea67f2564..8fb607c8d 100644 --- a/pkg/server/router/udp/router.go +++ b/pkg/server/router/udp/router.go @@ -5,11 +5,11 @@ import ( "errors" "sort" - "github.com/containous/traefik/v2/pkg/config/runtime" - "github.com/containous/traefik/v2/pkg/log" - "github.com/containous/traefik/v2/pkg/server/provider" - udpservice "github.com/containous/traefik/v2/pkg/server/service/udp" - "github.com/containous/traefik/v2/pkg/udp" + "github.com/traefik/traefik/v2/pkg/config/runtime" + "github.com/traefik/traefik/v2/pkg/log" + "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" ) // NewManager Creates a new Manager. diff --git a/pkg/server/router/udp/router_test.go b/pkg/server/router/udp/router_test.go index fb49aa6ef..76451cd30 100644 --- a/pkg/server/router/udp/router_test.go +++ b/pkg/server/router/udp/router_test.go @@ -4,10 +4,10 @@ import ( "context" "testing" - "github.com/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/config/runtime" - "github.com/containous/traefik/v2/pkg/server/service/udp" "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" ) func TestRuntimeConfiguration(t *testing.T) { diff --git a/pkg/server/routerfactory.go b/pkg/server/routerfactory.go index 2c0baec81..fd2e9c7d0 100644 --- a/pkg/server/routerfactory.go +++ b/pkg/server/routerfactory.go @@ -3,19 +3,19 @@ package server import ( "context" - "github.com/containous/traefik/v2/pkg/config/runtime" - "github.com/containous/traefik/v2/pkg/config/static" - "github.com/containous/traefik/v2/pkg/log" - "github.com/containous/traefik/v2/pkg/server/middleware" - "github.com/containous/traefik/v2/pkg/server/router" - routertcp "github.com/containous/traefik/v2/pkg/server/router/tcp" - routerudp "github.com/containous/traefik/v2/pkg/server/router/udp" - "github.com/containous/traefik/v2/pkg/server/service" - "github.com/containous/traefik/v2/pkg/server/service/tcp" - "github.com/containous/traefik/v2/pkg/server/service/udp" - tcpCore "github.com/containous/traefik/v2/pkg/tcp" - "github.com/containous/traefik/v2/pkg/tls" - udpCore "github.com/containous/traefik/v2/pkg/udp" + "github.com/traefik/traefik/v2/pkg/config/runtime" + "github.com/traefik/traefik/v2/pkg/config/static" + "github.com/traefik/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/server/middleware" + "github.com/traefik/traefik/v2/pkg/server/router" + routertcp "github.com/traefik/traefik/v2/pkg/server/router/tcp" + routerudp "github.com/traefik/traefik/v2/pkg/server/router/udp" + "github.com/traefik/traefik/v2/pkg/server/service" + "github.com/traefik/traefik/v2/pkg/server/service/tcp" + "github.com/traefik/traefik/v2/pkg/server/service/udp" + tcpCore "github.com/traefik/traefik/v2/pkg/tcp" + "github.com/traefik/traefik/v2/pkg/tls" + udpCore "github.com/traefik/traefik/v2/pkg/udp" ) // RouterFactory the factory of TCP/UDP routers. diff --git a/pkg/server/routerfactory_test.go b/pkg/server/routerfactory_test.go index c5038e548..369bf3a8c 100644 --- a/pkg/server/routerfactory_test.go +++ b/pkg/server/routerfactory_test.go @@ -5,15 +5,15 @@ import ( "net/http/httptest" "testing" - "github.com/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/config/runtime" - "github.com/containous/traefik/v2/pkg/config/static" - "github.com/containous/traefik/v2/pkg/metrics" - "github.com/containous/traefik/v2/pkg/server/middleware" - "github.com/containous/traefik/v2/pkg/server/service" - th "github.com/containous/traefik/v2/pkg/testhelpers" - "github.com/containous/traefik/v2/pkg/tls" "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" + th "github.com/traefik/traefik/v2/pkg/testhelpers" + "github.com/traefik/traefik/v2/pkg/tls" ) func TestReuseService(t *testing.T) { diff --git a/pkg/server/server.go b/pkg/server/server.go index 1617d08ca..0df1ba9b3 100644 --- a/pkg/server/server.go +++ b/pkg/server/server.go @@ -6,11 +6,11 @@ import ( "os/signal" "time" - "github.com/containous/traefik/v2/pkg/log" - "github.com/containous/traefik/v2/pkg/metrics" - "github.com/containous/traefik/v2/pkg/middlewares/accesslog" - "github.com/containous/traefik/v2/pkg/safe" - "github.com/containous/traefik/v2/pkg/server/middleware" + "github.com/traefik/traefik/v2/pkg/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" ) // 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 3b7efdf4c..4c3b756c1 100644 --- a/pkg/server/server_entrypoint_tcp.go +++ b/pkg/server/server_entrypoint_tcp.go @@ -10,15 +10,15 @@ import ( "time" proxyprotocol "github.com/c0va23/go-proxyprotocol" - "github.com/containous/traefik/v2/pkg/config/static" - "github.com/containous/traefik/v2/pkg/ip" - "github.com/containous/traefik/v2/pkg/log" - "github.com/containous/traefik/v2/pkg/middlewares" - "github.com/containous/traefik/v2/pkg/middlewares/forwardedheaders" - "github.com/containous/traefik/v2/pkg/safe" - "github.com/containous/traefik/v2/pkg/server/router" - "github.com/containous/traefik/v2/pkg/tcp" "github.com/sirupsen/logrus" + "github.com/traefik/traefik/v2/pkg/config/static" + "github.com/traefik/traefik/v2/pkg/ip" + "github.com/traefik/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/middlewares" + "github.com/traefik/traefik/v2/pkg/middlewares/forwardedheaders" + "github.com/traefik/traefik/v2/pkg/safe" + "github.com/traefik/traefik/v2/pkg/server/router" + "github.com/traefik/traefik/v2/pkg/tcp" "golang.org/x/net/http2" "golang.org/x/net/http2/h2c" ) diff --git a/pkg/server/server_entrypoint_tcp_test.go b/pkg/server/server_entrypoint_tcp_test.go index af1dd5aef..244703946 100644 --- a/pkg/server/server_entrypoint_tcp_test.go +++ b/pkg/server/server_entrypoint_tcp_test.go @@ -11,11 +11,11 @@ import ( "testing" "time" - "github.com/containous/traefik/v2/pkg/config/static" - "github.com/containous/traefik/v2/pkg/tcp" "github.com/stretchr/testify/assert" "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/tcp" ) func TestShutdownHijacked(t *testing.T) { diff --git a/pkg/server/server_entrypoint_udp.go b/pkg/server/server_entrypoint_udp.go index c13e3fe0d..32a225096 100644 --- a/pkg/server/server_entrypoint_udp.go +++ b/pkg/server/server_entrypoint_udp.go @@ -7,9 +7,9 @@ import ( "sync" "time" - "github.com/containous/traefik/v2/pkg/config/static" - "github.com/containous/traefik/v2/pkg/log" - "github.com/containous/traefik/v2/pkg/udp" + "github.com/traefik/traefik/v2/pkg/config/static" + "github.com/traefik/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/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 032e7c2c1..00a6ba8cd 100644 --- a/pkg/server/server_entrypoint_udp_test.go +++ b/pkg/server/server_entrypoint_udp_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "github.com/containous/traefik/v2/pkg/config/static" - "github.com/containous/traefik/v2/pkg/udp" "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" ) func TestShutdownUDPConn(t *testing.T) { diff --git a/pkg/server/server_signals.go b/pkg/server/server_signals.go index e02702652..3b5adca59 100644 --- a/pkg/server/server_signals.go +++ b/pkg/server/server_signals.go @@ -7,7 +7,7 @@ import ( "os/signal" "syscall" - "github.com/containous/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/log" ) func (s *Server) configureSignals() { diff --git a/pkg/server/service/internalhandler.go b/pkg/server/service/internalhandler.go index f50e37065..50e4dc9ed 100644 --- a/pkg/server/service/internalhandler.go +++ b/pkg/server/service/internalhandler.go @@ -7,7 +7,7 @@ import ( "net/http" "strings" - "github.com/containous/traefik/v2/pkg/config/runtime" + "github.com/traefik/traefik/v2/pkg/config/runtime" ) type serviceManager interface { diff --git a/pkg/server/service/loadbalancer/mirror/mirror.go b/pkg/server/service/loadbalancer/mirror/mirror.go index 959ef5775..d5a6ef1bc 100644 --- a/pkg/server/service/loadbalancer/mirror/mirror.go +++ b/pkg/server/service/loadbalancer/mirror/mirror.go @@ -12,9 +12,9 @@ import ( "net/http" "sync" - "github.com/containous/traefik/v2/pkg/log" - "github.com/containous/traefik/v2/pkg/middlewares/accesslog" - "github.com/containous/traefik/v2/pkg/safe" + "github.com/traefik/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/middlewares/accesslog" + "github.com/traefik/traefik/v2/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 f2e8da9d1..cf1402e37 100644 --- a/pkg/server/service/loadbalancer/mirror/mirror_test.go +++ b/pkg/server/service/loadbalancer/mirror/mirror_test.go @@ -9,8 +9,8 @@ import ( "sync/atomic" "testing" - "github.com/containous/traefik/v2/pkg/safe" "github.com/stretchr/testify/assert" + "github.com/traefik/traefik/v2/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 0dca68ee5..a9ea42a4a 100644 --- a/pkg/server/service/loadbalancer/wrr/wrr.go +++ b/pkg/server/service/loadbalancer/wrr/wrr.go @@ -6,8 +6,8 @@ import ( "net/http" "sync" - "github.com/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v2/pkg/log" ) type namedHandler struct { diff --git a/pkg/server/service/loadbalancer/wrr/wrr_test.go b/pkg/server/service/loadbalancer/wrr/wrr_test.go index 72771d8bf..1a8d85da3 100644 --- a/pkg/server/service/loadbalancer/wrr/wrr_test.go +++ b/pkg/server/service/loadbalancer/wrr/wrr_test.go @@ -5,8 +5,8 @@ import ( "net/http/httptest" "testing" - "github.com/containous/traefik/v2/pkg/config/dynamic" "github.com/stretchr/testify/assert" + "github.com/traefik/traefik/v2/pkg/config/dynamic" ) func Int(v int) *int { return &v } diff --git a/pkg/server/service/managerfactory.go b/pkg/server/service/managerfactory.go index e3d82b2a9..d730073ae 100644 --- a/pkg/server/service/managerfactory.go +++ b/pkg/server/service/managerfactory.go @@ -3,11 +3,11 @@ package service import ( "net/http" - "github.com/containous/traefik/v2/pkg/api" - "github.com/containous/traefik/v2/pkg/config/runtime" - "github.com/containous/traefik/v2/pkg/config/static" - "github.com/containous/traefik/v2/pkg/metrics" - "github.com/containous/traefik/v2/pkg/safe" + "github.com/traefik/traefik/v2/pkg/api" + "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" ) // ManagerFactory a factory of service manager. diff --git a/pkg/server/service/proxy.go b/pkg/server/service/proxy.go index f6702d195..ea0e04d8b 100644 --- a/pkg/server/service/proxy.go +++ b/pkg/server/service/proxy.go @@ -10,9 +10,9 @@ import ( "net/url" "time" - "github.com/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/log" ptypes "github.com/traefik/paerser/types" + "github.com/traefik/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v2/pkg/log" ) // StatusClientClosedRequest non-standard HTTP status code for client disconnection. diff --git a/pkg/server/service/proxy_test.go b/pkg/server/service/proxy_test.go index 5318a0a67..beba3580f 100644 --- a/pkg/server/service/proxy_test.go +++ b/pkg/server/service/proxy_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/containous/traefik/v2/pkg/testhelpers" + "github.com/traefik/traefik/v2/pkg/testhelpers" ) type staticTransport struct { diff --git a/pkg/server/service/roundtripper.go b/pkg/server/service/roundtripper.go index 715d5d5c2..3d6548fb7 100644 --- a/pkg/server/service/roundtripper.go +++ b/pkg/server/service/roundtripper.go @@ -8,9 +8,9 @@ import ( "net/http" "time" - "github.com/containous/traefik/v2/pkg/config/static" - "github.com/containous/traefik/v2/pkg/log" - traefiktls "github.com/containous/traefik/v2/pkg/tls" + "github.com/traefik/traefik/v2/pkg/config/static" + "github.com/traefik/traefik/v2/pkg/log" + traefiktls "github.com/traefik/traefik/v2/pkg/tls" "golang.org/x/net/http2" ) diff --git a/pkg/server/service/service.go b/pkg/server/service/service.go index 37f02c4db..53e122f85 100644 --- a/pkg/server/service/service.go +++ b/pkg/server/service/service.go @@ -11,20 +11,20 @@ import ( "time" "github.com/containous/alice" - "github.com/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/config/runtime" - "github.com/containous/traefik/v2/pkg/healthcheck" - "github.com/containous/traefik/v2/pkg/log" - "github.com/containous/traefik/v2/pkg/metrics" - "github.com/containous/traefik/v2/pkg/middlewares/accesslog" - "github.com/containous/traefik/v2/pkg/middlewares/emptybackendhandler" - metricsMiddle "github.com/containous/traefik/v2/pkg/middlewares/metrics" - "github.com/containous/traefik/v2/pkg/middlewares/pipelining" - "github.com/containous/traefik/v2/pkg/safe" - "github.com/containous/traefik/v2/pkg/server/cookie" - "github.com/containous/traefik/v2/pkg/server/provider" - "github.com/containous/traefik/v2/pkg/server/service/loadbalancer/mirror" - "github.com/containous/traefik/v2/pkg/server/service/loadbalancer/wrr" + "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/log" + "github.com/traefik/traefik/v2/pkg/metrics" + "github.com/traefik/traefik/v2/pkg/middlewares/accesslog" + "github.com/traefik/traefik/v2/pkg/middlewares/emptybackendhandler" + metricsMiddle "github.com/traefik/traefik/v2/pkg/middlewares/metrics" + "github.com/traefik/traefik/v2/pkg/middlewares/pipelining" + "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/mirror" + "github.com/traefik/traefik/v2/pkg/server/service/loadbalancer/wrr" "github.com/vulcand/oxy/roundrobin" ) diff --git a/pkg/server/service/service_test.go b/pkg/server/service/service_test.go index 23b5f6b35..0b675e8df 100644 --- a/pkg/server/service/service_test.go +++ b/pkg/server/service/service_test.go @@ -7,12 +7,12 @@ import ( "strings" "testing" - "github.com/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/config/runtime" - "github.com/containous/traefik/v2/pkg/server/provider" - "github.com/containous/traefik/v2/pkg/testhelpers" "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" ) type MockForwarder struct{} diff --git a/pkg/server/service/tcp/service.go b/pkg/server/service/tcp/service.go index 2bb8bb1c3..96913e941 100644 --- a/pkg/server/service/tcp/service.go +++ b/pkg/server/service/tcp/service.go @@ -7,10 +7,10 @@ import ( "net" "time" - "github.com/containous/traefik/v2/pkg/config/runtime" - "github.com/containous/traefik/v2/pkg/log" - "github.com/containous/traefik/v2/pkg/server/provider" - "github.com/containous/traefik/v2/pkg/tcp" + "github.com/traefik/traefik/v2/pkg/config/runtime" + "github.com/traefik/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/server/provider" + "github.com/traefik/traefik/v2/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 b1943463d..fc6c4702c 100644 --- a/pkg/server/service/tcp/service_test.go +++ b/pkg/server/service/tcp/service_test.go @@ -4,11 +4,11 @@ import ( "context" "testing" - "github.com/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/config/runtime" - "github.com/containous/traefik/v2/pkg/server/provider" "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" ) func TestManager_BuildTCP(t *testing.T) { diff --git a/pkg/server/service/udp/service.go b/pkg/server/service/udp/service.go index 371833f73..0fa3fd386 100644 --- a/pkg/server/service/udp/service.go +++ b/pkg/server/service/udp/service.go @@ -6,10 +6,10 @@ import ( "fmt" "net" - "github.com/containous/traefik/v2/pkg/config/runtime" - "github.com/containous/traefik/v2/pkg/log" - "github.com/containous/traefik/v2/pkg/server/provider" - "github.com/containous/traefik/v2/pkg/udp" + "github.com/traefik/traefik/v2/pkg/config/runtime" + "github.com/traefik/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/server/provider" + "github.com/traefik/traefik/v2/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 a17828d47..0f06c1feb 100644 --- a/pkg/server/service/udp/service_test.go +++ b/pkg/server/service/udp/service_test.go @@ -4,11 +4,11 @@ import ( "context" "testing" - "github.com/containous/traefik/v2/pkg/config/dynamic" - "github.com/containous/traefik/v2/pkg/config/runtime" - "github.com/containous/traefik/v2/pkg/server/provider" "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" ) func TestManager_BuildUDP(t *testing.T) { diff --git a/pkg/tcp/proxy.go b/pkg/tcp/proxy.go index db81336ff..d3401a874 100644 --- a/pkg/tcp/proxy.go +++ b/pkg/tcp/proxy.go @@ -5,7 +5,7 @@ import ( "net" "time" - "github.com/containous/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/log" ) // Proxy forwards a TCP request to a TCP service. diff --git a/pkg/tcp/router.go b/pkg/tcp/router.go index 601f18190..31ff07342 100644 --- a/pkg/tcp/router.go +++ b/pkg/tcp/router.go @@ -10,8 +10,8 @@ import ( "strings" "time" - "github.com/containous/traefik/v2/pkg/log" - "github.com/containous/traefik/v2/pkg/types" + "github.com/traefik/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/types" ) // Router is a TCP router. diff --git a/pkg/tcp/switcher.go b/pkg/tcp/switcher.go index a6d612267..557f663a1 100644 --- a/pkg/tcp/switcher.go +++ b/pkg/tcp/switcher.go @@ -1,7 +1,7 @@ package tcp import ( - "github.com/containous/traefik/v2/pkg/safe" + "github.com/traefik/traefik/v2/pkg/safe" ) // HandlerSwitcher is a TCP handler switcher. diff --git a/pkg/tcp/wrr_load_balancer.go b/pkg/tcp/wrr_load_balancer.go index 466bf36e1..8f26251ef 100644 --- a/pkg/tcp/wrr_load_balancer.go +++ b/pkg/tcp/wrr_load_balancer.go @@ -4,7 +4,7 @@ import ( "fmt" "sync" - "github.com/containous/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/log" ) type server struct { diff --git a/pkg/testhelpers/config.go b/pkg/testhelpers/config.go index 3a2c00ca6..b57a16320 100644 --- a/pkg/testhelpers/config.go +++ b/pkg/testhelpers/config.go @@ -1,7 +1,7 @@ package testhelpers import ( - "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/traefik/traefik/v2/pkg/config/dynamic" ) // BuildConfiguration is a helper to create a configuration. diff --git a/pkg/tls/certificate.go b/pkg/tls/certificate.go index de970cac9..d42ec9b33 100644 --- a/pkg/tls/certificate.go +++ b/pkg/tls/certificate.go @@ -9,8 +9,8 @@ import ( "sort" "strings" - "github.com/containous/traefik/v2/pkg/log" - "github.com/containous/traefik/v2/pkg/tls/generate" + "github.com/traefik/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/tls/generate" ) var ( diff --git a/pkg/tls/certificate_store.go b/pkg/tls/certificate_store.go index 524a5cdba..2db8afd1c 100644 --- a/pkg/tls/certificate_store.go +++ b/pkg/tls/certificate_store.go @@ -8,9 +8,9 @@ import ( "strings" "time" - "github.com/containous/traefik/v2/pkg/log" - "github.com/containous/traefik/v2/pkg/safe" "github.com/patrickmn/go-cache" + "github.com/traefik/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/safe" ) // CertificateStore store for dynamic certificates. diff --git a/pkg/tls/certificate_store_test.go b/pkg/tls/certificate_store_test.go index 0dd983406..307d520a6 100644 --- a/pkg/tls/certificate_store_test.go +++ b/pkg/tls/certificate_store_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "github.com/containous/traefik/v2/pkg/safe" "github.com/patrickmn/go-cache" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/traefik/traefik/v2/pkg/safe" ) func TestGetBestCertificate(t *testing.T) { diff --git a/pkg/tls/tlsmanager.go b/pkg/tls/tlsmanager.go index 36d6d06d6..b1fb572f1 100644 --- a/pkg/tls/tlsmanager.go +++ b/pkg/tls/tlsmanager.go @@ -8,11 +8,11 @@ import ( "fmt" "sync" - "github.com/containous/traefik/v2/pkg/log" - "github.com/containous/traefik/v2/pkg/tls/generate" - "github.com/containous/traefik/v2/pkg/types" "github.com/go-acme/lego/v4/challenge/tlsalpn01" "github.com/sirupsen/logrus" + "github.com/traefik/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/tls/generate" + "github.com/traefik/traefik/v2/pkg/types" ) // DefaultTLSOptions the default TLS options. diff --git a/pkg/tls/zz_generated.deepcopy.go b/pkg/tls/zz_generated.deepcopy.go index d812d4637..34607c862 100644 --- a/pkg/tls/zz_generated.deepcopy.go +++ b/pkg/tls/zz_generated.deepcopy.go @@ -3,7 +3,7 @@ /* The MIT License (MIT) -Copyright (c) 2016-2020 Containous SAS +Copyright (c) 2016-2020 Containous SAS; 2020-2020 Traefik Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/pkg/tracing/datadog/datadog.go b/pkg/tracing/datadog/datadog.go index c7236bda2..3b39f8ebb 100644 --- a/pkg/tracing/datadog/datadog.go +++ b/pkg/tracing/datadog/datadog.go @@ -4,8 +4,8 @@ import ( "io" "strings" - "github.com/containous/traefik/v2/pkg/log" "github.com/opentracing/opentracing-go" + "github.com/traefik/traefik/v2/pkg/log" 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 9f3580dca..d31d8c759 100644 --- a/pkg/tracing/elastic/elastic.go +++ b/pkg/tracing/elastic/elastic.go @@ -4,9 +4,9 @@ import ( "io" "net/url" - "github.com/containous/traefik/v2/pkg/log" - "github.com/containous/traefik/v2/pkg/version" "github.com/opentracing/opentracing-go" + "github.com/traefik/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/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 4851fa9f2..b3b14988d 100644 --- a/pkg/tracing/haystack/haystack.go +++ b/pkg/tracing/haystack/haystack.go @@ -6,8 +6,8 @@ import ( "time" "github.com/ExpediaDotCom/haystack-client-go" - "github.com/containous/traefik/v2/pkg/log" "github.com/opentracing/opentracing-go" + "github.com/traefik/traefik/v2/pkg/log" ) // Name sets the name of this tracer. diff --git a/pkg/tracing/haystack/logger.go b/pkg/tracing/haystack/logger.go index 2f69167a1..0912557cb 100644 --- a/pkg/tracing/haystack/logger.go +++ b/pkg/tracing/haystack/logger.go @@ -1,7 +1,7 @@ package haystack import ( - "github.com/containous/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/log" ) type haystackLogger struct { diff --git a/pkg/tracing/instana/instana.go b/pkg/tracing/instana/instana.go index 370ea92a8..104ce6b11 100644 --- a/pkg/tracing/instana/instana.go +++ b/pkg/tracing/instana/instana.go @@ -3,9 +3,9 @@ package instana import ( "io" - "github.com/containous/traefik/v2/pkg/log" instana "github.com/instana/go-sensor" "github.com/opentracing/opentracing-go" + "github.com/traefik/traefik/v2/pkg/log" ) // Name sets the name of this tracer. diff --git a/pkg/tracing/jaeger/jaeger.go b/pkg/tracing/jaeger/jaeger.go index 08ed8b974..ae7cf050b 100644 --- a/pkg/tracing/jaeger/jaeger.go +++ b/pkg/tracing/jaeger/jaeger.go @@ -4,8 +4,8 @@ import ( "fmt" "io" - "github.com/containous/traefik/v2/pkg/log" "github.com/opentracing/opentracing-go" + "github.com/traefik/traefik/v2/pkg/log" 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/jaeger/logger.go b/pkg/tracing/jaeger/logger.go index a8419e7e0..4aad3de77 100644 --- a/pkg/tracing/jaeger/logger.go +++ b/pkg/tracing/jaeger/logger.go @@ -1,8 +1,8 @@ package jaeger import ( - "github.com/containous/traefik/v2/pkg/log" "github.com/sirupsen/logrus" + "github.com/traefik/traefik/v2/pkg/log" ) // jaegerLogger is an implementation of the Logger interface that delegates to traefik log. diff --git a/pkg/tracing/operation_name.go b/pkg/tracing/operation_name.go index a076e4e45..e6194e31e 100644 --- a/pkg/tracing/operation_name.go +++ b/pkg/tracing/operation_name.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/containous/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/log" ) // TraceNameHashLength defines the number of characters to use from the head of the generated hash. diff --git a/pkg/tracing/tracing.go b/pkg/tracing/tracing.go index a70ee54cb..02fab9c5d 100644 --- a/pkg/tracing/tracing.go +++ b/pkg/tracing/tracing.go @@ -7,9 +7,9 @@ import ( "io" "net/http" - "github.com/containous/traefik/v2/pkg/log" "github.com/opentracing/opentracing-go" "github.com/opentracing/opentracing-go/ext" + "github.com/traefik/traefik/v2/pkg/log" ) type contextKey int diff --git a/pkg/tracing/zipkin/zipkin.go b/pkg/tracing/zipkin/zipkin.go index 8daecd383..6a140aa76 100644 --- a/pkg/tracing/zipkin/zipkin.go +++ b/pkg/tracing/zipkin/zipkin.go @@ -4,11 +4,11 @@ import ( "io" "time" - "github.com/containous/traefik/v2/pkg/log" "github.com/opentracing/opentracing-go" zipkinot "github.com/openzipkin-contrib/zipkin-go-opentracing" "github.com/openzipkin/zipkin-go" "github.com/openzipkin/zipkin-go/reporter/http" + "github.com/traefik/traefik/v2/pkg/log" ) // Name sets the name of this tracer. diff --git a/pkg/types/tls.go b/pkg/types/tls.go index 07546b828..2ff8c9807 100644 --- a/pkg/types/tls.go +++ b/pkg/types/tls.go @@ -8,7 +8,7 @@ import ( "io/ioutil" "os" - "github.com/containous/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/log" ) // ClientTLS holds TLS specific configurations as client diff --git a/pkg/types/zz_generated.deepcopy.go b/pkg/types/zz_generated.deepcopy.go index 9f3e7b0ce..a7100a1a6 100644 --- a/pkg/types/zz_generated.deepcopy.go +++ b/pkg/types/zz_generated.deepcopy.go @@ -3,7 +3,7 @@ /* The MIT License (MIT) -Copyright (c) 2016-2020 Containous SAS +Copyright (c) 2016-2020 Containous SAS; 2020-2020 Traefik Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/pkg/udp/proxy.go b/pkg/udp/proxy.go index 740ebc94e..7e822cbf6 100644 --- a/pkg/udp/proxy.go +++ b/pkg/udp/proxy.go @@ -4,7 +4,7 @@ import ( "io" "net" - "github.com/containous/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/log" ) // Proxy is a reverse-proxy implementation of the Handler interface. diff --git a/pkg/udp/switcher.go b/pkg/udp/switcher.go index c9ca13a37..d198a3587 100644 --- a/pkg/udp/switcher.go +++ b/pkg/udp/switcher.go @@ -1,7 +1,7 @@ package udp import ( - "github.com/containous/traefik/v2/pkg/safe" + "github.com/traefik/traefik/v2/pkg/safe" ) // HandlerSwitcher is a switcher implementation of the Handler interface. diff --git a/pkg/udp/wrr_load_balancer.go b/pkg/udp/wrr_load_balancer.go index c5e4ee975..384b699fc 100644 --- a/pkg/udp/wrr_load_balancer.go +++ b/pkg/udp/wrr_load_balancer.go @@ -4,7 +4,7 @@ import ( "fmt" "sync" - "github.com/containous/traefik/v2/pkg/log" + "github.com/traefik/traefik/v2/pkg/log" ) type server struct { diff --git a/pkg/version/version.go b/pkg/version/version.go index db613ca48..c851dc9a3 100644 --- a/pkg/version/version.go +++ b/pkg/version/version.go @@ -6,10 +6,10 @@ import ( "net/url" "time" - "github.com/containous/traefik/v2/pkg/log" "github.com/google/go-github/v28/github" "github.com/gorilla/mux" goversion "github.com/hashicorp/go-version" + "github.com/traefik/traefik/v2/pkg/log" "github.com/unrolled/render" ) @@ -72,7 +72,7 @@ func CheckNewVersion() { } client.BaseURL = updateURL - releases, resp, err := client.Repositories.ListReleases(context.Background(), "containous", "traefik", nil) + releases, resp, err := client.Repositories.ListReleases(context.Background(), "traefik", "traefik", nil) if err != nil { logger.Warnf("Error checking new version: %s", err) return diff --git a/script/binary b/script/binary index 8d407c36c..1297ef16c 100755 --- a/script/binary +++ b/script/binary @@ -28,7 +28,7 @@ fi # Build binaries # shellcheck disable=SC2086 CGO_ENABLED=0 GOGC=off go build ${FLAGS[*]} -ldflags "-s -w \ - -X github.com/containous/traefik/v2/pkg/version.Version=$VERSION \ - -X github.com/containous/traefik/v2/pkg/version.Codename=$CODENAME \ - -X github.com/containous/traefik/v2/pkg/version.BuildDate=$DATE" \ + -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" \ -a -installsuffix nocgo -o dist/traefik ./cmd/traefik diff --git a/script/boilerplate.go.tmpl b/script/boilerplate.go.tmpl index 8476f2f45..403930f02 100644 --- a/script/boilerplate.go.tmpl +++ b/script/boilerplate.go.tmpl @@ -1,7 +1,7 @@ /* The MIT License (MIT) -Copyright (c) 2016-YEAR Containous SAS +Copyright (c) 2016-2020 Containous SAS; 2020-YEAR Traefik Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/script/crossbinary-default b/script/crossbinary-default index 1a8ad5e8b..aa0466601 100755 --- a/script/crossbinary-default +++ b/script/crossbinary-default @@ -20,7 +20,7 @@ fi echo "Building ${VERSION} ${CODENAME} ${DATE}" -GIT_REPO_URL='github.com/containous/traefik/pkg/version' +GIT_REPO_URL='github.com/traefik/traefik/pkg/version' GO_BUILD_CMD="go build -ldflags" GO_BUILD_OPT="-s -w -X ${GIT_REPO_URL}.Version=${VERSION} -X ${GIT_REPO_URL}.Codename=${CODENAME} -X ${GIT_REPO_URL}.BuildDate=${DATE}" diff --git a/script/deploy.sh b/script/deploy.sh index fa7388c81..8e7706564 100755 --- a/script/deploy.sh +++ b/script/deploy.sh @@ -13,14 +13,14 @@ git config --global user.name "Traefiker" # load ssh key echo "Loading key..." -openssl aes-256-cbc -K $encrypted_f9e835a425bc_key -iv $encrypted_f9e835a425bc_iv -in .travis/traefiker_rsa.enc -out ~/.ssh/traefiker_rsa -d +openssl aes-256-cbc -K $encrypted_83c521e11abe_key -iv $encrypted_83c521e11abe_iv -in .travis/traefiker_rsa.enc -out ~/.ssh/traefiker_rsa -d eval "$(ssh-agent -s)" chmod 600 ~/.ssh/traefiker_rsa ssh-add ~/.ssh/traefiker_rsa # update traefik-library-image repo (official Docker image) echo "Updating traefik-library-imag repo..." -git clone git@github.com:containous/traefik-library-image.git +git clone git@github.com:traefik/traefik-library-image.git cd traefik-library-image ./updatev2.sh $VERSION git add -A diff --git a/script/update-generated-crd-code.sh b/script/update-generated-crd-code.sh index 81dbee5ad..efebb287f 100755 --- a/script/update-generated-crd-code.sh +++ b/script/update-generated-crd-code.sh @@ -10,17 +10,17 @@ chmod +x "${REPO_ROOT}"/vendor/k8s.io/code-generator/*.sh "${REPO_ROOT}"/vendor/k8s.io/code-generator/generate-groups.sh \ all \ - github.com/containous/traefik/${TRAEFIK_MODULE_VERSION}/pkg/provider/kubernetes/crd/generated \ - github.com/containous/traefik/${TRAEFIK_MODULE_VERSION}/pkg/provider/kubernetes/crd \ + github.com/traefik/traefik/${TRAEFIK_MODULE_VERSION}/pkg/provider/kubernetes/crd/generated \ + github.com/traefik/traefik/${TRAEFIK_MODULE_VERSION}/pkg/provider/kubernetes/crd \ traefik:v1alpha1 \ --go-header-file "${HACK_DIR}"/boilerplate.go.tmpl \ "$@" deepcopy-gen \ ---input-dirs github.com/containous/traefik/${TRAEFIK_MODULE_VERSION}/pkg/config/dynamic \ ---input-dirs github.com/containous/traefik/${TRAEFIK_MODULE_VERSION}/pkg/tls \ ---input-dirs github.com/containous/traefik/${TRAEFIK_MODULE_VERSION}/pkg/types \ ---output-package github.com/containous/traefik \ +--input-dirs github.com/traefik/traefik/${TRAEFIK_MODULE_VERSION}/pkg/config/dynamic \ +--input-dirs github.com/traefik/traefik/${TRAEFIK_MODULE_VERSION}/pkg/tls \ +--input-dirs github.com/traefik/traefik/${TRAEFIK_MODULE_VERSION}/pkg/types \ +--output-package github.com/traefik/traefik \ -O zz_generated.deepcopy --go-header-file "${HACK_DIR}"/boilerplate.go.tmpl cp -r "${REPO_ROOT}"/"${TRAEFIK_MODULE_VERSION:?}"/* "${REPO_ROOT}"; rm -rf "${REPO_ROOT}"/"${TRAEFIK_MODULE_VERSION:?}" diff --git a/traefik.sample.toml b/traefik.sample.toml index cb2cb4c40..7cf8ed2bf 100644 --- a/traefik.sample.toml +++ b/traefik.sample.toml @@ -2,7 +2,7 @@ # # Configuration sample for Traefik v2. # -# For Traefik v1: https://github.com/containous/traefik/blob/v1.7/traefik.sample.toml +# For Traefik v1: https://github.com/traefik/traefik/blob/v1.7/traefik.sample.toml # ################################################################ diff --git a/webui/src/components/_commons/NavBar.vue b/webui/src/components/_commons/NavBar.vue index 9dddc7e82..22ccfb58c 100644 --- a/webui/src/components/_commons/NavBar.vue +++ b/webui/src/components/_commons/NavBar.vue @@ -5,7 +5,7 @@ @@ -23,7 +23,7 @@ - +