diff --git a/.gitignore b/.gitignore index 89f7d5fc4..e9aa4a717 100644 --- a/.gitignore +++ b/.gitignore @@ -1,16 +1,16 @@ -/dist -/autogen/genstatic/gen.go .idea/ .intellij/ *.iml -/traefik -/traefik.toml -/static/ -/webui/.tmp/ .vscode/ +.DS_Store +/dist +/webui/.tmp/ /site/ /docs/site/ +/static/ +/autogen/ +/traefik +/traefik.toml *.log *.exe -.DS_Store -/examples/acme/acme.json +cover.out diff --git a/.goreleaser.yml b/.goreleaser.yml index 63b62f02a..257795ad3 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -11,7 +11,7 @@ builds: env: - CGO_ENABLED=0 ldflags: - - -s -w -X github.com/containous/traefik/version.Version={{.Version}} -X github.com/containous/traefik/version.Codename={{.Env.CODENAME}} -X github.com/containous/traefik/version.BuildDate={{.Date}} + - -s -w -X github.com/containous/traefik/pkg/version.Version={{.Version}} -X github.com/containous/traefik/pkg/version.Codename={{.Env.CODENAME}} -X github.com/containous/traefik/pkg/version.BuildDate={{.Date}} goos: - linux diff --git a/cmd/configuration.go b/cmd/configuration.go index a8d9dec13..d6f222645 100644 --- a/cmd/configuration.go +++ b/cmd/configuration.go @@ -4,7 +4,6 @@ import ( "time" "github.com/containous/flaeg/parse" - "github.com/containous/traefik/config/static" "github.com/containous/traefik/old/configuration" "github.com/containous/traefik/old/middlewares/accesslog" "github.com/containous/traefik/old/provider/boltdb" @@ -17,17 +16,18 @@ import ( "github.com/containous/traefik/old/provider/mesos" "github.com/containous/traefik/old/provider/rancher" "github.com/containous/traefik/old/provider/zk" - "github.com/containous/traefik/ping" - "github.com/containous/traefik/provider/docker" - "github.com/containous/traefik/provider/file" - "github.com/containous/traefik/provider/kubernetes/ingress" - "github.com/containous/traefik/provider/marathon" - "github.com/containous/traefik/provider/rest" - "github.com/containous/traefik/tracing/datadog" - "github.com/containous/traefik/tracing/instana" - "github.com/containous/traefik/tracing/jaeger" - "github.com/containous/traefik/tracing/zipkin" - "github.com/containous/traefik/types" + "github.com/containous/traefik/pkg/config/static" + "github.com/containous/traefik/pkg/ping" + "github.com/containous/traefik/pkg/provider/docker" + "github.com/containous/traefik/pkg/provider/file" + "github.com/containous/traefik/pkg/provider/kubernetes/ingress" + "github.com/containous/traefik/pkg/provider/marathon" + "github.com/containous/traefik/pkg/provider/rest" + "github.com/containous/traefik/pkg/tracing/datadog" + "github.com/containous/traefik/pkg/tracing/instana" + "github.com/containous/traefik/pkg/tracing/jaeger" + "github.com/containous/traefik/pkg/tracing/zipkin" + "github.com/containous/traefik/pkg/types" jaegercli "github.com/uber/jaeger-client-go" ) diff --git a/cmd/convert/convert.go b/cmd/convert/convert.go index b3ab3082d..829e8a8b3 100644 --- a/cmd/convert/convert.go +++ b/cmd/convert/convert.go @@ -5,9 +5,9 @@ import ( "strings" "github.com/BurntSushi/toml" - "github.com/containous/traefik/config" "github.com/containous/traefik/old/log" "github.com/containous/traefik/old/types" + "github.com/containous/traefik/pkg/config" "github.com/sirupsen/logrus" ) diff --git a/cmd/healthcheck/healthcheck.go b/cmd/healthcheck/healthcheck.go index f73394871..bfa0a6ca6 100644 --- a/cmd/healthcheck/healthcheck.go +++ b/cmd/healthcheck/healthcheck.go @@ -9,7 +9,7 @@ import ( "github.com/containous/flaeg" "github.com/containous/traefik/cmd" - "github.com/containous/traefik/config/static" + "github.com/containous/traefik/pkg/config/static" ) // NewCmd builds a new HealthCheck command diff --git a/cmd/traefik/traefik.go b/cmd/traefik/traefik.go index 6ae336d9f..0ac7cf095 100644 --- a/cmd/traefik/traefik.go +++ b/cmd/traefik/traefik.go @@ -20,21 +20,21 @@ import ( "github.com/containous/traefik/cmd/healthcheck" "github.com/containous/traefik/cmd/storeconfig" cmdVersion "github.com/containous/traefik/cmd/version" - "github.com/containous/traefik/collector" - "github.com/containous/traefik/config" - "github.com/containous/traefik/config/static" - "github.com/containous/traefik/job" - "github.com/containous/traefik/log" "github.com/containous/traefik/old/provider/ecs" oldtypes "github.com/containous/traefik/old/types" - "github.com/containous/traefik/provider/aggregator" - "github.com/containous/traefik/provider/kubernetes/k8s" - "github.com/containous/traefik/safe" - "github.com/containous/traefik/server" - "github.com/containous/traefik/server/router" - traefiktls "github.com/containous/traefik/tls" - "github.com/containous/traefik/types" - "github.com/containous/traefik/version" + "github.com/containous/traefik/pkg/collector" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/config/static" + "github.com/containous/traefik/pkg/job" + "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/pkg/provider/aggregator" + "github.com/containous/traefik/pkg/provider/kubernetes/k8s" + "github.com/containous/traefik/pkg/safe" + "github.com/containous/traefik/pkg/server" + "github.com/containous/traefik/pkg/server/router" + traefiktls "github.com/containous/traefik/pkg/tls" + "github.com/containous/traefik/pkg/types" + "github.com/containous/traefik/pkg/version" "github.com/coreos/go-systemd/daemon" assetfs "github.com/elazarl/go-bindata-assetfs" "github.com/ogier/pflag" diff --git a/cmd/version/version.go b/cmd/version/version.go index 8a2bbafff..4d0e9c779 100644 --- a/cmd/version/version.go +++ b/cmd/version/version.go @@ -8,7 +8,7 @@ import ( "text/template" "github.com/containous/flaeg" - "github.com/containous/traefik/version" + "github.com/containous/traefik/pkg/version" ) var versionTemplate = `Version: {{.Version}} diff --git a/docs/Makefile b/docs/Makefile index e14f14b78..6e25c59ae 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -35,7 +35,7 @@ docs-verify: docs-build docker build -t $(TRAEFIK_DOCS_CHECK_IMAGE) -f check.Dockerfile ./; \ docker run --rm -v $(CURDIR):/app $(TRAEFIK_DOCS_CHECK_IMAGE) /verify.sh; \ else \ - @echo "DOCS_VERIFY_SKIP is true: no verification done."; \ + echo "DOCS_VERIFY_SKIP is true: no verification done."; \ fi docs-lint: @@ -43,7 +43,7 @@ docs-lint: docker build -t $(TRAEFIK_DOCS_CHECK_IMAGE) -f check.Dockerfile ./ && \ docker run --rm -v $(CURDIR):/app $(TRAEFIK_DOCS_CHECK_IMAGE) /lint.sh; \ else \ - @echo "DOCS_LINT_SKIP is true: no linting done."; \ + echo "DOCS_LINT_SKIP is true: no linting done."; \ fi docs-clean: diff --git a/docs/content/contributing/data-collection.md b/docs/content/contributing/data-collection.md index 71ecabc29..7868399b7 100644 --- a/docs/content/contributing/data-collection.md +++ b/docs/content/contributing/data-collection.md @@ -109,6 +109,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/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/containous/traefik/blob/master/pkg/collector/collector.go) By default we anonymize all configuration fields, except fields tagged with `export=true`. diff --git a/generate.go b/generate.go index e3ddc5777..cc8eedf95 100644 --- a/generate.go +++ b/generate.go @@ -1,3 +1,4 @@ +//go:generate mkdir -p autogen //go:generate rm -vf autogen/genstatic/gen.go //go:generate mkdir -p static //go:generate go-bindata -pkg genstatic -nocompress -o autogen/genstatic/gen.go ./static/... diff --git a/integration/access_log_test.go b/integration/access_log_test.go index 4f0c4f590..606f774bb 100644 --- a/integration/access_log_test.go +++ b/integration/access_log_test.go @@ -12,8 +12,8 @@ import ( "time" "github.com/containous/traefik/integration/try" - "github.com/containous/traefik/log" - "github.com/containous/traefik/middlewares/accesslog" + "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/pkg/middlewares/accesslog" "github.com/go-check/check" checker "github.com/vdemeester/shakers" ) diff --git a/integration/acme_test.go b/integration/acme_test.go index ac9564673..8ea4bba10 100644 --- a/integration/acme_test.go +++ b/integration/acme_test.go @@ -11,9 +11,9 @@ import ( "time" "github.com/containous/traefik/integration/try" - "github.com/containous/traefik/provider/acme" - "github.com/containous/traefik/testhelpers" - "github.com/containous/traefik/types" + "github.com/containous/traefik/pkg/provider/acme" + "github.com/containous/traefik/pkg/testhelpers" + "github.com/containous/traefik/pkg/types" "github.com/go-check/check" "github.com/miekg/dns" checker "github.com/vdemeester/shakers" diff --git a/integration/docker_compose_test.go b/integration/docker_compose_test.go index 1fef054bd..bd156b0b9 100644 --- a/integration/docker_compose_test.go +++ b/integration/docker_compose_test.go @@ -6,9 +6,9 @@ import ( "os" "time" - "github.com/containous/traefik/api" "github.com/containous/traefik/integration/try" - "github.com/containous/traefik/testhelpers" + "github.com/containous/traefik/pkg/api" + "github.com/containous/traefik/pkg/testhelpers" "github.com/go-check/check" checker "github.com/vdemeester/shakers" ) diff --git a/integration/fake_dns_server.go b/integration/fake_dns_server.go index 1d8ff760b..4c4fc1709 100644 --- a/integration/fake_dns_server.go +++ b/integration/fake_dns_server.go @@ -5,7 +5,7 @@ import ( "net" "os" - "github.com/containous/traefik/log" + "github.com/containous/traefik/pkg/log" "github.com/miekg/dns" ) diff --git a/integration/grpc_test.go b/integration/grpc_test.go index 2e7e2e1d1..d46a88932 100644 --- a/integration/grpc_test.go +++ b/integration/grpc_test.go @@ -13,7 +13,7 @@ import ( "github.com/containous/traefik/integration/helloworld" "github.com/containous/traefik/integration/try" - "github.com/containous/traefik/log" + "github.com/containous/traefik/pkg/log" "github.com/go-check/check" "google.golang.org/grpc" "google.golang.org/grpc/credentials" diff --git a/integration/https_test.go b/integration/https_test.go index 890f99da9..2e737847e 100644 --- a/integration/https_test.go +++ b/integration/https_test.go @@ -13,7 +13,7 @@ import ( "github.com/BurntSushi/toml" "github.com/containous/traefik/integration/try" "github.com/containous/traefik/old/types" - traefiktls "github.com/containous/traefik/tls" + traefiktls "github.com/containous/traefik/pkg/tls" "github.com/go-check/check" checker "github.com/vdemeester/shakers" ) diff --git a/integration/integration_test.go b/integration/integration_test.go index 7c5e49b86..fbccf70b7 100644 --- a/integration/integration_test.go +++ b/integration/integration_test.go @@ -13,7 +13,7 @@ import ( "testing" "text/template" - "github.com/containous/traefik/log" + "github.com/containous/traefik/pkg/log" "github.com/go-check/check" compose "github.com/libkermit/compose/check" checker "github.com/vdemeester/shakers" diff --git a/integration/rest_test.go b/integration/rest_test.go index b415e5a62..5f226bd87 100644 --- a/integration/rest_test.go +++ b/integration/rest_test.go @@ -6,8 +6,8 @@ import ( "net/http" "time" - "github.com/containous/traefik/config" "github.com/containous/traefik/integration/try" + "github.com/containous/traefik/pkg/config" "github.com/go-check/check" checker "github.com/vdemeester/shakers" ) diff --git a/integration/simple_test.go b/integration/simple_test.go index 3ab66467d..7eb3e3544 100644 --- a/integration/simple_test.go +++ b/integration/simple_test.go @@ -11,8 +11,8 @@ import ( "syscall" "time" - "github.com/containous/traefik/config" "github.com/containous/traefik/integration/try" + "github.com/containous/traefik/pkg/config" "github.com/go-check/check" checker "github.com/vdemeester/shakers" ) diff --git a/integration/try/try.go b/integration/try/try.go index 5b04bf6bf..60a2764bd 100644 --- a/integration/try/try.go +++ b/integration/try/try.go @@ -7,7 +7,7 @@ import ( "os" "time" - "github.com/containous/traefik/log" + "github.com/containous/traefik/pkg/log" ) const ( diff --git a/old/acme/account.go b/old/acme/account.go index a0f63f8fa..7525bd655 100644 --- a/old/acme/account.go +++ b/old/acme/account.go @@ -15,9 +15,9 @@ import ( "sync" "time" - "github.com/containous/traefik/log" - acmeprovider "github.com/containous/traefik/provider/acme" - "github.com/containous/traefik/types" + "github.com/containous/traefik/pkg/log" + acmeprovider "github.com/containous/traefik/pkg/provider/acme" + "github.com/containous/traefik/pkg/types" "github.com/go-acme/lego/certcrypto" "github.com/go-acme/lego/registration" ) diff --git a/old/acme/acme.go b/old/acme/acme.go index 32b091caf..d710cf48c 100644 --- a/old/acme/acme.go +++ b/old/acme/acme.go @@ -19,12 +19,12 @@ import ( "github.com/cenkalti/backoff" "github.com/containous/mux" "github.com/containous/staert" - "github.com/containous/traefik/log" "github.com/containous/traefik/old/cluster" - acmeprovider "github.com/containous/traefik/provider/acme" - "github.com/containous/traefik/safe" - "github.com/containous/traefik/types" - "github.com/containous/traefik/version" + "github.com/containous/traefik/pkg/log" + acmeprovider "github.com/containous/traefik/pkg/provider/acme" + "github.com/containous/traefik/pkg/safe" + "github.com/containous/traefik/pkg/types" + "github.com/containous/traefik/pkg/version" "github.com/eapache/channels" "github.com/go-acme/lego/certificate" "github.com/go-acme/lego/challenge" diff --git a/old/acme/acme_test.go b/old/acme/acme_test.go index 03b531fa9..a2cdf2191 100644 --- a/old/acme/acme_test.go +++ b/old/acme/acme_test.go @@ -11,9 +11,9 @@ import ( "testing" "time" - acmeprovider "github.com/containous/traefik/provider/acme" - "github.com/containous/traefik/tls/generate" - "github.com/containous/traefik/types" + acmeprovider "github.com/containous/traefik/pkg/provider/acme" + "github.com/containous/traefik/pkg/tls/generate" + "github.com/containous/traefik/pkg/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/old/acme/challenge_http_provider.go b/old/acme/challenge_http_provider.go index ecfff69f6..af078afc7 100644 --- a/old/acme/challenge_http_provider.go +++ b/old/acme/challenge_http_provider.go @@ -6,9 +6,9 @@ import ( "time" "github.com/cenkalti/backoff" - "github.com/containous/traefik/log" "github.com/containous/traefik/old/cluster" - "github.com/containous/traefik/safe" + "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/pkg/safe" "github.com/go-acme/lego/challenge" ) diff --git a/old/acme/challenge_tls_provider.go b/old/acme/challenge_tls_provider.go index 5613c6b5e..73612ed35 100644 --- a/old/acme/challenge_tls_provider.go +++ b/old/acme/challenge_tls_provider.go @@ -8,9 +8,9 @@ import ( "time" "github.com/cenkalti/backoff" - "github.com/containous/traefik/log" "github.com/containous/traefik/old/cluster" - "github.com/containous/traefik/safe" + "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/pkg/safe" "github.com/go-acme/lego/challenge" "github.com/go-acme/lego/challenge/tlsalpn01" ) diff --git a/old/acme/localStore.go b/old/acme/localStore.go index 558e398cf..b8d34f229 100644 --- a/old/acme/localStore.go +++ b/old/acme/localStore.go @@ -5,8 +5,8 @@ import ( "io/ioutil" "os" - "github.com/containous/traefik/log" - "github.com/containous/traefik/provider/acme" + "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/pkg/provider/acme" ) // LocalStore is a store using a file as storage diff --git a/old/api/handler.go b/old/api/handler.go index 628aa76f6..223258962 100644 --- a/old/api/handler.go +++ b/old/api/handler.go @@ -7,8 +7,8 @@ import ( "github.com/containous/traefik/old/log" "github.com/containous/traefik/old/middlewares" "github.com/containous/traefik/old/types" - "github.com/containous/traefik/safe" - "github.com/containous/traefik/version" + "github.com/containous/traefik/pkg/safe" + "github.com/containous/traefik/pkg/version" assetfs "github.com/elazarl/go-bindata-assetfs" thoas_stats "github.com/thoas/stats" "github.com/unrolled/render" diff --git a/old/cluster/datastore.go b/old/cluster/datastore.go index 400ccf658..0b574f301 100644 --- a/old/cluster/datastore.go +++ b/old/cluster/datastore.go @@ -10,9 +10,9 @@ import ( "github.com/abronan/valkeyrie/store" "github.com/cenkalti/backoff" "github.com/containous/staert" - "github.com/containous/traefik/job" - "github.com/containous/traefik/log" - "github.com/containous/traefik/safe" + "github.com/containous/traefik/pkg/job" + "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/pkg/safe" uuid "github.com/satori/go.uuid" ) diff --git a/old/cluster/leadership.go b/old/cluster/leadership.go index f53aad6be..68f6013aa 100644 --- a/old/cluster/leadership.go +++ b/old/cluster/leadership.go @@ -7,9 +7,9 @@ import ( "github.com/cenkalti/backoff" "github.com/containous/mux" - "github.com/containous/traefik/log" "github.com/containous/traefik/old/types" - "github.com/containous/traefik/safe" + "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/pkg/safe" "github.com/docker/leadership" "github.com/unrolled/render" ) diff --git a/old/configuration/configuration.go b/old/configuration/configuration.go index ffda3e7c0..72e63fadf 100644 --- a/old/configuration/configuration.go +++ b/old/configuration/configuration.go @@ -27,11 +27,11 @@ import ( "github.com/containous/traefik/old/provider/zk" "github.com/containous/traefik/old/tls" "github.com/containous/traefik/old/types" - acmeprovider "github.com/containous/traefik/provider/acme" - "github.com/containous/traefik/provider/docker" - "github.com/containous/traefik/provider/file" - "github.com/containous/traefik/provider/kubernetes/ingress" - newtypes "github.com/containous/traefik/types" + acmeprovider "github.com/containous/traefik/pkg/provider/acme" + "github.com/containous/traefik/pkg/provider/docker" + "github.com/containous/traefik/pkg/provider/file" + "github.com/containous/traefik/pkg/provider/kubernetes/ingress" + newtypes "github.com/containous/traefik/pkg/types" "github.com/go-acme/lego/challenge/dns01" "github.com/pkg/errors" ) diff --git a/old/configuration/convert.go b/old/configuration/convert.go index 0c4904662..a1d9cfb9c 100644 --- a/old/configuration/convert.go +++ b/old/configuration/convert.go @@ -1,15 +1,15 @@ package configuration import ( - "github.com/containous/traefik/config/static" "github.com/containous/traefik/old/api" "github.com/containous/traefik/old/middlewares/tracing" "github.com/containous/traefik/old/types" - "github.com/containous/traefik/ping" - "github.com/containous/traefik/tracing/datadog" - "github.com/containous/traefik/tracing/jaeger" - "github.com/containous/traefik/tracing/zipkin" - types2 "github.com/containous/traefik/types" + "github.com/containous/traefik/pkg/config/static" + "github.com/containous/traefik/pkg/ping" + "github.com/containous/traefik/pkg/tracing/datadog" + "github.com/containous/traefik/pkg/tracing/jaeger" + "github.com/containous/traefik/pkg/tracing/zipkin" + types2 "github.com/containous/traefik/pkg/types" ) // ConvertStaticConf FIXME sugar diff --git a/old/middlewares/addPrefix_test.go b/old/middlewares/addPrefix_test.go index b22eca72f..720cc3944 100644 --- a/old/middlewares/addPrefix_test.go +++ b/old/middlewares/addPrefix_test.go @@ -4,7 +4,7 @@ import ( "net/http" "testing" - "github.com/containous/traefik/testhelpers" + "github.com/containous/traefik/pkg/testhelpers" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" ) diff --git a/old/middlewares/auth/authenticator_test.go b/old/middlewares/auth/authenticator_test.go index 2b9691a50..86fbadd27 100644 --- a/old/middlewares/auth/authenticator_test.go +++ b/old/middlewares/auth/authenticator_test.go @@ -10,7 +10,7 @@ import ( "github.com/containous/traefik/old/middlewares/tracing" "github.com/containous/traefik/old/types" - "github.com/containous/traefik/testhelpers" + "github.com/containous/traefik/pkg/testhelpers" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/urfave/negroni" diff --git a/old/middlewares/auth/forward_test.go b/old/middlewares/auth/forward_test.go index 53b6d247b..e3f2d0e47 100644 --- a/old/middlewares/auth/forward_test.go +++ b/old/middlewares/auth/forward_test.go @@ -9,7 +9,7 @@ import ( "github.com/containous/traefik/old/middlewares/tracing" "github.com/containous/traefik/old/types" - "github.com/containous/traefik/testhelpers" + "github.com/containous/traefik/pkg/testhelpers" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/urfave/negroni" diff --git a/old/middlewares/compress_test.go b/old/middlewares/compress_test.go index 742d4b626..06fe20a3c 100644 --- a/old/middlewares/compress_test.go +++ b/old/middlewares/compress_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/NYTimes/gziphandler" - "github.com/containous/traefik/testhelpers" + "github.com/containous/traefik/pkg/testhelpers" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/urfave/negroni" diff --git a/old/middlewares/empty_backend_handler.go b/old/middlewares/empty_backend_handler.go index f775b4663..7e6fe1196 100644 --- a/old/middlewares/empty_backend_handler.go +++ b/old/middlewares/empty_backend_handler.go @@ -3,7 +3,7 @@ package middlewares import ( "net/http" - "github.com/containous/traefik/healthcheck" + "github.com/containous/traefik/pkg/healthcheck" ) // EmptyBackendHandler is a middlware that checks whether the current Backend diff --git a/old/middlewares/empty_backend_handler_test.go b/old/middlewares/empty_backend_handler_test.go index 9e2e36c38..224e68a98 100644 --- a/old/middlewares/empty_backend_handler_test.go +++ b/old/middlewares/empty_backend_handler_test.go @@ -7,7 +7,7 @@ import ( "net/url" "testing" - "github.com/containous/traefik/testhelpers" + "github.com/containous/traefik/pkg/testhelpers" "github.com/vulcand/oxy/roundrobin" ) diff --git a/old/middlewares/errorpages/error_pages_test.go b/old/middlewares/errorpages/error_pages_test.go index aace13667..20623c97a 100644 --- a/old/middlewares/errorpages/error_pages_test.go +++ b/old/middlewares/errorpages/error_pages_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/containous/traefik/old/types" - "github.com/containous/traefik/testhelpers" + "github.com/containous/traefik/pkg/testhelpers" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/urfave/negroni" diff --git a/old/middlewares/forwardedheaders/forwarded_header.go b/old/middlewares/forwardedheaders/forwarded_header.go index 1d00db543..7584e1052 100644 --- a/old/middlewares/forwardedheaders/forwarded_header.go +++ b/old/middlewares/forwardedheaders/forwarded_header.go @@ -3,7 +3,7 @@ package forwardedheaders import ( "net/http" - "github.com/containous/traefik/ip" + "github.com/containous/traefik/pkg/ip" "github.com/vulcand/oxy/forward" "github.com/vulcand/oxy/utils" ) diff --git a/old/middlewares/handlerSwitcher.go b/old/middlewares/handlerSwitcher.go index a7a1a9b63..bbc045107 100644 --- a/old/middlewares/handlerSwitcher.go +++ b/old/middlewares/handlerSwitcher.go @@ -4,7 +4,7 @@ import ( "net/http" "github.com/containous/mux" - "github.com/containous/traefik/safe" + "github.com/containous/traefik/pkg/safe" ) // HandlerSwitcher allows hot switching of http.ServeMux diff --git a/old/middlewares/headers_test.go b/old/middlewares/headers_test.go index 846d8fc38..e88495eb8 100644 --- a/old/middlewares/headers_test.go +++ b/old/middlewares/headers_test.go @@ -7,7 +7,7 @@ import ( "net/http/httptest" "testing" - "github.com/containous/traefik/testhelpers" + "github.com/containous/traefik/pkg/testhelpers" "github.com/stretchr/testify/assert" ) diff --git a/old/middlewares/ip_whitelister.go b/old/middlewares/ip_whitelister.go index 31355e462..61f29d9a1 100644 --- a/old/middlewares/ip_whitelister.go +++ b/old/middlewares/ip_whitelister.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "github.com/containous/traefik/ip" "github.com/containous/traefik/old/log" "github.com/containous/traefik/old/middlewares/tracing" + "github.com/containous/traefik/pkg/ip" "github.com/pkg/errors" "github.com/urfave/negroni" ) diff --git a/old/middlewares/ip_whitelister_test.go b/old/middlewares/ip_whitelister_test.go index e8750cdf2..5f9eb5179 100644 --- a/old/middlewares/ip_whitelister_test.go +++ b/old/middlewares/ip_whitelister_test.go @@ -5,7 +5,7 @@ import ( "net/http/httptest" "testing" - "github.com/containous/traefik/ip" + "github.com/containous/traefik/pkg/ip" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/old/middlewares/replace_path_regex_test.go b/old/middlewares/replace_path_regex_test.go index 606deedfb..7b7fac778 100644 --- a/old/middlewares/replace_path_regex_test.go +++ b/old/middlewares/replace_path_regex_test.go @@ -4,7 +4,7 @@ import ( "net/http" "testing" - "github.com/containous/traefik/testhelpers" + "github.com/containous/traefik/pkg/testhelpers" "github.com/stretchr/testify/assert" ) diff --git a/old/middlewares/replace_path_test.go b/old/middlewares/replace_path_test.go index 838a7b633..e7d78f271 100644 --- a/old/middlewares/replace_path_test.go +++ b/old/middlewares/replace_path_test.go @@ -4,7 +4,7 @@ import ( "net/http" "testing" - "github.com/containous/traefik/testhelpers" + "github.com/containous/traefik/pkg/testhelpers" "github.com/stretchr/testify/assert" ) diff --git a/old/middlewares/request_host_test.go b/old/middlewares/request_host_test.go index 27116a2e7..eb17a9f72 100644 --- a/old/middlewares/request_host_test.go +++ b/old/middlewares/request_host_test.go @@ -4,7 +4,7 @@ import ( "net/http" "testing" - "github.com/containous/traefik/testhelpers" + "github.com/containous/traefik/pkg/testhelpers" "github.com/stretchr/testify/assert" ) diff --git a/old/middlewares/retry_test.go b/old/middlewares/retry_test.go index e874d6222..71886465d 100644 --- a/old/middlewares/retry_test.go +++ b/old/middlewares/retry_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "github.com/containous/traefik/testhelpers" + "github.com/containous/traefik/pkg/testhelpers" "github.com/gorilla/websocket" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/old/middlewares/stripPrefixRegex_test.go b/old/middlewares/stripPrefixRegex_test.go index 0f7a10062..57c75bb62 100644 --- a/old/middlewares/stripPrefixRegex_test.go +++ b/old/middlewares/stripPrefixRegex_test.go @@ -5,7 +5,7 @@ import ( "net/http/httptest" "testing" - "github.com/containous/traefik/testhelpers" + "github.com/containous/traefik/pkg/testhelpers" "github.com/stretchr/testify/assert" ) diff --git a/old/middlewares/stripPrefix_test.go b/old/middlewares/stripPrefix_test.go index dd3f48106..41708d382 100644 --- a/old/middlewares/stripPrefix_test.go +++ b/old/middlewares/stripPrefix_test.go @@ -5,7 +5,7 @@ import ( "net/http/httptest" "testing" - "github.com/containous/traefik/testhelpers" + "github.com/containous/traefik/pkg/testhelpers" "github.com/stretchr/testify/assert" ) diff --git a/old/middlewares/tlsClientHeaders_test.go b/old/middlewares/tlsClientHeaders_test.go index 6dfc4a447..441ce60bc 100644 --- a/old/middlewares/tlsClientHeaders_test.go +++ b/old/middlewares/tlsClientHeaders_test.go @@ -13,7 +13,7 @@ import ( "testing" "github.com/containous/traefik/old/types" - "github.com/containous/traefik/testhelpers" + "github.com/containous/traefik/pkg/testhelpers" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/old/provider/boltdb/boltdb.go b/old/provider/boltdb/boltdb.go index d190264a2..503e73be6 100644 --- a/old/provider/boltdb/boltdb.go +++ b/old/provider/boltdb/boltdb.go @@ -8,7 +8,7 @@ import ( "github.com/containous/traefik/old/provider" "github.com/containous/traefik/old/provider/kv" "github.com/containous/traefik/old/types" - "github.com/containous/traefik/safe" + "github.com/containous/traefik/pkg/safe" ) var _ provider.Provider = (*Provider)(nil) diff --git a/old/provider/consul/consul.go b/old/provider/consul/consul.go index 1e25d2994..5fac431a4 100644 --- a/old/provider/consul/consul.go +++ b/old/provider/consul/consul.go @@ -8,7 +8,7 @@ import ( "github.com/containous/traefik/old/provider" "github.com/containous/traefik/old/provider/kv" "github.com/containous/traefik/old/types" - "github.com/containous/traefik/safe" + "github.com/containous/traefik/pkg/safe" ) var _ provider.Provider = (*Provider)(nil) diff --git a/old/provider/consulcatalog/consul_catalog.go b/old/provider/consulcatalog/consul_catalog.go index 87f2128ff..91961504b 100644 --- a/old/provider/consulcatalog/consul_catalog.go +++ b/old/provider/consulcatalog/consul_catalog.go @@ -10,12 +10,12 @@ import ( "github.com/BurntSushi/ty/fun" "github.com/cenkalti/backoff" - "github.com/containous/traefik/job" "github.com/containous/traefik/old/log" "github.com/containous/traefik/old/provider" "github.com/containous/traefik/old/provider/label" "github.com/containous/traefik/old/types" - "github.com/containous/traefik/safe" + "github.com/containous/traefik/pkg/job" + "github.com/containous/traefik/pkg/safe" "github.com/hashicorp/consul/api" ) diff --git a/old/provider/dynamodb/dynamodb.go b/old/provider/dynamodb/dynamodb.go index 3129bca60..2047ae701 100644 --- a/old/provider/dynamodb/dynamodb.go +++ b/old/provider/dynamodb/dynamodb.go @@ -13,11 +13,11 @@ import ( "github.com/aws/aws-sdk-go/service/dynamodb/dynamodbattribute" "github.com/aws/aws-sdk-go/service/dynamodb/dynamodbiface" "github.com/cenkalti/backoff" - "github.com/containous/traefik/job" "github.com/containous/traefik/old/log" "github.com/containous/traefik/old/provider" "github.com/containous/traefik/old/types" - "github.com/containous/traefik/safe" + "github.com/containous/traefik/pkg/job" + "github.com/containous/traefik/pkg/safe" ) var _ provider.Provider = (*Provider)(nil) diff --git a/old/provider/ecs/ecs.go b/old/provider/ecs/ecs.go index 5786e40e3..f6e9d5ee0 100644 --- a/old/provider/ecs/ecs.go +++ b/old/provider/ecs/ecs.go @@ -14,11 +14,11 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/ecs" "github.com/cenkalti/backoff" - "github.com/containous/traefik/job" "github.com/containous/traefik/old/log" "github.com/containous/traefik/old/provider" "github.com/containous/traefik/old/types" - "github.com/containous/traefik/safe" + "github.com/containous/traefik/pkg/job" + "github.com/containous/traefik/pkg/safe" "github.com/patrickmn/go-cache" ) diff --git a/old/provider/etcd/etcd.go b/old/provider/etcd/etcd.go index 586473648..bf045ff0e 100644 --- a/old/provider/etcd/etcd.go +++ b/old/provider/etcd/etcd.go @@ -8,7 +8,7 @@ import ( "github.com/containous/traefik/old/provider" "github.com/containous/traefik/old/provider/kv" "github.com/containous/traefik/old/types" - "github.com/containous/traefik/safe" + "github.com/containous/traefik/pkg/safe" ) var _ provider.Provider = (*Provider)(nil) diff --git a/old/provider/eureka/eureka.go b/old/provider/eureka/eureka.go index 7c88afd44..fb7211b04 100644 --- a/old/provider/eureka/eureka.go +++ b/old/provider/eureka/eureka.go @@ -7,11 +7,11 @@ import ( "github.com/ArthurHlt/go-eureka-client/eureka" "github.com/cenkalti/backoff" "github.com/containous/flaeg/parse" - "github.com/containous/traefik/job" "github.com/containous/traefik/old/log" "github.com/containous/traefik/old/provider" "github.com/containous/traefik/old/types" - "github.com/containous/traefik/safe" + "github.com/containous/traefik/pkg/job" + "github.com/containous/traefik/pkg/safe" ) // Provider holds configuration of the Provider provider. diff --git a/old/provider/kv/kv.go b/old/provider/kv/kv.go index d3dc33a90..451d7e4ea 100644 --- a/old/provider/kv/kv.go +++ b/old/provider/kv/kv.go @@ -9,11 +9,11 @@ import ( "github.com/abronan/valkeyrie" "github.com/abronan/valkeyrie/store" "github.com/cenkalti/backoff" - "github.com/containous/traefik/job" "github.com/containous/traefik/old/log" "github.com/containous/traefik/old/provider" "github.com/containous/traefik/old/types" - "github.com/containous/traefik/safe" + "github.com/containous/traefik/pkg/job" + "github.com/containous/traefik/pkg/safe" ) // Provider holds common configurations of key-value providers. diff --git a/old/provider/kv/kv_config.go b/old/provider/kv/kv_config.go index a9b3abcdd..a916e4532 100644 --- a/old/provider/kv/kv_config.go +++ b/old/provider/kv/kv_config.go @@ -15,7 +15,7 @@ import ( "github.com/containous/traefik/old/log" "github.com/containous/traefik/old/provider/label" "github.com/containous/traefik/old/types" - "github.com/containous/traefik/tls" + "github.com/containous/traefik/pkg/tls" ) func (p *Provider) buildConfiguration() *types.Configuration { diff --git a/old/provider/kv/kv_config_test.go b/old/provider/kv/kv_config_test.go index 20d43c3f4..554847182 100644 --- a/old/provider/kv/kv_config_test.go +++ b/old/provider/kv/kv_config_test.go @@ -10,7 +10,7 @@ import ( "github.com/containous/flaeg/parse" "github.com/containous/traefik/old/provider/label" "github.com/containous/traefik/old/types" - "github.com/containous/traefik/tls" + "github.com/containous/traefik/pkg/tls" "github.com/stretchr/testify/assert" ) diff --git a/old/provider/mesos/mesos.go b/old/provider/mesos/mesos.go index 13332f819..c29d83da7 100644 --- a/old/provider/mesos/mesos.go +++ b/old/provider/mesos/mesos.go @@ -6,11 +6,11 @@ import ( "time" "github.com/cenkalti/backoff" - "github.com/containous/traefik/job" "github.com/containous/traefik/old/log" "github.com/containous/traefik/old/provider" "github.com/containous/traefik/old/types" - "github.com/containous/traefik/safe" + "github.com/containous/traefik/pkg/job" + "github.com/containous/traefik/pkg/safe" "github.com/mesos/mesos-go/detector" "github.com/mesosphere/mesos-dns/records" "github.com/mesosphere/mesos-dns/records/state" diff --git a/old/provider/provider.go b/old/provider/provider.go index 184d1c6e9..fe73c751d 100644 --- a/old/provider/provider.go +++ b/old/provider/provider.go @@ -10,7 +10,7 @@ import ( "github.com/Masterminds/sprig" "github.com/containous/traefik/old/log" "github.com/containous/traefik/old/types" - "github.com/containous/traefik/safe" + "github.com/containous/traefik/pkg/safe" ) // Provider defines methods of a provider. diff --git a/old/provider/rancher/api.go b/old/provider/rancher/api.go index c94c8f692..1217ff608 100644 --- a/old/provider/rancher/api.go +++ b/old/provider/rancher/api.go @@ -6,10 +6,10 @@ import ( "time" "github.com/cenkalti/backoff" - "github.com/containous/traefik/job" "github.com/containous/traefik/old/log" "github.com/containous/traefik/old/types" - "github.com/containous/traefik/safe" + "github.com/containous/traefik/pkg/job" + "github.com/containous/traefik/pkg/safe" "github.com/mitchellh/mapstructure" rancher "github.com/rancher/go-rancher/v2" ) diff --git a/old/provider/rancher/metadata.go b/old/provider/rancher/metadata.go index e1efd403b..26404a07c 100644 --- a/old/provider/rancher/metadata.go +++ b/old/provider/rancher/metadata.go @@ -6,10 +6,10 @@ import ( "time" "github.com/cenkalti/backoff" - "github.com/containous/traefik/job" "github.com/containous/traefik/old/log" "github.com/containous/traefik/old/types" - "github.com/containous/traefik/safe" + "github.com/containous/traefik/pkg/job" + "github.com/containous/traefik/pkg/safe" "github.com/sirupsen/logrus" rancher "github.com/rancher/go-rancher-metadata/metadata" diff --git a/old/provider/rancher/rancher.go b/old/provider/rancher/rancher.go index f200cea49..22fa52840 100644 --- a/old/provider/rancher/rancher.go +++ b/old/provider/rancher/rancher.go @@ -6,7 +6,7 @@ import ( "github.com/containous/traefik/old/log" "github.com/containous/traefik/old/provider" "github.com/containous/traefik/old/types" - "github.com/containous/traefik/safe" + "github.com/containous/traefik/pkg/safe" ) const ( diff --git a/old/provider/rest/rest.go b/old/provider/rest/rest.go index 6d553792a..4f3a1afb6 100644 --- a/old/provider/rest/rest.go +++ b/old/provider/rest/rest.go @@ -9,7 +9,7 @@ import ( "github.com/containous/mux" "github.com/containous/traefik/old/log" "github.com/containous/traefik/old/types" - "github.com/containous/traefik/safe" + "github.com/containous/traefik/pkg/safe" "github.com/unrolled/render" ) diff --git a/old/provider/zk/zk.go b/old/provider/zk/zk.go index 3a783a72f..4eea8676f 100644 --- a/old/provider/zk/zk.go +++ b/old/provider/zk/zk.go @@ -8,7 +8,7 @@ import ( "github.com/containous/traefik/old/provider" "github.com/containous/traefik/old/provider/kv" "github.com/containous/traefik/old/types" - "github.com/containous/traefik/safe" + "github.com/containous/traefik/pkg/safe" ) var _ provider.Provider = (*Provider)(nil) diff --git a/old/tls/certificate.go b/old/tls/certificate.go index 47b2a10eb..7ec9060bb 100644 --- a/old/tls/certificate.go +++ b/old/tls/certificate.go @@ -9,8 +9,8 @@ import ( "sort" "strings" - "github.com/containous/traefik/log" - "github.com/containous/traefik/tls/generate" + "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/pkg/tls/generate" ) var ( diff --git a/old/tls/certificate_store.go b/old/tls/certificate_store.go index 6ddb9407c..03caa4e58 100644 --- a/old/tls/certificate_store.go +++ b/old/tls/certificate_store.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "github.com/containous/traefik/log" - "github.com/containous/traefik/safe" + "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/pkg/safe" "github.com/patrickmn/go-cache" ) diff --git a/old/tls/tls.go b/old/tls/tls.go index 4a72fc9fc..dbda7c3fc 100644 --- a/old/tls/tls.go +++ b/old/tls/tls.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/containous/traefik/log" + "github.com/containous/traefik/pkg/log" "github.com/sirupsen/logrus" ) diff --git a/old/types/types.go b/old/types/types.go index efea948bf..c4c107b09 100644 --- a/old/types/types.go +++ b/old/types/types.go @@ -14,9 +14,9 @@ import ( "github.com/abronan/valkeyrie/store" "github.com/containous/flaeg/parse" "github.com/containous/mux" - "github.com/containous/traefik/ip" "github.com/containous/traefik/old/log" - traefiktls "github.com/containous/traefik/tls" + "github.com/containous/traefik/pkg/ip" + traefiktls "github.com/containous/traefik/pkg/tls" "github.com/mitchellh/hashstructure" "github.com/ryanuber/go-glob" ) diff --git a/old/types/types_test.go b/old/types/types_test.go index c6f19b54e..b4931ef9b 100644 --- a/old/types/types_test.go +++ b/old/types/types_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/containous/traefik/ip" + "github.com/containous/traefik/pkg/ip" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/anonymize/anonymize.go b/pkg/anonymize/anonymize.go similarity index 100% rename from anonymize/anonymize.go rename to pkg/anonymize/anonymize.go diff --git a/anonymize/anonymize_config_test.go b/pkg/anonymize/anonymize_config_test.go similarity index 91% rename from anonymize/anonymize_config_test.go rename to pkg/anonymize/anonymize_config_test.go index 489ace6f2..2012924cd 100644 --- a/anonymize/anonymize_config_test.go +++ b/pkg/anonymize/anonymize_config_test.go @@ -6,21 +6,21 @@ import ( "time" "github.com/containous/flaeg/parse" - "github.com/containous/traefik/config/static" - "github.com/containous/traefik/ping" - "github.com/containous/traefik/provider" - "github.com/containous/traefik/provider/acme" - acmeprovider "github.com/containous/traefik/provider/acme" - "github.com/containous/traefik/provider/docker" - "github.com/containous/traefik/provider/file" - "github.com/containous/traefik/provider/kubernetes/crd" - "github.com/containous/traefik/provider/kubernetes/ingress" - traefiktls "github.com/containous/traefik/tls" - "github.com/containous/traefik/tracing/datadog" - "github.com/containous/traefik/tracing/instana" - "github.com/containous/traefik/tracing/jaeger" - "github.com/containous/traefik/tracing/zipkin" - "github.com/containous/traefik/types" + "github.com/containous/traefik/pkg/config/static" + "github.com/containous/traefik/pkg/ping" + "github.com/containous/traefik/pkg/provider" + "github.com/containous/traefik/pkg/provider/acme" + acmeprovider "github.com/containous/traefik/pkg/provider/acme" + "github.com/containous/traefik/pkg/provider/docker" + "github.com/containous/traefik/pkg/provider/file" + "github.com/containous/traefik/pkg/provider/kubernetes/crd" + "github.com/containous/traefik/pkg/provider/kubernetes/ingress" + traefiktls "github.com/containous/traefik/pkg/tls" + "github.com/containous/traefik/pkg/tracing/datadog" + "github.com/containous/traefik/pkg/tracing/instana" + "github.com/containous/traefik/pkg/tracing/jaeger" + "github.com/containous/traefik/pkg/tracing/zipkin" + "github.com/containous/traefik/pkg/types" assetfs "github.com/elazarl/go-bindata-assetfs" ) diff --git a/anonymize/anonymize_doOnJSON_test.go b/pkg/anonymize/anonymize_doOnJSON_test.go similarity index 100% rename from anonymize/anonymize_doOnJSON_test.go rename to pkg/anonymize/anonymize_doOnJSON_test.go diff --git a/anonymize/anonymize_doOnStruct_test.go b/pkg/anonymize/anonymize_doOnStruct_test.go similarity index 100% rename from anonymize/anonymize_doOnStruct_test.go rename to pkg/anonymize/anonymize_doOnStruct_test.go diff --git a/api/dashboard.go b/pkg/api/dashboard.go similarity index 96% rename from api/dashboard.go rename to pkg/api/dashboard.go index cee9b3c9e..f3c1bd758 100644 --- a/api/dashboard.go +++ b/pkg/api/dashboard.go @@ -4,7 +4,7 @@ import ( "net/http" "github.com/containous/mux" - "github.com/containous/traefik/log" + "github.com/containous/traefik/pkg/log" assetfs "github.com/elazarl/go-bindata-assetfs" ) diff --git a/api/debug.go b/pkg/api/debug.go similarity index 100% rename from api/debug.go rename to pkg/api/debug.go diff --git a/api/handler.go b/pkg/api/handler.go similarity index 97% rename from api/handler.go rename to pkg/api/handler.go index d9f2b1ee7..e920911f1 100644 --- a/api/handler.go +++ b/pkg/api/handler.go @@ -5,11 +5,11 @@ import ( "net/http" "github.com/containous/mux" - "github.com/containous/traefik/config" - "github.com/containous/traefik/log" - "github.com/containous/traefik/safe" - "github.com/containous/traefik/types" - "github.com/containous/traefik/version" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/pkg/safe" + "github.com/containous/traefik/pkg/types" + "github.com/containous/traefik/pkg/version" assetfs "github.com/elazarl/go-bindata-assetfs" thoasstats "github.com/thoas/stats" "github.com/unrolled/render" diff --git a/api/handler_test.go b/pkg/api/handler_test.go similarity index 98% rename from api/handler_test.go rename to pkg/api/handler_test.go index 7f180834a..c195d9ef0 100644 --- a/api/handler_test.go +++ b/pkg/api/handler_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/containous/mux" - "github.com/containous/traefik/config" - "github.com/containous/traefik/safe" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/safe" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/collector/collector.go b/pkg/collector/collector.go similarity index 90% rename from collector/collector.go rename to pkg/collector/collector.go index a3a714ee2..a5b1d03f9 100644 --- a/collector/collector.go +++ b/pkg/collector/collector.go @@ -9,11 +9,11 @@ import ( "strconv" "time" - "github.com/containous/traefik/anonymize" - "github.com/containous/traefik/config/static" - "github.com/containous/traefik/log" "github.com/containous/traefik/old/configuration" - "github.com/containous/traefik/version" + "github.com/containous/traefik/pkg/anonymize" + "github.com/containous/traefik/pkg/config/static" + "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/pkg/version" "github.com/mitchellh/hashstructure" ) diff --git a/config/dyn_config.go b/pkg/config/dyn_config.go similarity index 99% rename from config/dyn_config.go rename to pkg/config/dyn_config.go index 250801ab1..34848bb54 100644 --- a/config/dyn_config.go +++ b/pkg/config/dyn_config.go @@ -8,7 +8,7 @@ import ( "os" "reflect" - traefiktls "github.com/containous/traefik/tls" + traefiktls "github.com/containous/traefik/pkg/tls" ) // Router holds the router configuration. diff --git a/config/middlewares.go b/pkg/config/middlewares.go similarity index 99% rename from config/middlewares.go rename to pkg/config/middlewares.go index 377e891f5..8fe51e764 100644 --- a/config/middlewares.go +++ b/pkg/config/middlewares.go @@ -2,7 +2,7 @@ package config import ( "github.com/containous/flaeg/parse" - "github.com/containous/traefik/ip" + "github.com/containous/traefik/pkg/ip" ) // +k8s:deepcopy-gen=true diff --git a/config/static/entrypoints.go b/pkg/config/static/entrypoints.go similarity index 98% rename from config/static/entrypoints.go rename to pkg/config/static/entrypoints.go index c4e6023c1..cbc2d7fba 100644 --- a/config/static/entrypoints.go +++ b/pkg/config/static/entrypoints.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/containous/traefik/log" + "github.com/containous/traefik/pkg/log" ) // EntryPoint holds the entry point configuration. diff --git a/config/static/entrypoints_test.go b/pkg/config/static/entrypoints_test.go similarity index 100% rename from config/static/entrypoints_test.go rename to pkg/config/static/entrypoints_test.go diff --git a/config/static/static_config.go b/pkg/config/static/static_config.go similarity index 95% rename from config/static/static_config.go rename to pkg/config/static/static_config.go index e7da0d381..7326effaf 100644 --- a/config/static/static_config.go +++ b/pkg/config/static/static_config.go @@ -6,7 +6,6 @@ import ( "time" "github.com/containous/flaeg/parse" - "github.com/containous/traefik/log" "github.com/containous/traefik/old/provider/boltdb" "github.com/containous/traefik/old/provider/consul" "github.com/containous/traefik/old/provider/consulcatalog" @@ -17,20 +16,21 @@ import ( "github.com/containous/traefik/old/provider/mesos" "github.com/containous/traefik/old/provider/rancher" "github.com/containous/traefik/old/provider/zk" - "github.com/containous/traefik/ping" - acmeprovider "github.com/containous/traefik/provider/acme" - "github.com/containous/traefik/provider/docker" - "github.com/containous/traefik/provider/file" - "github.com/containous/traefik/provider/kubernetes/crd" - "github.com/containous/traefik/provider/kubernetes/ingress" - "github.com/containous/traefik/provider/marathon" - "github.com/containous/traefik/provider/rest" - "github.com/containous/traefik/tls" - "github.com/containous/traefik/tracing/datadog" - "github.com/containous/traefik/tracing/instana" - "github.com/containous/traefik/tracing/jaeger" - "github.com/containous/traefik/tracing/zipkin" - "github.com/containous/traefik/types" + "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/pkg/ping" + acmeprovider "github.com/containous/traefik/pkg/provider/acme" + "github.com/containous/traefik/pkg/provider/docker" + "github.com/containous/traefik/pkg/provider/file" + "github.com/containous/traefik/pkg/provider/kubernetes/crd" + "github.com/containous/traefik/pkg/provider/kubernetes/ingress" + "github.com/containous/traefik/pkg/provider/marathon" + "github.com/containous/traefik/pkg/provider/rest" + "github.com/containous/traefik/pkg/tls" + "github.com/containous/traefik/pkg/tracing/datadog" + "github.com/containous/traefik/pkg/tracing/instana" + "github.com/containous/traefik/pkg/tracing/jaeger" + "github.com/containous/traefik/pkg/tracing/zipkin" + "github.com/containous/traefik/pkg/types" assetfs "github.com/elazarl/go-bindata-assetfs" "github.com/go-acme/lego/challenge/dns01" jaegercli "github.com/uber/jaeger-client-go" diff --git a/config/zz_generated.deepcopy.go b/pkg/config/zz_generated.deepcopy.go similarity index 100% rename from config/zz_generated.deepcopy.go rename to pkg/config/zz_generated.deepcopy.go diff --git a/h2c/h2c.go b/pkg/h2c/h2c.go similarity index 99% rename from h2c/h2c.go rename to pkg/h2c/h2c.go index e795955fc..9277c9787 100644 --- a/h2c/h2c.go +++ b/pkg/h2c/h2c.go @@ -22,7 +22,7 @@ import ( "os" "strings" - "github.com/containous/traefik/log" + "github.com/containous/traefik/pkg/log" "golang.org/x/net/http/httpguts" "golang.org/x/net/http2" diff --git a/healthcheck/healthcheck.go b/pkg/healthcheck/healthcheck.go similarity index 98% rename from healthcheck/healthcheck.go rename to pkg/healthcheck/healthcheck.go index 9a0c2886d..6313e35a2 100644 --- a/healthcheck/healthcheck.go +++ b/pkg/healthcheck/healthcheck.go @@ -10,8 +10,8 @@ import ( "sync" "time" - "github.com/containous/traefik/log" - "github.com/containous/traefik/safe" + "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/pkg/safe" "github.com/go-kit/kit/metrics" "github.com/vulcand/oxy/roundrobin" ) diff --git a/healthcheck/healthcheck_test.go b/pkg/healthcheck/healthcheck_test.go similarity index 99% rename from healthcheck/healthcheck_test.go rename to pkg/healthcheck/healthcheck_test.go index 463962694..ff92d00d3 100644 --- a/healthcheck/healthcheck_test.go +++ b/pkg/healthcheck/healthcheck_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/containous/traefik/testhelpers" + "github.com/containous/traefik/pkg/testhelpers" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/vulcand/oxy/roundrobin" diff --git a/hostresolver/hostresolver.go b/pkg/hostresolver/hostresolver.go similarity index 98% rename from hostresolver/hostresolver.go rename to pkg/hostresolver/hostresolver.go index 4b8cbdfaa..cbf5f8164 100644 --- a/hostresolver/hostresolver.go +++ b/pkg/hostresolver/hostresolver.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/containous/traefik/log" + "github.com/containous/traefik/pkg/log" "github.com/miekg/dns" "github.com/patrickmn/go-cache" ) diff --git a/hostresolver/hostresolver_test.go b/pkg/hostresolver/hostresolver_test.go similarity index 100% rename from hostresolver/hostresolver_test.go rename to pkg/hostresolver/hostresolver_test.go diff --git a/ip/checker.go b/pkg/ip/checker.go similarity index 100% rename from ip/checker.go rename to pkg/ip/checker.go diff --git a/ip/checker_test.go b/pkg/ip/checker_test.go similarity index 100% rename from ip/checker_test.go rename to pkg/ip/checker_test.go diff --git a/ip/strategy.go b/pkg/ip/strategy.go similarity index 100% rename from ip/strategy.go rename to pkg/ip/strategy.go diff --git a/ip/strategy_test.go b/pkg/ip/strategy_test.go similarity index 100% rename from ip/strategy_test.go rename to pkg/ip/strategy_test.go diff --git a/job/job.go b/pkg/job/job.go similarity index 100% rename from job/job.go rename to pkg/job/job.go diff --git a/job/job_test.go b/pkg/job/job_test.go similarity index 100% rename from job/job_test.go rename to pkg/job/job_test.go diff --git a/log/deprecated.go b/pkg/log/deprecated.go similarity index 100% rename from log/deprecated.go rename to pkg/log/deprecated.go diff --git a/log/fields.go b/pkg/log/fields.go similarity index 100% rename from log/fields.go rename to pkg/log/fields.go diff --git a/log/log.go b/pkg/log/log.go similarity index 100% rename from log/log.go rename to pkg/log/log.go diff --git a/log/log_test.go b/pkg/log/log_test.go similarity index 100% rename from log/log_test.go rename to pkg/log/log_test.go diff --git a/metrics/datadog.go b/pkg/metrics/datadog.go similarity index 96% rename from metrics/datadog.go rename to pkg/metrics/datadog.go index ca468fb9a..8642f95a4 100644 --- a/metrics/datadog.go +++ b/pkg/metrics/datadog.go @@ -4,9 +4,9 @@ import ( "context" "time" - "github.com/containous/traefik/log" - "github.com/containous/traefik/safe" - "github.com/containous/traefik/types" + "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/pkg/safe" + "github.com/containous/traefik/pkg/types" kitlog "github.com/go-kit/kit/log" "github.com/go-kit/kit/metrics/dogstatsd" ) diff --git a/metrics/datadog_test.go b/pkg/metrics/datadog_test.go similarity index 98% rename from metrics/datadog_test.go rename to pkg/metrics/datadog_test.go index 568835d1e..dde19d035 100644 --- a/metrics/datadog_test.go +++ b/pkg/metrics/datadog_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/containous/traefik/types" + "github.com/containous/traefik/pkg/types" "github.com/stvp/go-udp-testing" ) diff --git a/metrics/influxdb.go b/pkg/metrics/influxdb.go similarity index 98% rename from metrics/influxdb.go rename to pkg/metrics/influxdb.go index af6df79a5..dfda872f8 100644 --- a/metrics/influxdb.go +++ b/pkg/metrics/influxdb.go @@ -8,9 +8,9 @@ import ( "regexp" "time" - "github.com/containous/traefik/log" - "github.com/containous/traefik/safe" - "github.com/containous/traefik/types" + "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/pkg/safe" + "github.com/containous/traefik/pkg/types" kitlog "github.com/go-kit/kit/log" "github.com/go-kit/kit/metrics/influx" influxdb "github.com/influxdata/influxdb/client/v2" diff --git a/metrics/influxdb_test.go b/pkg/metrics/influxdb_test.go similarity index 99% rename from metrics/influxdb_test.go rename to pkg/metrics/influxdb_test.go index b045127f2..2eda36036 100644 --- a/metrics/influxdb_test.go +++ b/pkg/metrics/influxdb_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "github.com/containous/traefik/types" + "github.com/containous/traefik/pkg/types" "github.com/stvp/go-udp-testing" ) diff --git a/metrics/metrics.go b/pkg/metrics/metrics.go similarity index 100% rename from metrics/metrics.go rename to pkg/metrics/metrics.go diff --git a/metrics/metrics_test.go b/pkg/metrics/metrics_test.go similarity index 100% rename from metrics/metrics_test.go rename to pkg/metrics/metrics_test.go diff --git a/metrics/prometheus.go b/pkg/metrics/prometheus.go similarity index 98% rename from metrics/prometheus.go rename to pkg/metrics/prometheus.go index d7236ce9d..fea31b8d1 100644 --- a/metrics/prometheus.go +++ b/pkg/metrics/prometheus.go @@ -8,10 +8,10 @@ import ( "sync" "github.com/containous/mux" - "github.com/containous/traefik/config" - "github.com/containous/traefik/log" - "github.com/containous/traefik/safe" - "github.com/containous/traefik/types" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/pkg/safe" + "github.com/containous/traefik/pkg/types" "github.com/go-kit/kit/metrics" stdprometheus "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" diff --git a/metrics/prometheus_test.go b/pkg/metrics/prometheus_test.go similarity index 99% rename from metrics/prometheus_test.go rename to pkg/metrics/prometheus_test.go index 179bbdaf3..ada9d845c 100644 --- a/metrics/prometheus_test.go +++ b/pkg/metrics/prometheus_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "github.com/containous/traefik/config" - th "github.com/containous/traefik/testhelpers" - "github.com/containous/traefik/types" + "github.com/containous/traefik/pkg/config" + th "github.com/containous/traefik/pkg/testhelpers" + "github.com/containous/traefik/pkg/types" "github.com/prometheus/client_golang/prometheus" dto "github.com/prometheus/client_model/go" "github.com/stretchr/testify/assert" diff --git a/metrics/statsd.go b/pkg/metrics/statsd.go similarity index 96% rename from metrics/statsd.go rename to pkg/metrics/statsd.go index ac10a5d2d..4da010cca 100644 --- a/metrics/statsd.go +++ b/pkg/metrics/statsd.go @@ -4,9 +4,9 @@ import ( "context" "time" - "github.com/containous/traefik/log" - "github.com/containous/traefik/safe" - "github.com/containous/traefik/types" + "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/pkg/safe" + "github.com/containous/traefik/pkg/types" kitlog "github.com/go-kit/kit/log" "github.com/go-kit/kit/metrics/statsd" ) diff --git a/metrics/statsd_test.go b/pkg/metrics/statsd_test.go similarity index 98% rename from metrics/statsd_test.go rename to pkg/metrics/statsd_test.go index cc5409930..0158f2b44 100644 --- a/metrics/statsd_test.go +++ b/pkg/metrics/statsd_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/containous/traefik/types" + "github.com/containous/traefik/pkg/types" "github.com/stvp/go-udp-testing" ) diff --git a/middlewares/accesslog/capture_request_reader.go b/pkg/middlewares/accesslog/capture_request_reader.go similarity index 100% rename from middlewares/accesslog/capture_request_reader.go rename to pkg/middlewares/accesslog/capture_request_reader.go diff --git a/middlewares/accesslog/capture_response_writer.go b/pkg/middlewares/accesslog/capture_response_writer.go similarity index 100% rename from middlewares/accesslog/capture_response_writer.go rename to pkg/middlewares/accesslog/capture_response_writer.go diff --git a/middlewares/accesslog/field_middleware.go b/pkg/middlewares/accesslog/field_middleware.go similarity index 100% rename from middlewares/accesslog/field_middleware.go rename to pkg/middlewares/accesslog/field_middleware.go diff --git a/middlewares/accesslog/logdata.go b/pkg/middlewares/accesslog/logdata.go similarity index 100% rename from middlewares/accesslog/logdata.go rename to pkg/middlewares/accesslog/logdata.go diff --git a/middlewares/accesslog/logger.go b/pkg/middlewares/accesslog/logger.go similarity index 99% rename from middlewares/accesslog/logger.go rename to pkg/middlewares/accesslog/logger.go index 898a3f125..0668acd2f 100644 --- a/middlewares/accesslog/logger.go +++ b/pkg/middlewares/accesslog/logger.go @@ -14,8 +14,8 @@ import ( "github.com/containous/alice" "github.com/containous/flaeg/parse" - "github.com/containous/traefik/log" - "github.com/containous/traefik/types" + "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/pkg/types" "github.com/sirupsen/logrus" ) diff --git a/middlewares/accesslog/logger_formatters.go b/pkg/middlewares/accesslog/logger_formatters.go similarity index 100% rename from middlewares/accesslog/logger_formatters.go rename to pkg/middlewares/accesslog/logger_formatters.go diff --git a/middlewares/accesslog/logger_formatters_test.go b/pkg/middlewares/accesslog/logger_formatters_test.go similarity index 100% rename from middlewares/accesslog/logger_formatters_test.go rename to pkg/middlewares/accesslog/logger_formatters_test.go diff --git a/middlewares/accesslog/logger_test.go b/pkg/middlewares/accesslog/logger_test.go similarity index 99% rename from middlewares/accesslog/logger_test.go rename to pkg/middlewares/accesslog/logger_test.go index 9ac42af91..228599c72 100644 --- a/middlewares/accesslog/logger_test.go +++ b/pkg/middlewares/accesslog/logger_test.go @@ -15,7 +15,7 @@ import ( "time" "github.com/containous/flaeg/parse" - "github.com/containous/traefik/types" + "github.com/containous/traefik/pkg/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/middlewares/accesslog/parser.go b/pkg/middlewares/accesslog/parser.go similarity index 100% rename from middlewares/accesslog/parser.go rename to pkg/middlewares/accesslog/parser.go diff --git a/middlewares/accesslog/parser_test.go b/pkg/middlewares/accesslog/parser_test.go similarity index 100% rename from middlewares/accesslog/parser_test.go rename to pkg/middlewares/accesslog/parser_test.go diff --git a/middlewares/accesslog/save_retries.go b/pkg/middlewares/accesslog/save_retries.go similarity index 100% rename from middlewares/accesslog/save_retries.go rename to pkg/middlewares/accesslog/save_retries.go diff --git a/middlewares/accesslog/save_retries_test.go b/pkg/middlewares/accesslog/save_retries_test.go similarity index 100% rename from middlewares/accesslog/save_retries_test.go rename to pkg/middlewares/accesslog/save_retries_test.go diff --git a/middlewares/addprefix/add_prefix.go b/pkg/middlewares/addprefix/add_prefix.go similarity index 91% rename from middlewares/addprefix/add_prefix.go rename to pkg/middlewares/addprefix/add_prefix.go index 993760559..a4883cc1b 100644 --- a/middlewares/addprefix/add_prefix.go +++ b/pkg/middlewares/addprefix/add_prefix.go @@ -5,9 +5,9 @@ import ( "fmt" "net/http" - "github.com/containous/traefik/config" - "github.com/containous/traefik/middlewares" - "github.com/containous/traefik/tracing" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/middlewares" + "github.com/containous/traefik/pkg/tracing" "github.com/opentracing/opentracing-go/ext" ) diff --git a/middlewares/addprefix/add_prefix_test.go b/pkg/middlewares/addprefix/add_prefix_test.go similarity index 96% rename from middlewares/addprefix/add_prefix_test.go rename to pkg/middlewares/addprefix/add_prefix_test.go index ba4fff6cb..0f10e7cf1 100644 --- a/middlewares/addprefix/add_prefix_test.go +++ b/pkg/middlewares/addprefix/add_prefix_test.go @@ -5,8 +5,8 @@ import ( "net/http" "testing" - "github.com/containous/traefik/config" - "github.com/containous/traefik/testhelpers" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/testhelpers" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/middlewares/auth/auth.go b/pkg/middlewares/auth/auth.go similarity index 100% rename from middlewares/auth/auth.go rename to pkg/middlewares/auth/auth.go diff --git a/middlewares/auth/basic_auth.go b/pkg/middlewares/auth/basic_auth.go similarity index 92% rename from middlewares/auth/basic_auth.go rename to pkg/middlewares/auth/basic_auth.go index 13bed3741..79179bd15 100644 --- a/middlewares/auth/basic_auth.go +++ b/pkg/middlewares/auth/basic_auth.go @@ -8,10 +8,10 @@ import ( "strings" goauth "github.com/abbot/go-http-auth" - "github.com/containous/traefik/config" - "github.com/containous/traefik/middlewares" - "github.com/containous/traefik/middlewares/accesslog" - "github.com/containous/traefik/tracing" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/middlewares" + "github.com/containous/traefik/pkg/middlewares/accesslog" + "github.com/containous/traefik/pkg/tracing" "github.com/opentracing/opentracing-go/ext" ) diff --git a/middlewares/auth/basic_auth_test.go b/pkg/middlewares/auth/basic_auth_test.go similarity index 98% rename from middlewares/auth/basic_auth_test.go rename to pkg/middlewares/auth/basic_auth_test.go index 554f98223..587197a46 100644 --- a/middlewares/auth/basic_auth_test.go +++ b/pkg/middlewares/auth/basic_auth_test.go @@ -9,8 +9,8 @@ import ( "os" "testing" - "github.com/containous/traefik/config" - "github.com/containous/traefik/testhelpers" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/testhelpers" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/middlewares/auth/digest_auth.go b/pkg/middlewares/auth/digest_auth.go similarity index 92% rename from middlewares/auth/digest_auth.go rename to pkg/middlewares/auth/digest_auth.go index 090285d46..beca09db6 100644 --- a/middlewares/auth/digest_auth.go +++ b/pkg/middlewares/auth/digest_auth.go @@ -8,10 +8,10 @@ import ( "strings" goauth "github.com/abbot/go-http-auth" - "github.com/containous/traefik/config" - "github.com/containous/traefik/middlewares" - "github.com/containous/traefik/middlewares/accesslog" - "github.com/containous/traefik/tracing" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/middlewares" + "github.com/containous/traefik/pkg/middlewares/accesslog" + "github.com/containous/traefik/pkg/tracing" "github.com/opentracing/opentracing-go/ext" ) diff --git a/middlewares/auth/digest_auth_request_test.go b/pkg/middlewares/auth/digest_auth_request_test.go similarity index 100% rename from middlewares/auth/digest_auth_request_test.go rename to pkg/middlewares/auth/digest_auth_request_test.go diff --git a/middlewares/auth/digest_auth_test.go b/pkg/middlewares/auth/digest_auth_test.go similarity index 98% rename from middlewares/auth/digest_auth_test.go rename to pkg/middlewares/auth/digest_auth_test.go index b2000113d..0210232ea 100644 --- a/middlewares/auth/digest_auth_test.go +++ b/pkg/middlewares/auth/digest_auth_test.go @@ -9,8 +9,8 @@ import ( "os" "testing" - "github.com/containous/traefik/config" - "github.com/containous/traefik/testhelpers" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/testhelpers" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/middlewares/auth/forward.go b/pkg/middlewares/auth/forward.go similarity index 97% rename from middlewares/auth/forward.go rename to pkg/middlewares/auth/forward.go index b8680ef0e..d856f089e 100644 --- a/middlewares/auth/forward.go +++ b/pkg/middlewares/auth/forward.go @@ -9,9 +9,9 @@ import ( "net/http" "strings" - "github.com/containous/traefik/config" - "github.com/containous/traefik/middlewares" - "github.com/containous/traefik/tracing" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/middlewares" + "github.com/containous/traefik/pkg/tracing" "github.com/opentracing/opentracing-go/ext" "github.com/vulcand/oxy/forward" "github.com/vulcand/oxy/utils" diff --git a/middlewares/auth/forward_test.go b/pkg/middlewares/auth/forward_test.go similarity index 99% rename from middlewares/auth/forward_test.go rename to pkg/middlewares/auth/forward_test.go index 5512434f1..ae0b6452c 100644 --- a/middlewares/auth/forward_test.go +++ b/pkg/middlewares/auth/forward_test.go @@ -8,8 +8,8 @@ import ( "net/http/httptest" "testing" - "github.com/containous/traefik/config" - "github.com/containous/traefik/testhelpers" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/testhelpers" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/vulcand/oxy/forward" diff --git a/middlewares/buffering/buffering.go b/pkg/middlewares/buffering/buffering.go similarity index 91% rename from middlewares/buffering/buffering.go rename to pkg/middlewares/buffering/buffering.go index 39f0343f7..5c00d839c 100644 --- a/middlewares/buffering/buffering.go +++ b/pkg/middlewares/buffering/buffering.go @@ -4,9 +4,9 @@ import ( "context" "net/http" - "github.com/containous/traefik/config" - "github.com/containous/traefik/middlewares" - "github.com/containous/traefik/tracing" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/middlewares" + "github.com/containous/traefik/pkg/tracing" "github.com/opentracing/opentracing-go/ext" oxybuffer "github.com/vulcand/oxy/buffer" ) diff --git a/middlewares/chain/chain.go b/pkg/middlewares/chain/chain.go similarity index 85% rename from middlewares/chain/chain.go rename to pkg/middlewares/chain/chain.go index ceb62e789..1b25cd833 100644 --- a/middlewares/chain/chain.go +++ b/pkg/middlewares/chain/chain.go @@ -5,8 +5,8 @@ import ( "net/http" "github.com/containous/alice" - "github.com/containous/traefik/config" - "github.com/containous/traefik/middlewares" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/middlewares" ) const ( diff --git a/middlewares/circuitbreaker/circuit_breaker.go b/pkg/middlewares/circuitbreaker/circuit_breaker.go similarity index 90% rename from middlewares/circuitbreaker/circuit_breaker.go rename to pkg/middlewares/circuitbreaker/circuit_breaker.go index 625ffae30..6dbafff94 100644 --- a/middlewares/circuitbreaker/circuit_breaker.go +++ b/pkg/middlewares/circuitbreaker/circuit_breaker.go @@ -4,10 +4,10 @@ import ( "context" "net/http" - "github.com/containous/traefik/config" - "github.com/containous/traefik/log" - "github.com/containous/traefik/middlewares" - "github.com/containous/traefik/tracing" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/pkg/middlewares" + "github.com/containous/traefik/pkg/tracing" "github.com/opentracing/opentracing-go/ext" "github.com/vulcand/oxy/cbreaker" ) diff --git a/middlewares/compress/compress.go b/pkg/middlewares/compress/compress.go similarity index 93% rename from middlewares/compress/compress.go rename to pkg/middlewares/compress/compress.go index 6b89092d1..8d3c3d933 100644 --- a/middlewares/compress/compress.go +++ b/pkg/middlewares/compress/compress.go @@ -7,8 +7,8 @@ import ( "strings" "github.com/NYTimes/gziphandler" - "github.com/containous/traefik/middlewares" - "github.com/containous/traefik/tracing" + "github.com/containous/traefik/pkg/middlewares" + "github.com/containous/traefik/pkg/tracing" "github.com/opentracing/opentracing-go/ext" "github.com/sirupsen/logrus" ) diff --git a/middlewares/compress/compress_test.go b/pkg/middlewares/compress/compress_test.go similarity index 99% rename from middlewares/compress/compress_test.go rename to pkg/middlewares/compress/compress_test.go index dc94b4227..6f2c4e923 100644 --- a/middlewares/compress/compress_test.go +++ b/pkg/middlewares/compress/compress_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/NYTimes/gziphandler" - "github.com/containous/traefik/testhelpers" + "github.com/containous/traefik/pkg/testhelpers" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/middlewares/customerrors/custom_errors.go b/pkg/middlewares/customerrors/custom_errors.go similarity index 98% rename from middlewares/customerrors/custom_errors.go rename to pkg/middlewares/customerrors/custom_errors.go index e70aed58c..b7edd63f2 100644 --- a/middlewares/customerrors/custom_errors.go +++ b/pkg/middlewares/customerrors/custom_errors.go @@ -11,10 +11,10 @@ import ( "strconv" "strings" - "github.com/containous/traefik/config" - "github.com/containous/traefik/middlewares" "github.com/containous/traefik/old/types" - "github.com/containous/traefik/tracing" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/middlewares" + "github.com/containous/traefik/pkg/tracing" "github.com/opentracing/opentracing-go/ext" "github.com/sirupsen/logrus" "github.com/vulcand/oxy/utils" diff --git a/middlewares/customerrors/custom_errors_test.go b/pkg/middlewares/customerrors/custom_errors_test.go similarity index 97% rename from middlewares/customerrors/custom_errors_test.go rename to pkg/middlewares/customerrors/custom_errors_test.go index d3ae137e1..27c33d98b 100644 --- a/middlewares/customerrors/custom_errors_test.go +++ b/pkg/middlewares/customerrors/custom_errors_test.go @@ -7,9 +7,9 @@ import ( "net/http/httptest" "testing" - "github.com/containous/traefik/config" - "github.com/containous/traefik/middlewares" - "github.com/containous/traefik/testhelpers" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/middlewares" + "github.com/containous/traefik/pkg/testhelpers" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/middlewares/emptybackendhandler/empty_backend_handler.go b/pkg/middlewares/emptybackendhandler/empty_backend_handler.go similarity index 95% rename from middlewares/emptybackendhandler/empty_backend_handler.go rename to pkg/middlewares/emptybackendhandler/empty_backend_handler.go index 36e3571c6..532e8cbd5 100644 --- a/middlewares/emptybackendhandler/empty_backend_handler.go +++ b/pkg/middlewares/emptybackendhandler/empty_backend_handler.go @@ -3,7 +3,7 @@ package emptybackendhandler import ( "net/http" - "github.com/containous/traefik/healthcheck" + "github.com/containous/traefik/pkg/healthcheck" ) // EmptyBackend is a middleware that checks whether the current Backend diff --git a/middlewares/emptybackendhandler/empty_backend_handler_test.go b/pkg/middlewares/emptybackendhandler/empty_backend_handler_test.go similarity index 97% rename from middlewares/emptybackendhandler/empty_backend_handler_test.go rename to pkg/middlewares/emptybackendhandler/empty_backend_handler_test.go index d7c18c99e..514748698 100644 --- a/middlewares/emptybackendhandler/empty_backend_handler_test.go +++ b/pkg/middlewares/emptybackendhandler/empty_backend_handler_test.go @@ -7,7 +7,7 @@ import ( "net/url" "testing" - "github.com/containous/traefik/testhelpers" + "github.com/containous/traefik/pkg/testhelpers" "github.com/stretchr/testify/assert" "github.com/vulcand/oxy/roundrobin" ) diff --git a/middlewares/forwardedheaders/forwarded_header.go b/pkg/middlewares/forwardedheaders/forwarded_header.go similarity index 96% rename from middlewares/forwardedheaders/forwarded_header.go rename to pkg/middlewares/forwardedheaders/forwarded_header.go index 3f0667e7d..7512d2da8 100644 --- a/middlewares/forwardedheaders/forwarded_header.go +++ b/pkg/middlewares/forwardedheaders/forwarded_header.go @@ -3,7 +3,7 @@ package forwardedheaders import ( "net/http" - "github.com/containous/traefik/ip" + "github.com/containous/traefik/pkg/ip" "github.com/vulcand/oxy/forward" "github.com/vulcand/oxy/utils" ) diff --git a/middlewares/forwardedheaders/forwarded_header_test.go b/pkg/middlewares/forwardedheaders/forwarded_header_test.go similarity index 100% rename from middlewares/forwardedheaders/forwarded_header_test.go rename to pkg/middlewares/forwardedheaders/forwarded_header_test.go diff --git a/middlewares/handler_switcher.go b/pkg/middlewares/handler_switcher.go similarity index 95% rename from middlewares/handler_switcher.go rename to pkg/middlewares/handler_switcher.go index 28a186111..a52432aef 100644 --- a/middlewares/handler_switcher.go +++ b/pkg/middlewares/handler_switcher.go @@ -3,7 +3,7 @@ package middlewares import ( "net/http" - "github.com/containous/traefik/safe" + "github.com/containous/traefik/pkg/safe" ) // HTTPHandlerSwitcher allows hot switching of http.ServeMux diff --git a/middlewares/headers/headers.go b/pkg/middlewares/headers/headers.go similarity index 96% rename from middlewares/headers/headers.go rename to pkg/middlewares/headers/headers.go index fadaeedee..fd5fd1c8f 100644 --- a/middlewares/headers/headers.go +++ b/pkg/middlewares/headers/headers.go @@ -6,9 +6,9 @@ import ( "errors" "net/http" - "github.com/containous/traefik/config" - "github.com/containous/traefik/middlewares" - "github.com/containous/traefik/tracing" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/middlewares" + "github.com/containous/traefik/pkg/tracing" "github.com/opentracing/opentracing-go/ext" "github.com/unrolled/secure" ) diff --git a/middlewares/headers/headers_test.go b/pkg/middlewares/headers/headers_test.go similarity index 98% rename from middlewares/headers/headers_test.go rename to pkg/middlewares/headers/headers_test.go index 8f23fd094..835e56dd6 100644 --- a/middlewares/headers/headers_test.go +++ b/pkg/middlewares/headers/headers_test.go @@ -8,8 +8,8 @@ import ( "net/http/httptest" "testing" - "github.com/containous/traefik/config" - "github.com/containous/traefik/testhelpers" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/testhelpers" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/middlewares/ipwhitelist/ip_whitelist.go b/pkg/middlewares/ipwhitelist/ip_whitelist.go similarity index 92% rename from middlewares/ipwhitelist/ip_whitelist.go rename to pkg/middlewares/ipwhitelist/ip_whitelist.go index a96a5d137..08823137a 100644 --- a/middlewares/ipwhitelist/ip_whitelist.go +++ b/pkg/middlewares/ipwhitelist/ip_whitelist.go @@ -5,10 +5,10 @@ import ( "fmt" "net/http" - "github.com/containous/traefik/config" - "github.com/containous/traefik/ip" - "github.com/containous/traefik/middlewares" - "github.com/containous/traefik/tracing" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/ip" + "github.com/containous/traefik/pkg/middlewares" + "github.com/containous/traefik/pkg/tracing" "github.com/opentracing/opentracing-go/ext" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/middlewares/ipwhitelist/ip_whitelist_test.go b/pkg/middlewares/ipwhitelist/ip_whitelist_test.go similarity index 97% rename from middlewares/ipwhitelist/ip_whitelist_test.go rename to pkg/middlewares/ipwhitelist/ip_whitelist_test.go index 7f525d32e..6b3cea987 100644 --- a/middlewares/ipwhitelist/ip_whitelist_test.go +++ b/pkg/middlewares/ipwhitelist/ip_whitelist_test.go @@ -6,7 +6,7 @@ import ( "net/http/httptest" "testing" - "github.com/containous/traefik/config" + "github.com/containous/traefik/pkg/config" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/middlewares/maxconnection/max_connection.go b/pkg/middlewares/maxconnection/max_connection.go similarity index 89% rename from middlewares/maxconnection/max_connection.go rename to pkg/middlewares/maxconnection/max_connection.go index d32615fd8..352b6e696 100644 --- a/middlewares/maxconnection/max_connection.go +++ b/pkg/middlewares/maxconnection/max_connection.go @@ -5,9 +5,9 @@ import ( "fmt" "net/http" - "github.com/containous/traefik/config" - "github.com/containous/traefik/middlewares" - "github.com/containous/traefik/tracing" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/middlewares" + "github.com/containous/traefik/pkg/tracing" "github.com/opentracing/opentracing-go/ext" "github.com/vulcand/oxy/connlimit" "github.com/vulcand/oxy/utils" diff --git a/middlewares/middleware.go b/pkg/middlewares/middleware.go similarity index 89% rename from middlewares/middleware.go rename to pkg/middlewares/middleware.go index c3cd9df29..0c65b9745 100644 --- a/middlewares/middleware.go +++ b/pkg/middlewares/middleware.go @@ -3,7 +3,7 @@ package middlewares import ( "context" - "github.com/containous/traefik/log" + "github.com/containous/traefik/pkg/log" "github.com/sirupsen/logrus" ) diff --git a/middlewares/passtlsclientcert/pass_tls_client_cert.go b/pkg/middlewares/passtlsclientcert/pass_tls_client_cert.go similarity index 97% rename from middlewares/passtlsclientcert/pass_tls_client_cert.go rename to pkg/middlewares/passtlsclientcert/pass_tls_client_cert.go index 706f14c2a..e730440ab 100644 --- a/middlewares/passtlsclientcert/pass_tls_client_cert.go +++ b/pkg/middlewares/passtlsclientcert/pass_tls_client_cert.go @@ -11,10 +11,10 @@ import ( "net/url" "strings" - "github.com/containous/traefik/config" - "github.com/containous/traefik/log" - "github.com/containous/traefik/middlewares" - "github.com/containous/traefik/tracing" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/pkg/middlewares" + "github.com/containous/traefik/pkg/tracing" "github.com/opentracing/opentracing-go/ext" "github.com/sirupsen/logrus" ) diff --git a/middlewares/passtlsclientcert/pass_tls_client_cert_test.go b/pkg/middlewares/passtlsclientcert/pass_tls_client_cert_test.go similarity index 99% rename from middlewares/passtlsclientcert/pass_tls_client_cert_test.go rename to pkg/middlewares/passtlsclientcert/pass_tls_client_cert_test.go index 519580096..694362f99 100644 --- a/middlewares/passtlsclientcert/pass_tls_client_cert_test.go +++ b/pkg/middlewares/passtlsclientcert/pass_tls_client_cert_test.go @@ -13,8 +13,8 @@ import ( "strings" "testing" - "github.com/containous/traefik/config" - "github.com/containous/traefik/testhelpers" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/testhelpers" "github.com/stretchr/testify/require" ) diff --git a/middlewares/ratelimiter/rate_limiter.go b/pkg/middlewares/ratelimiter/rate_limiter.go similarity index 89% rename from middlewares/ratelimiter/rate_limiter.go rename to pkg/middlewares/ratelimiter/rate_limiter.go index 36fa3d18d..76c4f3d51 100644 --- a/middlewares/ratelimiter/rate_limiter.go +++ b/pkg/middlewares/ratelimiter/rate_limiter.go @@ -5,9 +5,9 @@ import ( "net/http" "time" - "github.com/containous/traefik/config" - "github.com/containous/traefik/middlewares" - "github.com/containous/traefik/tracing" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/middlewares" + "github.com/containous/traefik/pkg/tracing" "github.com/opentracing/opentracing-go/ext" "github.com/vulcand/oxy/ratelimit" "github.com/vulcand/oxy/utils" diff --git a/middlewares/recovery/recovery.go b/pkg/middlewares/recovery/recovery.go similarity index 94% rename from middlewares/recovery/recovery.go rename to pkg/middlewares/recovery/recovery.go index 28886e5eb..627478fdc 100644 --- a/middlewares/recovery/recovery.go +++ b/pkg/middlewares/recovery/recovery.go @@ -4,7 +4,7 @@ import ( "context" "net/http" - "github.com/containous/traefik/middlewares" + "github.com/containous/traefik/pkg/middlewares" "github.com/sirupsen/logrus" ) diff --git a/middlewares/recovery/recovery_test.go b/pkg/middlewares/recovery/recovery_test.go similarity index 100% rename from middlewares/recovery/recovery_test.go rename to pkg/middlewares/recovery/recovery_test.go diff --git a/middlewares/redirect/redirect.go b/pkg/middlewares/redirect/redirect.go similarity index 98% rename from middlewares/redirect/redirect.go rename to pkg/middlewares/redirect/redirect.go index ac3b6d151..44a7c0e4a 100644 --- a/middlewares/redirect/redirect.go +++ b/pkg/middlewares/redirect/redirect.go @@ -10,7 +10,7 @@ import ( "regexp" "strings" - "github.com/containous/traefik/tracing" + "github.com/containous/traefik/pkg/tracing" "github.com/opentracing/opentracing-go/ext" "github.com/vulcand/oxy/utils" ) diff --git a/middlewares/redirect/redirect_regex.go b/pkg/middlewares/redirect/redirect_regex.go similarity index 85% rename from middlewares/redirect/redirect_regex.go rename to pkg/middlewares/redirect/redirect_regex.go index b57383b71..1b5d3033a 100644 --- a/middlewares/redirect/redirect_regex.go +++ b/pkg/middlewares/redirect/redirect_regex.go @@ -4,8 +4,8 @@ import ( "context" "net/http" - "github.com/containous/traefik/config" - "github.com/containous/traefik/middlewares" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/middlewares" ) const ( diff --git a/middlewares/redirect/redirect_regex_test.go b/pkg/middlewares/redirect/redirect_regex_test.go similarity index 98% rename from middlewares/redirect/redirect_regex_test.go rename to pkg/middlewares/redirect/redirect_regex_test.go index 139d770f7..3e48e6ff2 100644 --- a/middlewares/redirect/redirect_regex_test.go +++ b/pkg/middlewares/redirect/redirect_regex_test.go @@ -7,8 +7,8 @@ import ( "net/http/httptest" "testing" - "github.com/containous/traefik/config" - "github.com/containous/traefik/testhelpers" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/testhelpers" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/middlewares/redirect/redirect_scheme.go b/pkg/middlewares/redirect/redirect_scheme.go similarity index 90% rename from middlewares/redirect/redirect_scheme.go rename to pkg/middlewares/redirect/redirect_scheme.go index 2142c09b1..b4137310c 100644 --- a/middlewares/redirect/redirect_scheme.go +++ b/pkg/middlewares/redirect/redirect_scheme.go @@ -4,10 +4,10 @@ import ( "context" "net/http" - "github.com/containous/traefik/middlewares" + "github.com/containous/traefik/pkg/middlewares" "github.com/pkg/errors" - "github.com/containous/traefik/config" + "github.com/containous/traefik/pkg/config" ) const ( diff --git a/middlewares/redirect/redirect_scheme_test.go b/pkg/middlewares/redirect/redirect_scheme_test.go similarity index 99% rename from middlewares/redirect/redirect_scheme_test.go rename to pkg/middlewares/redirect/redirect_scheme_test.go index b7dc6507f..99205ef40 100644 --- a/middlewares/redirect/redirect_scheme_test.go +++ b/pkg/middlewares/redirect/redirect_scheme_test.go @@ -8,7 +8,7 @@ import ( "regexp" "testing" - "github.com/containous/traefik/config" + "github.com/containous/traefik/pkg/config" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/middlewares/replacepath/replace_path.go b/pkg/middlewares/replacepath/replace_path.go similarity index 88% rename from middlewares/replacepath/replace_path.go rename to pkg/middlewares/replacepath/replace_path.go index a9c969c21..4e46a7a76 100644 --- a/middlewares/replacepath/replace_path.go +++ b/pkg/middlewares/replacepath/replace_path.go @@ -4,9 +4,9 @@ import ( "context" "net/http" - "github.com/containous/traefik/config" - "github.com/containous/traefik/middlewares" - "github.com/containous/traefik/tracing" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/middlewares" + "github.com/containous/traefik/pkg/tracing" "github.com/opentracing/opentracing-go/ext" ) diff --git a/middlewares/replacepath/replace_path_test.go b/pkg/middlewares/replacepath/replace_path_test.go similarity index 92% rename from middlewares/replacepath/replace_path_test.go rename to pkg/middlewares/replacepath/replace_path_test.go index 63fd7cc9e..102d0aa81 100644 --- a/middlewares/replacepath/replace_path_test.go +++ b/pkg/middlewares/replacepath/replace_path_test.go @@ -5,8 +5,8 @@ import ( "net/http" "testing" - "github.com/containous/traefik/config" - "github.com/containous/traefik/testhelpers" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/testhelpers" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/middlewares/replacepathregex/replace_path_regex.go b/pkg/middlewares/replacepathregex/replace_path_regex.go similarity index 88% rename from middlewares/replacepathregex/replace_path_regex.go rename to pkg/middlewares/replacepathregex/replace_path_regex.go index 61b921b1e..a3ca0b519 100644 --- a/middlewares/replacepathregex/replace_path_regex.go +++ b/pkg/middlewares/replacepathregex/replace_path_regex.go @@ -7,10 +7,10 @@ import ( "regexp" "strings" - "github.com/containous/traefik/config" - "github.com/containous/traefik/middlewares" - "github.com/containous/traefik/middlewares/replacepath" - "github.com/containous/traefik/tracing" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/middlewares" + "github.com/containous/traefik/pkg/middlewares/replacepath" + "github.com/containous/traefik/pkg/tracing" "github.com/opentracing/opentracing-go/ext" ) diff --git a/middlewares/replacepathregex/replace_path_regex_test.go b/pkg/middlewares/replacepathregex/replace_path_regex_test.go similarity index 94% rename from middlewares/replacepathregex/replace_path_regex_test.go rename to pkg/middlewares/replacepathregex/replace_path_regex_test.go index 74d6fafe1..67ab607e8 100644 --- a/middlewares/replacepathregex/replace_path_regex_test.go +++ b/pkg/middlewares/replacepathregex/replace_path_regex_test.go @@ -5,9 +5,9 @@ import ( "net/http" "testing" - "github.com/containous/traefik/config" - "github.com/containous/traefik/middlewares/replacepath" - "github.com/containous/traefik/testhelpers" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/middlewares/replacepath" + "github.com/containous/traefik/pkg/testhelpers" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/middlewares/requestdecorator/hostresolver.go b/pkg/middlewares/requestdecorator/hostresolver.go similarity index 98% rename from middlewares/requestdecorator/hostresolver.go rename to pkg/middlewares/requestdecorator/hostresolver.go index d728c8493..a5e7076d5 100644 --- a/middlewares/requestdecorator/hostresolver.go +++ b/pkg/middlewares/requestdecorator/hostresolver.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/containous/traefik/log" + "github.com/containous/traefik/pkg/log" "github.com/miekg/dns" "github.com/patrickmn/go-cache" ) diff --git a/middlewares/requestdecorator/hostresolver_test.go b/pkg/middlewares/requestdecorator/hostresolver_test.go similarity index 100% rename from middlewares/requestdecorator/hostresolver_test.go rename to pkg/middlewares/requestdecorator/hostresolver_test.go diff --git a/middlewares/requestdecorator/request_decorator.go b/pkg/middlewares/requestdecorator/request_decorator.go similarity index 98% rename from middlewares/requestdecorator/request_decorator.go rename to pkg/middlewares/requestdecorator/request_decorator.go index 4f8d6afdc..a4c053cbe 100644 --- a/middlewares/requestdecorator/request_decorator.go +++ b/pkg/middlewares/requestdecorator/request_decorator.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/containous/alice" - "github.com/containous/traefik/types" + "github.com/containous/traefik/pkg/types" ) const ( diff --git a/middlewares/requestdecorator/request_decorator_test.go b/pkg/middlewares/requestdecorator/request_decorator_test.go similarity index 96% rename from middlewares/requestdecorator/request_decorator_test.go rename to pkg/middlewares/requestdecorator/request_decorator_test.go index 0e3700a40..4cce6bd1b 100644 --- a/middlewares/requestdecorator/request_decorator_test.go +++ b/pkg/middlewares/requestdecorator/request_decorator_test.go @@ -4,9 +4,9 @@ import ( "net/http" "testing" - "github.com/containous/traefik/types" + "github.com/containous/traefik/pkg/types" - "github.com/containous/traefik/testhelpers" + "github.com/containous/traefik/pkg/testhelpers" "github.com/stretchr/testify/assert" ) diff --git a/middlewares/retry/retry.go b/pkg/middlewares/retry/retry.go similarity index 97% rename from middlewares/retry/retry.go rename to pkg/middlewares/retry/retry.go index 7c0d0a835..da4c28e5a 100644 --- a/middlewares/retry/retry.go +++ b/pkg/middlewares/retry/retry.go @@ -9,9 +9,9 @@ import ( "net/http" "net/http/httptrace" - "github.com/containous/traefik/config" - "github.com/containous/traefik/middlewares" - "github.com/containous/traefik/tracing" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/middlewares" + "github.com/containous/traefik/pkg/tracing" "github.com/opentracing/opentracing-go/ext" ) diff --git a/middlewares/retry/retry_test.go b/pkg/middlewares/retry/retry_test.go similarity index 98% rename from middlewares/retry/retry_test.go rename to pkg/middlewares/retry/retry_test.go index 8a407c578..10eb3f725 100644 --- a/middlewares/retry/retry_test.go +++ b/pkg/middlewares/retry/retry_test.go @@ -9,9 +9,9 @@ import ( "strings" "testing" - "github.com/containous/traefik/config" - "github.com/containous/traefik/middlewares/emptybackendhandler" - "github.com/containous/traefik/testhelpers" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/middlewares/emptybackendhandler" + "github.com/containous/traefik/pkg/testhelpers" "github.com/gorilla/websocket" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/middlewares/stateful.go b/pkg/middlewares/stateful.go similarity index 100% rename from middlewares/stateful.go rename to pkg/middlewares/stateful.go diff --git a/middlewares/stripprefix/strip_prefix.go b/pkg/middlewares/stripprefix/strip_prefix.go similarity index 92% rename from middlewares/stripprefix/strip_prefix.go rename to pkg/middlewares/stripprefix/strip_prefix.go index 3ef439b9e..504f20fa3 100644 --- a/middlewares/stripprefix/strip_prefix.go +++ b/pkg/middlewares/stripprefix/strip_prefix.go @@ -5,9 +5,9 @@ import ( "net/http" "strings" - "github.com/containous/traefik/config" - "github.com/containous/traefik/middlewares" - "github.com/containous/traefik/tracing" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/middlewares" + "github.com/containous/traefik/pkg/tracing" "github.com/opentracing/opentracing-go/ext" ) diff --git a/middlewares/stripprefix/strip_prefix_test.go b/pkg/middlewares/stripprefix/strip_prefix_test.go similarity index 97% rename from middlewares/stripprefix/strip_prefix_test.go rename to pkg/middlewares/stripprefix/strip_prefix_test.go index 0c2d8a911..73690ce40 100644 --- a/middlewares/stripprefix/strip_prefix_test.go +++ b/pkg/middlewares/stripprefix/strip_prefix_test.go @@ -6,8 +6,8 @@ import ( "net/http/httptest" "testing" - "github.com/containous/traefik/config" - "github.com/containous/traefik/testhelpers" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/testhelpers" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/middlewares/stripprefixregex/strip_prefix_regex.go b/pkg/middlewares/stripprefixregex/strip_prefix_regex.go similarity index 90% rename from middlewares/stripprefixregex/strip_prefix_regex.go rename to pkg/middlewares/stripprefixregex/strip_prefix_regex.go index 0fcfb15b6..574092141 100644 --- a/middlewares/stripprefixregex/strip_prefix_regex.go +++ b/pkg/middlewares/stripprefixregex/strip_prefix_regex.go @@ -6,10 +6,10 @@ import ( "strings" "github.com/containous/mux" - "github.com/containous/traefik/config" - "github.com/containous/traefik/middlewares" - "github.com/containous/traefik/middlewares/stripprefix" - "github.com/containous/traefik/tracing" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/middlewares" + "github.com/containous/traefik/pkg/middlewares/stripprefix" + "github.com/containous/traefik/pkg/tracing" "github.com/opentracing/opentracing-go/ext" ) diff --git a/middlewares/stripprefixregex/strip_prefix_regex_test.go b/pkg/middlewares/stripprefixregex/strip_prefix_regex_test.go similarity index 94% rename from middlewares/stripprefixregex/strip_prefix_regex_test.go rename to pkg/middlewares/stripprefixregex/strip_prefix_regex_test.go index c882fbeb7..d8a5ca0aa 100644 --- a/middlewares/stripprefixregex/strip_prefix_regex_test.go +++ b/pkg/middlewares/stripprefixregex/strip_prefix_regex_test.go @@ -6,9 +6,9 @@ import ( "net/http/httptest" "testing" - "github.com/containous/traefik/config" - "github.com/containous/traefik/middlewares/stripprefix" - "github.com/containous/traefik/testhelpers" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/middlewares/stripprefix" + "github.com/containous/traefik/pkg/testhelpers" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/middlewares/tracing/entrypoint.go b/pkg/middlewares/tracing/entrypoint.go similarity index 94% rename from middlewares/tracing/entrypoint.go rename to pkg/middlewares/tracing/entrypoint.go index a2b832258..9fcc9471e 100644 --- a/middlewares/tracing/entrypoint.go +++ b/pkg/middlewares/tracing/entrypoint.go @@ -5,8 +5,8 @@ import ( "net/http" "github.com/containous/alice" - "github.com/containous/traefik/middlewares" - "github.com/containous/traefik/tracing" + "github.com/containous/traefik/pkg/middlewares" + "github.com/containous/traefik/pkg/tracing" "github.com/opentracing/opentracing-go" "github.com/opentracing/opentracing-go/ext" ) diff --git a/middlewares/tracing/entrypoint_test.go b/pkg/middlewares/tracing/entrypoint_test.go similarity index 98% rename from middlewares/tracing/entrypoint_test.go rename to pkg/middlewares/tracing/entrypoint_test.go index 24338c43c..9d0ffd1dd 100644 --- a/middlewares/tracing/entrypoint_test.go +++ b/pkg/middlewares/tracing/entrypoint_test.go @@ -6,7 +6,7 @@ import ( "net/http/httptest" "testing" - "github.com/containous/traefik/tracing" + "github.com/containous/traefik/pkg/tracing" "github.com/opentracing/opentracing-go/ext" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/middlewares/tracing/forwarder.go b/pkg/middlewares/tracing/forwarder.go similarity index 93% rename from middlewares/tracing/forwarder.go rename to pkg/middlewares/tracing/forwarder.go index faa092d93..c485f927d 100644 --- a/middlewares/tracing/forwarder.go +++ b/pkg/middlewares/tracing/forwarder.go @@ -4,8 +4,8 @@ import ( "context" "net/http" - "github.com/containous/traefik/middlewares" - "github.com/containous/traefik/tracing" + "github.com/containous/traefik/pkg/middlewares" + "github.com/containous/traefik/pkg/tracing" "github.com/opentracing/opentracing-go/ext" ) diff --git a/middlewares/tracing/forwarder_test.go b/pkg/middlewares/tracing/forwarder_test.go similarity index 99% rename from middlewares/tracing/forwarder_test.go rename to pkg/middlewares/tracing/forwarder_test.go index c53fbe7cf..f9253d859 100644 --- a/middlewares/tracing/forwarder_test.go +++ b/pkg/middlewares/tracing/forwarder_test.go @@ -6,7 +6,7 @@ import ( "net/http/httptest" "testing" - "github.com/containous/traefik/tracing" + "github.com/containous/traefik/pkg/tracing" "github.com/opentracing/opentracing-go/ext" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/middlewares/tracing/mock_tracing_test.go b/pkg/middlewares/tracing/mock_tracing_test.go similarity index 100% rename from middlewares/tracing/mock_tracing_test.go rename to pkg/middlewares/tracing/mock_tracing_test.go diff --git a/middlewares/tracing/status_code.go b/pkg/middlewares/tracing/status_code.go similarity index 100% rename from middlewares/tracing/status_code.go rename to pkg/middlewares/tracing/status_code.go diff --git a/middlewares/tracing/wrapper.go b/pkg/middlewares/tracing/wrapper.go similarity index 94% rename from middlewares/tracing/wrapper.go rename to pkg/middlewares/tracing/wrapper.go index e0d1810d6..a0686bf76 100644 --- a/middlewares/tracing/wrapper.go +++ b/pkg/middlewares/tracing/wrapper.go @@ -5,8 +5,8 @@ import ( "net/http" "github.com/containous/alice" - "github.com/containous/traefik/log" - "github.com/containous/traefik/tracing" + "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/pkg/tracing" "github.com/opentracing/opentracing-go/ext" ) diff --git a/ping/ping.go b/pkg/ping/ping.go similarity index 100% rename from ping/ping.go rename to pkg/ping/ping.go diff --git a/provider/acme/account.go b/pkg/provider/acme/account.go similarity index 98% rename from provider/acme/account.go rename to pkg/provider/acme/account.go index 1a426a76a..a997a92b5 100644 --- a/provider/acme/account.go +++ b/pkg/provider/acme/account.go @@ -7,7 +7,7 @@ import ( "crypto/rsa" "crypto/x509" - "github.com/containous/traefik/log" + "github.com/containous/traefik/pkg/log" "github.com/go-acme/lego/certcrypto" "github.com/go-acme/lego/registration" ) diff --git a/provider/acme/challenge_http.go b/pkg/provider/acme/challenge_http.go similarity index 96% rename from provider/acme/challenge_http.go rename to pkg/provider/acme/challenge_http.go index f1669d264..755662fd7 100644 --- a/provider/acme/challenge_http.go +++ b/pkg/provider/acme/challenge_http.go @@ -8,8 +8,8 @@ import ( "github.com/cenkalti/backoff" "github.com/containous/mux" - "github.com/containous/traefik/log" - "github.com/containous/traefik/safe" + "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/pkg/safe" "github.com/go-acme/lego/challenge" "github.com/go-acme/lego/challenge/http01" ) diff --git a/provider/acme/challenge_tls.go b/pkg/provider/acme/challenge_tls.go similarity index 94% rename from provider/acme/challenge_tls.go rename to pkg/provider/acme/challenge_tls.go index 61891c6bc..c0697df89 100644 --- a/provider/acme/challenge_tls.go +++ b/pkg/provider/acme/challenge_tls.go @@ -3,8 +3,8 @@ package acme import ( "crypto/tls" - "github.com/containous/traefik/log" - "github.com/containous/traefik/types" + "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/pkg/types" "github.com/go-acme/lego/challenge" "github.com/go-acme/lego/challenge/tlsalpn01" ) diff --git a/provider/acme/local_store.go b/pkg/provider/acme/local_store.go similarity index 98% rename from provider/acme/local_store.go rename to pkg/provider/acme/local_store.go index 9df8f8835..fa5c00b13 100644 --- a/provider/acme/local_store.go +++ b/pkg/provider/acme/local_store.go @@ -8,8 +8,8 @@ import ( "regexp" "sync" - "github.com/containous/traefik/log" - "github.com/containous/traefik/safe" + "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/pkg/safe" ) var _ Store = (*LocalStore)(nil) diff --git a/provider/acme/local_store_unix.go b/pkg/provider/acme/local_store_unix.go similarity index 100% rename from provider/acme/local_store_unix.go rename to pkg/provider/acme/local_store_unix.go diff --git a/provider/acme/local_store_windows.go b/pkg/provider/acme/local_store_windows.go similarity index 100% rename from provider/acme/local_store_windows.go rename to pkg/provider/acme/local_store_windows.go diff --git a/provider/acme/provider.go b/pkg/provider/acme/provider.go similarity index 98% rename from provider/acme/provider.go rename to pkg/provider/acme/provider.go index 921b4e1a3..10e8ace5e 100644 --- a/provider/acme/provider.go +++ b/pkg/provider/acme/provider.go @@ -15,13 +15,13 @@ import ( "github.com/cenkalti/backoff" "github.com/containous/flaeg/parse" - "github.com/containous/traefik/config" - "github.com/containous/traefik/log" - "github.com/containous/traefik/rules" - "github.com/containous/traefik/safe" - traefiktls "github.com/containous/traefik/tls" - "github.com/containous/traefik/types" - "github.com/containous/traefik/version" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/pkg/rules" + "github.com/containous/traefik/pkg/safe" + traefiktls "github.com/containous/traefik/pkg/tls" + "github.com/containous/traefik/pkg/types" + "github.com/containous/traefik/pkg/version" "github.com/go-acme/lego/certificate" "github.com/go-acme/lego/challenge" "github.com/go-acme/lego/challenge/dns01" diff --git a/provider/acme/provider_test.go b/pkg/provider/acme/provider_test.go similarity index 99% rename from provider/acme/provider_test.go rename to pkg/provider/acme/provider_test.go index 12b77234a..94b6072cb 100644 --- a/provider/acme/provider_test.go +++ b/pkg/provider/acme/provider_test.go @@ -5,8 +5,8 @@ import ( "crypto/tls" "testing" - "github.com/containous/traefik/safe" - "github.com/containous/traefik/types" + "github.com/containous/traefik/pkg/safe" + "github.com/containous/traefik/pkg/types" "github.com/go-acme/lego/certcrypto" "github.com/stretchr/testify/assert" ) diff --git a/provider/acme/store.go b/pkg/provider/acme/store.go similarity index 100% rename from provider/acme/store.go rename to pkg/provider/acme/store.go diff --git a/provider/aggregator/aggregator.go b/pkg/provider/aggregator/aggregator.go similarity index 89% rename from provider/aggregator/aggregator.go rename to pkg/provider/aggregator/aggregator.go index 5e83d7bbd..dea68443a 100644 --- a/provider/aggregator/aggregator.go +++ b/pkg/provider/aggregator/aggregator.go @@ -3,12 +3,12 @@ package aggregator import ( "encoding/json" - "github.com/containous/traefik/config" - "github.com/containous/traefik/config/static" - "github.com/containous/traefik/log" - "github.com/containous/traefik/provider" - "github.com/containous/traefik/provider/file" - "github.com/containous/traefik/safe" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/config/static" + "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/pkg/provider" + "github.com/containous/traefik/pkg/provider/file" + "github.com/containous/traefik/pkg/safe" ) // ProviderAggregator aggregates providers. diff --git a/provider/base_provider.go b/pkg/provider/base_provider.go similarity index 95% rename from provider/base_provider.go rename to pkg/provider/base_provider.go index f5b896170..5192a9e75 100644 --- a/provider/base_provider.go +++ b/pkg/provider/base_provider.go @@ -7,10 +7,10 @@ import ( "github.com/BurntSushi/toml" "github.com/Masterminds/sprig" - "github.com/containous/traefik/config" - "github.com/containous/traefik/log" - "github.com/containous/traefik/tls" - "github.com/containous/traefik/types" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/pkg/tls" + "github.com/containous/traefik/pkg/types" ) // BaseProvider should be inherited by providers. diff --git a/provider/configuration.go b/pkg/provider/configuration.go similarity index 98% rename from provider/configuration.go rename to pkg/provider/configuration.go index 7fb152abb..b233d881d 100644 --- a/provider/configuration.go +++ b/pkg/provider/configuration.go @@ -10,8 +10,8 @@ import ( "unicode" "github.com/Masterminds/sprig" - "github.com/containous/traefik/config" - "github.com/containous/traefik/log" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/log" ) // Merge Merges multiple configurations. diff --git a/provider/docker/builder_test.go b/pkg/provider/docker/builder_test.go similarity index 100% rename from provider/docker/builder_test.go rename to pkg/provider/docker/builder_test.go diff --git a/provider/docker/config.go b/pkg/provider/docker/config.go similarity index 97% rename from provider/docker/config.go rename to pkg/provider/docker/config.go index 9ced41c0b..893c65a22 100644 --- a/provider/docker/config.go +++ b/pkg/provider/docker/config.go @@ -7,10 +7,10 @@ import ( "net" "strings" - "github.com/containous/traefik/config" - "github.com/containous/traefik/log" - "github.com/containous/traefik/provider" - "github.com/containous/traefik/provider/label" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/pkg/provider" + "github.com/containous/traefik/pkg/provider/label" "github.com/docker/go-connections/nat" ) diff --git a/provider/docker/config_test.go b/pkg/provider/docker/config_test.go similarity index 99% rename from provider/docker/config_test.go rename to pkg/provider/docker/config_test.go index bb6fa5d8b..ebab2b95d 100644 --- a/provider/docker/config_test.go +++ b/pkg/provider/docker/config_test.go @@ -5,8 +5,8 @@ import ( "strconv" "testing" - "github.com/containous/traefik/config" - "github.com/containous/traefik/types" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/types" docker "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/swarm" "github.com/docker/go-connections/nat" diff --git a/provider/docker/docker.go b/pkg/provider/docker/docker.go similarity index 98% rename from provider/docker/docker.go rename to pkg/provider/docker/docker.go index 3afc131fb..81aca428f 100644 --- a/provider/docker/docker.go +++ b/pkg/provider/docker/docker.go @@ -12,13 +12,13 @@ import ( "time" "github.com/cenkalti/backoff" - "github.com/containous/traefik/config" - "github.com/containous/traefik/job" - "github.com/containous/traefik/log" - "github.com/containous/traefik/provider" - "github.com/containous/traefik/safe" - "github.com/containous/traefik/types" - "github.com/containous/traefik/version" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/job" + "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/pkg/provider" + "github.com/containous/traefik/pkg/safe" + "github.com/containous/traefik/pkg/types" + "github.com/containous/traefik/pkg/version" dockertypes "github.com/docker/docker/api/types" dockercontainertypes "github.com/docker/docker/api/types/container" eventtypes "github.com/docker/docker/api/types/events" diff --git a/provider/docker/docker_unix.go b/pkg/provider/docker/docker_unix.go similarity index 100% rename from provider/docker/docker_unix.go rename to pkg/provider/docker/docker_unix.go diff --git a/provider/docker/docker_windows.go b/pkg/provider/docker/docker_windows.go similarity index 100% rename from provider/docker/docker_windows.go rename to pkg/provider/docker/docker_windows.go diff --git a/provider/docker/label.go b/pkg/provider/docker/label.go similarity index 96% rename from provider/docker/label.go rename to pkg/provider/docker/label.go index b0e898702..061139163 100644 --- a/provider/docker/label.go +++ b/pkg/provider/docker/label.go @@ -3,7 +3,7 @@ package docker import ( "fmt" - "github.com/containous/traefik/provider/label" + "github.com/containous/traefik/pkg/provider/label" ) const ( diff --git a/provider/docker/swarm_test.go b/pkg/provider/docker/swarm_test.go similarity index 100% rename from provider/docker/swarm_test.go rename to pkg/provider/docker/swarm_test.go diff --git a/provider/file/file.go b/pkg/provider/file/file.go similarity index 97% rename from provider/file/file.go rename to pkg/provider/file/file.go index 7f92fe65b..95f5bc6ce 100644 --- a/provider/file/file.go +++ b/pkg/provider/file/file.go @@ -10,11 +10,11 @@ import ( "strings" "text/template" - "github.com/containous/traefik/config" - "github.com/containous/traefik/log" - "github.com/containous/traefik/provider" - "github.com/containous/traefik/safe" - "github.com/containous/traefik/tls" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/pkg/provider" + "github.com/containous/traefik/pkg/safe" + "github.com/containous/traefik/pkg/tls" "github.com/pkg/errors" "gopkg.in/fsnotify.v1" ) diff --git a/provider/file/file_test.go b/pkg/provider/file/file_test.go similarity index 99% rename from provider/file/file_test.go rename to pkg/provider/file/file_test.go index 2ae8af0e5..326448035 100644 --- a/provider/file/file_test.go +++ b/pkg/provider/file/file_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/containous/traefik/config" - "github.com/containous/traefik/safe" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/safe" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/provider/kubernetes/crd/client.go b/pkg/provider/kubernetes/crd/client.go similarity index 97% rename from provider/kubernetes/crd/client.go rename to pkg/provider/kubernetes/crd/client.go index e50adfa5a..fec2c9d58 100644 --- a/provider/kubernetes/crd/client.go +++ b/pkg/provider/kubernetes/crd/client.go @@ -7,10 +7,10 @@ import ( "time" "github.com/containous/traefik/old/log" - "github.com/containous/traefik/provider/kubernetes/crd/generated/clientset/versioned" - "github.com/containous/traefik/provider/kubernetes/crd/generated/informers/externalversions" - "github.com/containous/traefik/provider/kubernetes/crd/traefik/v1alpha1" - "github.com/containous/traefik/provider/kubernetes/k8s" + "github.com/containous/traefik/pkg/provider/kubernetes/crd/generated/clientset/versioned" + "github.com/containous/traefik/pkg/provider/kubernetes/crd/generated/informers/externalversions" + "github.com/containous/traefik/pkg/provider/kubernetes/crd/traefik/v1alpha1" + "github.com/containous/traefik/pkg/provider/kubernetes/k8s" corev1 "k8s.io/api/core/v1" extensionsv1beta1 "k8s.io/api/extensions/v1beta1" kubeerror "k8s.io/apimachinery/pkg/api/errors" diff --git a/provider/kubernetes/crd/client_mock_test.go b/pkg/provider/kubernetes/crd/client_mock_test.go similarity index 95% rename from provider/kubernetes/crd/client_mock_test.go rename to pkg/provider/kubernetes/crd/client_mock_test.go index d9a282467..87b70b73e 100644 --- a/provider/kubernetes/crd/client_mock_test.go +++ b/pkg/provider/kubernetes/crd/client_mock_test.go @@ -4,8 +4,8 @@ import ( "fmt" "io/ioutil" - "github.com/containous/traefik/provider/kubernetes/crd/traefik/v1alpha1" - "github.com/containous/traefik/provider/kubernetes/k8s" + "github.com/containous/traefik/pkg/provider/kubernetes/crd/traefik/v1alpha1" + "github.com/containous/traefik/pkg/provider/kubernetes/k8s" corev1 "k8s.io/api/core/v1" extensionsv1beta1 "k8s.io/api/extensions/v1beta1" v1beta12 "k8s.io/api/extensions/v1beta1" diff --git a/provider/kubernetes/crd/fixtures/services.yml b/pkg/provider/kubernetes/crd/fixtures/services.yml similarity index 100% rename from provider/kubernetes/crd/fixtures/services.yml rename to pkg/provider/kubernetes/crd/fixtures/services.yml diff --git a/provider/kubernetes/crd/fixtures/simple.yml b/pkg/provider/kubernetes/crd/fixtures/simple.yml similarity index 100% rename from provider/kubernetes/crd/fixtures/simple.yml rename to pkg/provider/kubernetes/crd/fixtures/simple.yml diff --git a/provider/kubernetes/crd/fixtures/with_bad_host_rule.yml b/pkg/provider/kubernetes/crd/fixtures/with_bad_host_rule.yml similarity index 100% rename from provider/kubernetes/crd/fixtures/with_bad_host_rule.yml rename to pkg/provider/kubernetes/crd/fixtures/with_bad_host_rule.yml diff --git a/provider/kubernetes/crd/fixtures/with_https_default.yml b/pkg/provider/kubernetes/crd/fixtures/with_https_default.yml similarity index 100% rename from provider/kubernetes/crd/fixtures/with_https_default.yml rename to pkg/provider/kubernetes/crd/fixtures/with_https_default.yml diff --git a/provider/kubernetes/crd/fixtures/with_middleware.yml b/pkg/provider/kubernetes/crd/fixtures/with_middleware.yml similarity index 100% rename from provider/kubernetes/crd/fixtures/with_middleware.yml rename to pkg/provider/kubernetes/crd/fixtures/with_middleware.yml diff --git a/provider/kubernetes/crd/fixtures/with_no_rule_value.yml b/pkg/provider/kubernetes/crd/fixtures/with_no_rule_value.yml similarity index 100% rename from provider/kubernetes/crd/fixtures/with_no_rule_value.yml rename to pkg/provider/kubernetes/crd/fixtures/with_no_rule_value.yml diff --git a/provider/kubernetes/crd/fixtures/with_tls.yml b/pkg/provider/kubernetes/crd/fixtures/with_tls.yml similarity index 100% rename from provider/kubernetes/crd/fixtures/with_tls.yml rename to pkg/provider/kubernetes/crd/fixtures/with_tls.yml diff --git a/provider/kubernetes/crd/fixtures/with_two_rules.yml b/pkg/provider/kubernetes/crd/fixtures/with_two_rules.yml similarity index 100% rename from provider/kubernetes/crd/fixtures/with_two_rules.yml rename to pkg/provider/kubernetes/crd/fixtures/with_two_rules.yml diff --git a/provider/kubernetes/crd/fixtures/with_two_services.yml b/pkg/provider/kubernetes/crd/fixtures/with_two_services.yml similarity index 100% rename from provider/kubernetes/crd/fixtures/with_two_services.yml rename to pkg/provider/kubernetes/crd/fixtures/with_two_services.yml diff --git a/provider/kubernetes/crd/fixtures/with_wrong_rule_kind.yml b/pkg/provider/kubernetes/crd/fixtures/with_wrong_rule_kind.yml similarity index 100% rename from provider/kubernetes/crd/fixtures/with_wrong_rule_kind.yml rename to pkg/provider/kubernetes/crd/fixtures/with_wrong_rule_kind.yml diff --git a/provider/kubernetes/crd/generated/clientset/versioned/clientset.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/clientset.go similarity index 96% rename from provider/kubernetes/crd/generated/clientset/versioned/clientset.go rename to pkg/provider/kubernetes/crd/generated/clientset/versioned/clientset.go index 270a0059f..94a804367 100644 --- a/provider/kubernetes/crd/generated/clientset/versioned/clientset.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/clientset.go @@ -27,7 +27,7 @@ THE SOFTWARE. package versioned import ( - traefikv1alpha1 "github.com/containous/traefik/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1" + traefikv1alpha1 "github.com/containous/traefik/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/provider/kubernetes/crd/generated/clientset/versioned/doc.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/doc.go similarity index 100% rename from provider/kubernetes/crd/generated/clientset/versioned/doc.go rename to pkg/provider/kubernetes/crd/generated/clientset/versioned/doc.go diff --git a/provider/kubernetes/crd/generated/clientset/versioned/fake/clientset_generated.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/fake/clientset_generated.go similarity index 91% rename from provider/kubernetes/crd/generated/clientset/versioned/fake/clientset_generated.go rename to pkg/provider/kubernetes/crd/generated/clientset/versioned/fake/clientset_generated.go index aa6bd2ad5..6ec2fc107 100644 --- a/provider/kubernetes/crd/generated/clientset/versioned/fake/clientset_generated.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/fake/clientset_generated.go @@ -27,9 +27,9 @@ THE SOFTWARE. package fake import ( - clientset "github.com/containous/traefik/provider/kubernetes/crd/generated/clientset/versioned" - traefikv1alpha1 "github.com/containous/traefik/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1" - faketraefikv1alpha1 "github.com/containous/traefik/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake" + clientset "github.com/containous/traefik/pkg/provider/kubernetes/crd/generated/clientset/versioned" + traefikv1alpha1 "github.com/containous/traefik/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1" + faketraefikv1alpha1 "github.com/containous/traefik/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/provider/kubernetes/crd/generated/clientset/versioned/fake/doc.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/fake/doc.go similarity index 100% rename from provider/kubernetes/crd/generated/clientset/versioned/fake/doc.go rename to pkg/provider/kubernetes/crd/generated/clientset/versioned/fake/doc.go diff --git a/provider/kubernetes/crd/generated/clientset/versioned/fake/register.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/fake/register.go similarity index 95% rename from provider/kubernetes/crd/generated/clientset/versioned/fake/register.go rename to pkg/provider/kubernetes/crd/generated/clientset/versioned/fake/register.go index d935339e7..10b2a60b0 100644 --- a/provider/kubernetes/crd/generated/clientset/versioned/fake/register.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/fake/register.go @@ -27,7 +27,7 @@ THE SOFTWARE. package fake import ( - traefikv1alpha1 "github.com/containous/traefik/provider/kubernetes/crd/traefik/v1alpha1" + traefikv1alpha1 "github.com/containous/traefik/pkg/provider/kubernetes/crd/traefik/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/provider/kubernetes/crd/generated/clientset/versioned/scheme/doc.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme/doc.go similarity index 100% rename from provider/kubernetes/crd/generated/clientset/versioned/scheme/doc.go rename to pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme/doc.go diff --git a/provider/kubernetes/crd/generated/clientset/versioned/scheme/register.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme/register.go similarity index 95% rename from provider/kubernetes/crd/generated/clientset/versioned/scheme/register.go rename to pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme/register.go index aa12a00c2..2037cf885 100644 --- a/provider/kubernetes/crd/generated/clientset/versioned/scheme/register.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme/register.go @@ -27,7 +27,7 @@ THE SOFTWARE. package scheme import ( - traefikv1alpha1 "github.com/containous/traefik/provider/kubernetes/crd/traefik/v1alpha1" + traefikv1alpha1 "github.com/containous/traefik/pkg/provider/kubernetes/crd/traefik/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/doc.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/doc.go similarity index 100% rename from provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/doc.go rename to pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/doc.go diff --git a/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 similarity index 100% rename from provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/doc.go rename to pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/doc.go diff --git a/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 similarity index 98% rename from provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_ingressroute.go rename to pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_ingressroute.go index ba36ab01b..01f784730 100644 --- a/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 @@ -27,7 +27,7 @@ THE SOFTWARE. package fake import ( - v1alpha1 "github.com/containous/traefik/provider/kubernetes/crd/traefik/v1alpha1" + v1alpha1 "github.com/containous/traefik/pkg/provider/kubernetes/crd/traefik/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/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 similarity index 98% rename from provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_middleware.go rename to pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_middleware.go index d3f335874..9f207a095 100644 --- a/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 @@ -27,7 +27,7 @@ THE SOFTWARE. package fake import ( - v1alpha1 "github.com/containous/traefik/provider/kubernetes/crd/traefik/v1alpha1" + v1alpha1 "github.com/containous/traefik/pkg/provider/kubernetes/crd/traefik/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/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 similarity index 93% rename from provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_traefik_client.go rename to pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_traefik_client.go index d46e7472a..c2ada49ce 100644 --- a/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_traefik_client.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_traefik_client.go @@ -27,7 +27,7 @@ THE SOFTWARE. package fake import ( - v1alpha1 "github.com/containous/traefik/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1" + v1alpha1 "github.com/containous/traefik/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/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 similarity index 100% rename from provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/generated_expansion.go rename to pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/generated_expansion.go diff --git a/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/ingressroute.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/ingressroute.go similarity index 96% rename from provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/ingressroute.go rename to pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/ingressroute.go index daa05531e..6aafb9293 100644 --- a/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/ingressroute.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/ingressroute.go @@ -27,8 +27,8 @@ THE SOFTWARE. package v1alpha1 import ( - scheme "github.com/containous/traefik/provider/kubernetes/crd/generated/clientset/versioned/scheme" - v1alpha1 "github.com/containous/traefik/provider/kubernetes/crd/traefik/v1alpha1" + scheme "github.com/containous/traefik/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme" + v1alpha1 "github.com/containous/traefik/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/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/middleware.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/middleware.go similarity index 96% rename from provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/middleware.go rename to pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/middleware.go index 5090f7234..3a9cb8091 100644 --- a/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/middleware.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/middleware.go @@ -27,8 +27,8 @@ THE SOFTWARE. package v1alpha1 import ( - scheme "github.com/containous/traefik/provider/kubernetes/crd/generated/clientset/versioned/scheme" - v1alpha1 "github.com/containous/traefik/provider/kubernetes/crd/traefik/v1alpha1" + scheme "github.com/containous/traefik/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme" + v1alpha1 "github.com/containous/traefik/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/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 similarity index 94% rename from provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/traefik_client.go rename to pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/traefik_client.go index f7549306b..5b69b0557 100644 --- a/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/traefik_client.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/traefik_client.go @@ -27,8 +27,8 @@ THE SOFTWARE. package v1alpha1 import ( - "github.com/containous/traefik/provider/kubernetes/crd/generated/clientset/versioned/scheme" - v1alpha1 "github.com/containous/traefik/provider/kubernetes/crd/traefik/v1alpha1" + "github.com/containous/traefik/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme" + v1alpha1 "github.com/containous/traefik/pkg/provider/kubernetes/crd/traefik/v1alpha1" serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" ) diff --git a/provider/kubernetes/crd/generated/informers/externalversions/factory.go b/pkg/provider/kubernetes/crd/generated/informers/externalversions/factory.go similarity index 94% rename from provider/kubernetes/crd/generated/informers/externalversions/factory.go rename to pkg/provider/kubernetes/crd/generated/informers/externalversions/factory.go index bb50d0f62..bf5ddeab3 100644 --- a/provider/kubernetes/crd/generated/informers/externalversions/factory.go +++ b/pkg/provider/kubernetes/crd/generated/informers/externalversions/factory.go @@ -31,9 +31,9 @@ import ( sync "sync" time "time" - versioned "github.com/containous/traefik/provider/kubernetes/crd/generated/clientset/versioned" - internalinterfaces "github.com/containous/traefik/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" - traefik "github.com/containous/traefik/provider/kubernetes/crd/generated/informers/externalversions/traefik" + versioned "github.com/containous/traefik/pkg/provider/kubernetes/crd/generated/clientset/versioned" + internalinterfaces "github.com/containous/traefik/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" + traefik "github.com/containous/traefik/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/provider/kubernetes/crd/generated/informers/externalversions/generic.go b/pkg/provider/kubernetes/crd/generated/informers/externalversions/generic.go similarity index 95% rename from provider/kubernetes/crd/generated/informers/externalversions/generic.go rename to pkg/provider/kubernetes/crd/generated/informers/externalversions/generic.go index 06ba60ac7..8970ae03f 100644 --- a/provider/kubernetes/crd/generated/informers/externalversions/generic.go +++ b/pkg/provider/kubernetes/crd/generated/informers/externalversions/generic.go @@ -29,7 +29,7 @@ package externalversions import ( "fmt" - v1alpha1 "github.com/containous/traefik/provider/kubernetes/crd/traefik/v1alpha1" + v1alpha1 "github.com/containous/traefik/pkg/provider/kubernetes/crd/traefik/v1alpha1" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" ) @@ -60,10 +60,12 @@ func (f *genericInformer) Lister() cache.GenericLister { // TODO extend this to unknown resources with a client pool func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource) (GenericInformer, error) { switch resource { + // Group=traefik.containo.us, Version=v1alpha1 case v1alpha1.SchemeGroupVersion.WithResource("ingressroutes"): return &genericInformer{resource: resource.GroupResource(), informer: f.Traefik().V1alpha1().IngressRoutes().Informer()}, nil case v1alpha1.SchemeGroupVersion.WithResource("middlewares"): return &genericInformer{resource: resource.GroupResource(), informer: f.Traefik().V1alpha1().Middlewares().Informer()}, nil + } return nil, fmt.Errorf("no informer found for %v", resource) diff --git a/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces/factory_interfaces.go b/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces/factory_interfaces.go similarity index 94% rename from provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces/factory_interfaces.go rename to pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces/factory_interfaces.go index 6ef826fdd..2c1fd37d2 100644 --- a/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces/factory_interfaces.go +++ b/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -29,7 +29,7 @@ package internalinterfaces import ( time "time" - versioned "github.com/containous/traefik/provider/kubernetes/crd/generated/clientset/versioned" + versioned "github.com/containous/traefik/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/provider/kubernetes/crd/generated/informers/externalversions/traefik/interface.go b/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/interface.go similarity index 88% rename from provider/kubernetes/crd/generated/informers/externalversions/traefik/interface.go rename to pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/interface.go index bd9d5a9b4..907cc9a03 100644 --- a/provider/kubernetes/crd/generated/informers/externalversions/traefik/interface.go +++ b/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/interface.go @@ -27,8 +27,8 @@ THE SOFTWARE. package traefik import ( - internalinterfaces "github.com/containous/traefik/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/containous/traefik/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1" + internalinterfaces "github.com/containous/traefik/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/containous/traefik/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1" ) // Interface provides access to each of this group's versions. diff --git a/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/ingressroute.go b/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/ingressroute.go similarity index 89% rename from provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/ingressroute.go rename to pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/ingressroute.go index 3462b7b60..3c5c64ff6 100644 --- a/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/ingressroute.go +++ b/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/ingressroute.go @@ -29,10 +29,10 @@ package v1alpha1 import ( time "time" - versioned "github.com/containous/traefik/provider/kubernetes/crd/generated/clientset/versioned" - internalinterfaces "github.com/containous/traefik/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/containous/traefik/provider/kubernetes/crd/generated/listers/traefik/v1alpha1" - traefikv1alpha1 "github.com/containous/traefik/provider/kubernetes/crd/traefik/v1alpha1" + versioned "github.com/containous/traefik/pkg/provider/kubernetes/crd/generated/clientset/versioned" + internalinterfaces "github.com/containous/traefik/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/containous/traefik/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1" + traefikv1alpha1 "github.com/containous/traefik/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/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/interface.go b/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/interface.go similarity index 94% rename from provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/interface.go rename to pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/interface.go index 76a5637f4..c8a2beef4 100644 --- a/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/interface.go +++ b/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/interface.go @@ -27,7 +27,7 @@ THE SOFTWARE. package v1alpha1 import ( - internalinterfaces "github.com/containous/traefik/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" + internalinterfaces "github.com/containous/traefik/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/middleware.go b/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/middleware.go similarity index 89% rename from provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/middleware.go rename to pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/middleware.go index a585a4a9c..a5ae6de39 100644 --- a/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/middleware.go +++ b/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/middleware.go @@ -29,10 +29,10 @@ package v1alpha1 import ( time "time" - versioned "github.com/containous/traefik/provider/kubernetes/crd/generated/clientset/versioned" - internalinterfaces "github.com/containous/traefik/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/containous/traefik/provider/kubernetes/crd/generated/listers/traefik/v1alpha1" - traefikv1alpha1 "github.com/containous/traefik/provider/kubernetes/crd/traefik/v1alpha1" + versioned "github.com/containous/traefik/pkg/provider/kubernetes/crd/generated/clientset/versioned" + internalinterfaces "github.com/containous/traefik/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/containous/traefik/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1" + traefikv1alpha1 "github.com/containous/traefik/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/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/expansion_generated.go b/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/expansion_generated.go similarity index 100% rename from provider/kubernetes/crd/generated/listers/traefik/v1alpha1/expansion_generated.go rename to pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/expansion_generated.go diff --git a/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/ingressroute.go b/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/ingressroute.go similarity index 97% rename from provider/kubernetes/crd/generated/listers/traefik/v1alpha1/ingressroute.go rename to pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/ingressroute.go index 7b11ccb39..b796931b0 100644 --- a/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/ingressroute.go +++ b/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/ingressroute.go @@ -27,7 +27,7 @@ THE SOFTWARE. package v1alpha1 import ( - v1alpha1 "github.com/containous/traefik/provider/kubernetes/crd/traefik/v1alpha1" + v1alpha1 "github.com/containous/traefik/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/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/middleware.go b/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/middleware.go similarity index 97% rename from provider/kubernetes/crd/generated/listers/traefik/v1alpha1/middleware.go rename to pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/middleware.go index d85dbf73d..70f1e39f7 100644 --- a/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/middleware.go +++ b/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/middleware.go @@ -27,7 +27,7 @@ THE SOFTWARE. package v1alpha1 import ( - v1alpha1 "github.com/containous/traefik/provider/kubernetes/crd/traefik/v1alpha1" + v1alpha1 "github.com/containous/traefik/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/provider/kubernetes/crd/kubernetes.go b/pkg/provider/kubernetes/crd/kubernetes.go similarity index 97% rename from provider/kubernetes/crd/kubernetes.go rename to pkg/provider/kubernetes/crd/kubernetes.go index c0f028f21..87bacdaee 100644 --- a/provider/kubernetes/crd/kubernetes.go +++ b/pkg/provider/kubernetes/crd/kubernetes.go @@ -13,14 +13,14 @@ import ( "time" "github.com/cenkalti/backoff" - "github.com/containous/traefik/config" - "github.com/containous/traefik/job" - "github.com/containous/traefik/log" - "github.com/containous/traefik/provider" - "github.com/containous/traefik/provider/kubernetes/crd/traefik/v1alpha1" - "github.com/containous/traefik/provider/kubernetes/k8s" - "github.com/containous/traefik/safe" - "github.com/containous/traefik/tls" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/job" + "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/pkg/provider" + "github.com/containous/traefik/pkg/provider/kubernetes/crd/traefik/v1alpha1" + "github.com/containous/traefik/pkg/provider/kubernetes/k8s" + "github.com/containous/traefik/pkg/safe" + "github.com/containous/traefik/pkg/tls" "github.com/pkg/errors" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/labels" diff --git a/provider/kubernetes/crd/kubernetes_test.go b/pkg/provider/kubernetes/crd/kubernetes_test.go similarity index 98% rename from provider/kubernetes/crd/kubernetes_test.go rename to pkg/provider/kubernetes/crd/kubernetes_test.go index a13da0229..c185ce6e1 100644 --- a/provider/kubernetes/crd/kubernetes_test.go +++ b/pkg/provider/kubernetes/crd/kubernetes_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/containous/traefik/config" - "github.com/containous/traefik/provider" - "github.com/containous/traefik/tls" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/provider" + "github.com/containous/traefik/pkg/tls" "github.com/stretchr/testify/assert" ) diff --git a/provider/kubernetes/crd/traefik/v1alpha1/doc.go b/pkg/provider/kubernetes/crd/traefik/v1alpha1/doc.go similarity index 100% rename from provider/kubernetes/crd/traefik/v1alpha1/doc.go rename to pkg/provider/kubernetes/crd/traefik/v1alpha1/doc.go diff --git a/provider/kubernetes/crd/traefik/v1alpha1/ingressroute.go b/pkg/provider/kubernetes/crd/traefik/v1alpha1/ingressroute.go similarity index 100% rename from provider/kubernetes/crd/traefik/v1alpha1/ingressroute.go rename to pkg/provider/kubernetes/crd/traefik/v1alpha1/ingressroute.go diff --git a/provider/kubernetes/crd/traefik/v1alpha1/middleware.go b/pkg/provider/kubernetes/crd/traefik/v1alpha1/middleware.go similarity index 93% rename from provider/kubernetes/crd/traefik/v1alpha1/middleware.go rename to pkg/provider/kubernetes/crd/traefik/v1alpha1/middleware.go index b1409a47a..5cb9c8eb6 100644 --- a/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/config" + "github.com/containous/traefik/pkg/config" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/provider/kubernetes/crd/traefik/v1alpha1/register.go b/pkg/provider/kubernetes/crd/traefik/v1alpha1/register.go similarity index 100% rename from provider/kubernetes/crd/traefik/v1alpha1/register.go rename to pkg/provider/kubernetes/crd/traefik/v1alpha1/register.go diff --git a/provider/kubernetes/crd/traefik/v1alpha1/zz_generated.deepcopy.go b/pkg/provider/kubernetes/crd/traefik/v1alpha1/zz_generated.deepcopy.go similarity index 100% rename from provider/kubernetes/crd/traefik/v1alpha1/zz_generated.deepcopy.go rename to pkg/provider/kubernetes/crd/traefik/v1alpha1/zz_generated.deepcopy.go diff --git a/provider/kubernetes/ingress/builder_ingress_test.go b/pkg/provider/kubernetes/ingress/builder_ingress_test.go similarity index 100% rename from provider/kubernetes/ingress/builder_ingress_test.go rename to pkg/provider/kubernetes/ingress/builder_ingress_test.go diff --git a/provider/kubernetes/ingress/client.go b/pkg/provider/kubernetes/ingress/client.go similarity index 99% rename from provider/kubernetes/ingress/client.go rename to pkg/provider/kubernetes/ingress/client.go index 50a395ea2..31221912d 100644 --- a/provider/kubernetes/ingress/client.go +++ b/pkg/provider/kubernetes/ingress/client.go @@ -7,7 +7,7 @@ import ( "time" "github.com/containous/traefik/old/log" - "github.com/containous/traefik/provider/kubernetes/k8s" + "github.com/containous/traefik/pkg/provider/kubernetes/k8s" corev1 "k8s.io/api/core/v1" extensionsv1beta1 "k8s.io/api/extensions/v1beta1" kubeerror "k8s.io/apimachinery/pkg/api/errors" diff --git a/provider/kubernetes/ingress/client_mock_test.go b/pkg/provider/kubernetes/ingress/client_mock_test.go similarity index 97% rename from provider/kubernetes/ingress/client_mock_test.go rename to pkg/provider/kubernetes/ingress/client_mock_test.go index 5cc240497..a9c9091ca 100644 --- a/provider/kubernetes/ingress/client_mock_test.go +++ b/pkg/provider/kubernetes/ingress/client_mock_test.go @@ -4,7 +4,7 @@ import ( "fmt" "io/ioutil" - "github.com/containous/traefik/provider/kubernetes/k8s" + "github.com/containous/traefik/pkg/provider/kubernetes/k8s" corev1 "k8s.io/api/core/v1" extensionsv1beta1 "k8s.io/api/extensions/v1beta1" v1beta12 "k8s.io/api/extensions/v1beta1" diff --git a/provider/kubernetes/ingress/client_test.go b/pkg/provider/kubernetes/ingress/client_test.go similarity index 100% rename from provider/kubernetes/ingress/client_test.go rename to pkg/provider/kubernetes/ingress/client_test.go diff --git a/provider/kubernetes/ingress/fixtures/2-ingresses-in-different-namespace-with-same-service-name_endpoint.yml b/pkg/provider/kubernetes/ingress/fixtures/2-ingresses-in-different-namespace-with-same-service-name_endpoint.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/2-ingresses-in-different-namespace-with-same-service-name_endpoint.yml rename to pkg/provider/kubernetes/ingress/fixtures/2-ingresses-in-different-namespace-with-same-service-name_endpoint.yml diff --git a/provider/kubernetes/ingress/fixtures/2-ingresses-in-different-namespace-with-same-service-name_ingress.yml b/pkg/provider/kubernetes/ingress/fixtures/2-ingresses-in-different-namespace-with-same-service-name_ingress.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/2-ingresses-in-different-namespace-with-same-service-name_ingress.yml rename to pkg/provider/kubernetes/ingress/fixtures/2-ingresses-in-different-namespace-with-same-service-name_ingress.yml diff --git a/provider/kubernetes/ingress/fixtures/2-ingresses-in-different-namespace-with-same-service-name_service.yml b/pkg/provider/kubernetes/ingress/fixtures/2-ingresses-in-different-namespace-with-same-service-name_service.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/2-ingresses-in-different-namespace-with-same-service-name_service.yml rename to pkg/provider/kubernetes/ingress/fixtures/2-ingresses-in-different-namespace-with-same-service-name_service.yml diff --git a/provider/kubernetes/ingress/fixtures/Double-Single-Service-Ingress_endpoint.yml b/pkg/provider/kubernetes/ingress/fixtures/Double-Single-Service-Ingress_endpoint.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Double-Single-Service-Ingress_endpoint.yml rename to pkg/provider/kubernetes/ingress/fixtures/Double-Single-Service-Ingress_endpoint.yml diff --git a/provider/kubernetes/ingress/fixtures/Double-Single-Service-Ingress_ingress.yml b/pkg/provider/kubernetes/ingress/fixtures/Double-Single-Service-Ingress_ingress.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Double-Single-Service-Ingress_ingress.yml rename to pkg/provider/kubernetes/ingress/fixtures/Double-Single-Service-Ingress_ingress.yml diff --git a/provider/kubernetes/ingress/fixtures/Double-Single-Service-Ingress_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Double-Single-Service-Ingress_service.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Double-Single-Service-Ingress_service.yml rename to pkg/provider/kubernetes/ingress/fixtures/Double-Single-Service-Ingress_service.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-Two-rules-with-one-host-and-one-path_endpoint.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-Two-rules-with-one-host-and-one-path_endpoint.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-Two-rules-with-one-host-and-one-path_endpoint.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-Two-rules-with-one-host-and-one-path_endpoint.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-Two-rules-with-one-host-and-one-path_ingress.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-Two-rules-with-one-host-and-one-path_ingress.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-Two-rules-with-one-host-and-one-path_ingress.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-Two-rules-with-one-host-and-one-path_ingress.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-Two-rules-with-one-host-and-one-path_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-Two-rules-with-one-host-and-one-path_service.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-Two-rules-with-one-host-and-one-path_service.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-Two-rules-with-one-host-and-one-path_service.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-one-rule-with-one-host-and-two-paths_endpoint.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-one-rule-with-one-host-and-two-paths_endpoint.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-one-rule-with-one-host-and-two-paths_endpoint.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-one-rule-with-one-host-and-two-paths_endpoint.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-one-rule-with-one-host-and-two-paths_ingress.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-one-rule-with-one-host-and-two-paths_ingress.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-one-rule-with-one-host-and-two-paths_ingress.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-one-rule-with-one-host-and-two-paths_ingress.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-one-rule-with-one-host-and-two-paths_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-one-rule-with-one-host-and-two-paths_service.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-one-rule-with-one-host-and-two-paths_service.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-one-rule-with-one-host-and-two-paths_service.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-one-rule-with-one-path-and-one-host_endpoint.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-one-rule-with-one-path-and-one-host_endpoint.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-one-rule-with-one-path-and-one-host_endpoint.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-one-rule-with-one-path-and-one-host_endpoint.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-one-rule-with-one-path-and-one-host_ingress.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-one-rule-with-one-path-and-one-host_ingress.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-one-rule-with-one-path-and-one-host_ingress.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-one-rule-with-one-path-and-one-host_ingress.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-one-rule-with-one-path-and-one-host_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-one-rule-with-one-path-and-one-host_service.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-one-rule-with-one-path-and-one-host_service.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-one-rule-with-one-path-and-one-host_service.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-one-rule-with-two-paths_endpoint.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-one-rule-with-two-paths_endpoint.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-one-rule-with-two-paths_endpoint.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-one-rule-with-two-paths_endpoint.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-one-rule-with-two-paths_ingress.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-one-rule-with-two-paths_ingress.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-one-rule-with-two-paths_ingress.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-one-rule-with-two-paths_ingress.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-one-rule-with-two-paths_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-one-rule-with-two-paths_service.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-one-rule-with-two-paths_service.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-one-rule-with-two-paths_service.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-a-bad-host-syntax_endpoint.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-bad-host-syntax_endpoint.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-a-bad-host-syntax_endpoint.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-bad-host-syntax_endpoint.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-a-bad-host-syntax_ingress.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-bad-host-syntax_ingress.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-a-bad-host-syntax_ingress.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-bad-host-syntax_ingress.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-a-bad-host-syntax_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-bad-host-syntax_service.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-a-bad-host-syntax_service.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-bad-host-syntax_service.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-a-bad-path-syntax_endpoint.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-bad-path-syntax_endpoint.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-a-bad-path-syntax_endpoint.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-bad-path-syntax_endpoint.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-a-bad-path-syntax_ingress.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-bad-path-syntax_ingress.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-a-bad-path-syntax_ingress.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-bad-path-syntax_ingress.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-a-bad-path-syntax_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-bad-path-syntax_service.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-a-bad-path-syntax_service.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-bad-path-syntax_service.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path-with-https-(port-==-443)_endpoint.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path-with-https-(port-==-443)_endpoint.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path-with-https-(port-==-443)_endpoint.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path-with-https-(port-==-443)_endpoint.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path-with-https-(port-==-443)_ingress.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path-with-https-(port-==-443)_ingress.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path-with-https-(port-==-443)_ingress.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path-with-https-(port-==-443)_ingress.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path-with-https-(port-==-443)_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path-with-https-(port-==-443)_service.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path-with-https-(port-==-443)_service.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path-with-https-(port-==-443)_service.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path-with-https-(portname-==-https)_endpoint.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path-with-https-(portname-==-https)_endpoint.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path-with-https-(portname-==-https)_endpoint.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path-with-https-(portname-==-https)_endpoint.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path-with-https-(portname-==-https)_ingress.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path-with-https-(portname-==-https)_ingress.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path-with-https-(portname-==-https)_ingress.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path-with-https-(portname-==-https)_ingress.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path-with-https-(portname-==-https)_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path-with-https-(portname-==-https)_service.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path-with-https-(portname-==-https)_service.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path-with-https-(portname-==-https)_service.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path-with-https-(portname-starts-with-https)_endpoint.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path-with-https-(portname-starts-with-https)_endpoint.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path-with-https-(portname-starts-with-https)_endpoint.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path-with-https-(portname-starts-with-https)_endpoint.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path-with-https-(portname-starts-with-https)_ingress.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path-with-https-(portname-starts-with-https)_ingress.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path-with-https-(portname-starts-with-https)_ingress.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path-with-https-(portname-starts-with-https)_ingress.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path-with-https-(portname-starts-with-https)_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path-with-https-(portname-starts-with-https)_service.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path-with-https-(portname-starts-with-https)_service.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path-with-https-(portname-starts-with-https)_service.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path_endpoint.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path_endpoint.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path_endpoint.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path_endpoint.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path_ingress.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path_ingress.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path_ingress.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path_ingress.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path_service.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path_service.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path_service.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-default-traefik-ingressClass_endpoint.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-default-traefik-ingressClass_endpoint.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-default-traefik-ingressClass_endpoint.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-default-traefik-ingressClass_endpoint.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-default-traefik-ingressClass_ingress.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-default-traefik-ingressClass_ingress.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-default-traefik-ingressClass_ingress.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-default-traefik-ingressClass_ingress.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-default-traefik-ingressClass_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-default-traefik-ingressClass_service.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-default-traefik-ingressClass_service.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-default-traefik-ingressClass_service.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-ingressClass-without-annotation_endpoint.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-ingressClass-without-annotation_endpoint.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-ingressClass-without-annotation_endpoint.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-ingressClass-without-annotation_endpoint.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-ingressClass-without-annotation_ingress.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-ingressClass-without-annotation_ingress.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-ingressClass-without-annotation_ingress.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-ingressClass-without-annotation_ingress.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-ingressClass-without-annotation_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-ingressClass-without-annotation_service.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-ingressClass-without-annotation_service.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-ingressClass-without-annotation_service.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-non-matching-provider-traefik-ingressClass-and-annotation_endpoint.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-non-matching-provider-traefik-ingressClass-and-annotation_endpoint.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-non-matching-provider-traefik-ingressClass-and-annotation_endpoint.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-non-matching-provider-traefik-ingressClass-and-annotation_endpoint.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-non-matching-provider-traefik-ingressClass-and-annotation_ingress.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-non-matching-provider-traefik-ingressClass-and-annotation_ingress.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-non-matching-provider-traefik-ingressClass-and-annotation_ingress.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-non-matching-provider-traefik-ingressClass-and-annotation_ingress.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-non-matching-provider-traefik-ingressClass-and-annotation_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-non-matching-provider-traefik-ingressClass-and-annotation_service.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-non-matching-provider-traefik-ingressClass-and-annotation_service.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-non-matching-provider-traefik-ingressClass-and-annotation_service.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-one-host-without-path_endpoint.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-one-host-without-path_endpoint.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-one-host-without-path_endpoint.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-one-host-without-path_endpoint.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-one-host-without-path_ingress.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-one-host-without-path_ingress.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-one-host-without-path_ingress.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-one-host-without-path_ingress.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-one-host-without-path_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-one-host-without-path_service.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-one-host-without-path_service.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-one-host-without-path_service.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-one-service-without-endpoint_ingress.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-one-service-without-endpoint_ingress.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-one-service-without-endpoint_ingress.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-one-service-without-endpoint_ingress.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-one-service-without-endpoint_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-one-service-without-endpoint_service.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-one-service-without-endpoint_service.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-one-service-without-endpoint_service.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-one-service-without-endpoints-subset_endpoint.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-one-service-without-endpoints-subset_endpoint.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-one-service-without-endpoints-subset_endpoint.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-one-service-without-endpoints-subset_endpoint.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-one-service-without-endpoints-subset_ingress.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-one-service-without-endpoints-subset_ingress.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-one-service-without-endpoints-subset_ingress.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-one-service-without-endpoints-subset_ingress.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-one-service-without-endpoints-subset_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-one-service-without-endpoints-subset_service.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-one-service-without-endpoints-subset_service.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-one-service-without-endpoints-subset_service.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-only-a-bad-host-syntax_endpoint.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-only-a-bad-host-syntax_endpoint.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-only-a-bad-host-syntax_endpoint.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-only-a-bad-host-syntax_endpoint.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-only-a-bad-host-syntax_ingress.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-only-a-bad-host-syntax_ingress.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-only-a-bad-host-syntax_ingress.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-only-a-bad-host-syntax_ingress.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-only-a-bad-host-syntax_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-only-a-bad-host-syntax_service.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-only-a-bad-host-syntax_service.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-only-a-bad-host-syntax_service.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-only-a-bad-path-syntax_endpoint.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-only-a-bad-path-syntax_endpoint.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-only-a-bad-path-syntax_endpoint.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-only-a-bad-path-syntax_endpoint.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-only-a-bad-path-syntax_ingress.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-only-a-bad-path-syntax_ingress.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-only-a-bad-path-syntax_ingress.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-only-a-bad-path-syntax_ingress.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-only-a-bad-path-syntax_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-only-a-bad-path-syntax_service.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-only-a-bad-path-syntax_service.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-only-a-bad-path-syntax_service.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-port-name-in-backend-and-no-pod-replica_endpoint.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-port-name-in-backend-and-no-pod-replica_endpoint.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-port-name-in-backend-and-no-pod-replica_endpoint.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-port-name-in-backend-and-no-pod-replica_endpoint.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-port-name-in-backend-and-no-pod-replica_ingress.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-port-name-in-backend-and-no-pod-replica_ingress.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-port-name-in-backend-and-no-pod-replica_ingress.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-port-name-in-backend-and-no-pod-replica_ingress.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-port-name-in-backend-and-no-pod-replica_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-port-name-in-backend-and-no-pod-replica_service.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-port-name-in-backend-and-no-pod-replica_service.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-port-name-in-backend-and-no-pod-replica_service.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-port-value-in-backend-and-no-pod-replica_endpoint.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-port-value-in-backend-and-no-pod-replica_endpoint.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-port-value-in-backend-and-no-pod-replica_endpoint.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-port-value-in-backend-and-no-pod-replica_endpoint.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-port-value-in-backend-and-no-pod-replica_ingress.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-port-value-in-backend-and-no-pod-replica_ingress.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-port-value-in-backend-and-no-pod-replica_ingress.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-port-value-in-backend-and-no-pod-replica_ingress.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-port-value-in-backend-and-no-pod-replica_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-port-value-in-backend-and-no-pod-replica_service.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-port-value-in-backend-and-no-pod-replica_service.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-port-value-in-backend-and-no-pod-replica_service.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-service-with-externalName_ingress.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-service-with-externalName_ingress.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-service-with-externalName_ingress.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-service-with-externalName_ingress.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-service-with-externalName_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-service-with-externalName_service.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-service-with-externalName_service.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-service-with-externalName_service.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-two-different-rules-with-one-path_endpoint.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-two-different-rules-with-one-path_endpoint.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-two-different-rules-with-one-path_endpoint.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-two-different-rules-with-one-path_endpoint.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-two-different-rules-with-one-path_ingress.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-two-different-rules-with-one-path_ingress.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-two-different-rules-with-one-path_ingress.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-two-different-rules-with-one-path_ingress.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-two-different-rules-with-one-path_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-two-different-rules-with-one-path_service.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-two-different-rules-with-one-path_service.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-two-different-rules-with-one-path_service.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-two-paths-using-same-service-and-different-port-name_endpoint.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-two-paths-using-same-service-and-different-port-name_endpoint.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-two-paths-using-same-service-and-different-port-name_endpoint.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-two-paths-using-same-service-and-different-port-name_endpoint.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-two-paths-using-same-service-and-different-port-name_ingress.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-two-paths-using-same-service-and-different-port-name_ingress.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-two-paths-using-same-service-and-different-port-name_ingress.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-two-paths-using-same-service-and-different-port-name_ingress.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-two-paths-using-same-service-and-different-port-name_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-two-paths-using-same-service-and-different-port-name_service.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-two-paths-using-same-service-and-different-port-name_service.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-two-paths-using-same-service-and-different-port-name_service.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-two-services_endpoint.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-two-services_endpoint.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-two-services_endpoint.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-two-services_endpoint.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-two-services_ingress.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-two-services_ingress.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-two-services_ingress.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-two-services_ingress.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-two-services_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-two-services_service.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-two-services_service.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-two-services_service.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-unknown-service-port-name_endpoint.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-unknown-service-port-name_endpoint.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-unknown-service-port-name_endpoint.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-unknown-service-port-name_endpoint.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-unknown-service-port-name_ingress.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-unknown-service-port-name_ingress.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-unknown-service-port-name_ingress.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-unknown-service-port-name_ingress.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-unknown-service-port-name_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-unknown-service-port-name_service.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-unknown-service-port-name_service.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-unknown-service-port-name_service.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-unknown-service-port_endpoint.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-unknown-service-port_endpoint.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-unknown-service-port_endpoint.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-unknown-service-port_endpoint.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-unknown-service-port_ingress.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-unknown-service-port_ingress.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-unknown-service-port_ingress.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-unknown-service-port_ingress.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-unknown-service-port_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-unknown-service-port_service.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-unknown-service-port_service.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-unknown-service-port_service.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-with-port-name-in-backend-and-2-pod-replica_endpoint.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-with-port-name-in-backend-and-2-pod-replica_endpoint.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-with-port-name-in-backend-and-2-pod-replica_endpoint.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-with-port-name-in-backend-and-2-pod-replica_endpoint.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-with-port-name-in-backend-and-2-pod-replica_ingress.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-with-port-name-in-backend-and-2-pod-replica_ingress.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-with-port-name-in-backend-and-2-pod-replica_ingress.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-with-port-name-in-backend-and-2-pod-replica_ingress.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-with-with-port-name-in-backend-and-2-pod-replica_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-with-port-name-in-backend-and-2-pod-replica_service.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-with-with-port-name-in-backend-and-2-pod-replica_service.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-with-with-port-name-in-backend-and-2-pod-replica_service.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-without-provider-traefik-ingressClass-and-unknown-annotation_endpoint.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-without-provider-traefik-ingressClass-and-unknown-annotation_endpoint.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-without-provider-traefik-ingressClass-and-unknown-annotation_endpoint.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-without-provider-traefik-ingressClass-and-unknown-annotation_endpoint.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-without-provider-traefik-ingressClass-and-unknown-annotation_ingress.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-without-provider-traefik-ingressClass-and-unknown-annotation_ingress.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-without-provider-traefik-ingressClass-and-unknown-annotation_ingress.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-without-provider-traefik-ingressClass-and-unknown-annotation_ingress.yml diff --git a/provider/kubernetes/ingress/fixtures/Ingress-without-provider-traefik-ingressClass-and-unknown-annotation_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-without-provider-traefik-ingressClass-and-unknown-annotation_service.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Ingress-without-provider-traefik-ingressClass-and-unknown-annotation_service.yml rename to pkg/provider/kubernetes/ingress/fixtures/Ingress-without-provider-traefik-ingressClass-and-unknown-annotation_service.yml diff --git a/provider/kubernetes/ingress/fixtures/Single-Service-Ingress-(without-any-rules)_endpoint.yml b/pkg/provider/kubernetes/ingress/fixtures/Single-Service-Ingress-(without-any-rules)_endpoint.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Single-Service-Ingress-(without-any-rules)_endpoint.yml rename to pkg/provider/kubernetes/ingress/fixtures/Single-Service-Ingress-(without-any-rules)_endpoint.yml diff --git a/provider/kubernetes/ingress/fixtures/Single-Service-Ingress-(without-any-rules)_ingress.yml b/pkg/provider/kubernetes/ingress/fixtures/Single-Service-Ingress-(without-any-rules)_ingress.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Single-Service-Ingress-(without-any-rules)_ingress.yml rename to pkg/provider/kubernetes/ingress/fixtures/Single-Service-Ingress-(without-any-rules)_ingress.yml diff --git a/provider/kubernetes/ingress/fixtures/Single-Service-Ingress-(without-any-rules)_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Single-Service-Ingress-(without-any-rules)_service.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/Single-Service-Ingress-(without-any-rules)_service.yml rename to pkg/provider/kubernetes/ingress/fixtures/Single-Service-Ingress-(without-any-rules)_service.yml diff --git a/provider/kubernetes/ingress/fixtures/TLS-support_endpoint.yml b/pkg/provider/kubernetes/ingress/fixtures/TLS-support_endpoint.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/TLS-support_endpoint.yml rename to pkg/provider/kubernetes/ingress/fixtures/TLS-support_endpoint.yml diff --git a/provider/kubernetes/ingress/fixtures/TLS-support_ingress.yml b/pkg/provider/kubernetes/ingress/fixtures/TLS-support_ingress.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/TLS-support_ingress.yml rename to pkg/provider/kubernetes/ingress/fixtures/TLS-support_ingress.yml diff --git a/provider/kubernetes/ingress/fixtures/TLS-support_secret.yml b/pkg/provider/kubernetes/ingress/fixtures/TLS-support_secret.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/TLS-support_secret.yml rename to pkg/provider/kubernetes/ingress/fixtures/TLS-support_secret.yml diff --git a/provider/kubernetes/ingress/fixtures/TLS-support_service.yml b/pkg/provider/kubernetes/ingress/fixtures/TLS-support_service.yml similarity index 100% rename from provider/kubernetes/ingress/fixtures/TLS-support_service.yml rename to pkg/provider/kubernetes/ingress/fixtures/TLS-support_service.yml diff --git a/provider/kubernetes/ingress/kubernetes.go b/pkg/provider/kubernetes/ingress/kubernetes.go similarity index 97% rename from provider/kubernetes/ingress/kubernetes.go rename to pkg/provider/kubernetes/ingress/kubernetes.go index 96319ef30..ae2acf4cb 100644 --- a/provider/kubernetes/ingress/kubernetes.go +++ b/pkg/provider/kubernetes/ingress/kubernetes.go @@ -13,13 +13,13 @@ import ( "time" "github.com/cenkalti/backoff" - "github.com/containous/traefik/config" - "github.com/containous/traefik/job" - "github.com/containous/traefik/log" - "github.com/containous/traefik/provider" - "github.com/containous/traefik/provider/kubernetes/k8s" - "github.com/containous/traefik/safe" - "github.com/containous/traefik/tls" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/job" + "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/pkg/provider" + "github.com/containous/traefik/pkg/provider/kubernetes/k8s" + "github.com/containous/traefik/pkg/safe" + "github.com/containous/traefik/pkg/tls" "github.com/pkg/errors" corev1 "k8s.io/api/core/v1" "k8s.io/api/extensions/v1beta1" diff --git a/provider/kubernetes/ingress/kubernetes_test.go b/pkg/provider/kubernetes/ingress/kubernetes_test.go similarity index 99% rename from provider/kubernetes/ingress/kubernetes_test.go rename to pkg/provider/kubernetes/ingress/kubernetes_test.go index f2566ac08..af9270738 100644 --- a/provider/kubernetes/ingress/kubernetes_test.go +++ b/pkg/provider/kubernetes/ingress/kubernetes_test.go @@ -8,9 +8,9 @@ import ( "strings" "testing" - "github.com/containous/traefik/config" - "github.com/containous/traefik/provider" - "github.com/containous/traefik/tls" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/provider" + "github.com/containous/traefik/pkg/tls" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" "k8s.io/api/extensions/v1beta1" diff --git a/provider/kubernetes/k8s/namespace.go b/pkg/provider/kubernetes/k8s/namespace.go similarity index 100% rename from provider/kubernetes/k8s/namespace.go rename to pkg/provider/kubernetes/k8s/namespace.go diff --git a/provider/kubernetes/k8s/parser.go b/pkg/provider/kubernetes/k8s/parser.go similarity index 96% rename from provider/kubernetes/k8s/parser.go rename to pkg/provider/kubernetes/k8s/parser.go index f14bd83cf..e8359df62 100644 --- a/provider/kubernetes/k8s/parser.go +++ b/pkg/provider/kubernetes/k8s/parser.go @@ -5,7 +5,7 @@ import ( "regexp" "strings" - "github.com/containous/traefik/log" + "github.com/containous/traefik/pkg/log" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/kubernetes/scheme" ) diff --git a/provider/label/internal/element_fill.go b/pkg/provider/label/internal/element_fill.go similarity index 100% rename from provider/label/internal/element_fill.go rename to pkg/provider/label/internal/element_fill.go diff --git a/provider/label/internal/element_fill_test.go b/pkg/provider/label/internal/element_fill_test.go similarity index 100% rename from provider/label/internal/element_fill_test.go rename to pkg/provider/label/internal/element_fill_test.go diff --git a/provider/label/internal/element_nodes.go b/pkg/provider/label/internal/element_nodes.go similarity index 100% rename from provider/label/internal/element_nodes.go rename to pkg/provider/label/internal/element_nodes.go diff --git a/provider/label/internal/element_nodes_test.go b/pkg/provider/label/internal/element_nodes_test.go similarity index 100% rename from provider/label/internal/element_nodes_test.go rename to pkg/provider/label/internal/element_nodes_test.go diff --git a/provider/label/internal/labels_decode.go b/pkg/provider/label/internal/labels_decode.go similarity index 100% rename from provider/label/internal/labels_decode.go rename to pkg/provider/label/internal/labels_decode.go diff --git a/provider/label/internal/labels_decode_test.go b/pkg/provider/label/internal/labels_decode_test.go similarity index 100% rename from provider/label/internal/labels_decode_test.go rename to pkg/provider/label/internal/labels_decode_test.go diff --git a/provider/label/internal/labels_encode.go b/pkg/provider/label/internal/labels_encode.go similarity index 100% rename from provider/label/internal/labels_encode.go rename to pkg/provider/label/internal/labels_encode.go diff --git a/provider/label/internal/labels_encode_test.go b/pkg/provider/label/internal/labels_encode_test.go similarity index 100% rename from provider/label/internal/labels_encode_test.go rename to pkg/provider/label/internal/labels_encode_test.go diff --git a/provider/label/internal/node.go b/pkg/provider/label/internal/node.go similarity index 100% rename from provider/label/internal/node.go rename to pkg/provider/label/internal/node.go diff --git a/provider/label/internal/nodes_metadata.go b/pkg/provider/label/internal/nodes_metadata.go similarity index 100% rename from provider/label/internal/nodes_metadata.go rename to pkg/provider/label/internal/nodes_metadata.go diff --git a/provider/label/internal/nodes_metadata_test.go b/pkg/provider/label/internal/nodes_metadata_test.go similarity index 100% rename from provider/label/internal/nodes_metadata_test.go rename to pkg/provider/label/internal/nodes_metadata_test.go diff --git a/provider/label/internal/tags.go b/pkg/provider/label/internal/tags.go similarity index 100% rename from provider/label/internal/tags.go rename to pkg/provider/label/internal/tags.go diff --git a/provider/label/parser.go b/pkg/provider/label/parser.go similarity index 92% rename from provider/label/parser.go rename to pkg/provider/label/parser.go index f09d3d1f9..a31893728 100644 --- a/provider/label/parser.go +++ b/pkg/provider/label/parser.go @@ -1,8 +1,8 @@ package label import ( - "github.com/containous/traefik/config" - "github.com/containous/traefik/provider/label/internal" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/provider/label/internal" ) // DecodeConfiguration Converts the labels to a configuration. diff --git a/provider/label/parser_test.go b/pkg/provider/label/parser_test.go similarity index 99% rename from provider/label/parser_test.go rename to pkg/provider/label/parser_test.go index 95c80f20f..53a44d3f8 100644 --- a/provider/label/parser_test.go +++ b/pkg/provider/label/parser_test.go @@ -6,7 +6,7 @@ import ( "time" "github.com/containous/flaeg/parse" - "github.com/containous/traefik/config" + "github.com/containous/traefik/pkg/config" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/provider/marathon/builder_test.go b/pkg/provider/marathon/builder_test.go similarity index 100% rename from provider/marathon/builder_test.go rename to pkg/provider/marathon/builder_test.go diff --git a/provider/marathon/config.go b/pkg/provider/marathon/config.go similarity index 97% rename from provider/marathon/config.go rename to pkg/provider/marathon/config.go index f17713a8b..945b7d296 100644 --- a/provider/marathon/config.go +++ b/pkg/provider/marathon/config.go @@ -9,10 +9,10 @@ import ( "strconv" "strings" - "github.com/containous/traefik/config" - "github.com/containous/traefik/log" - "github.com/containous/traefik/provider" - "github.com/containous/traefik/provider/label" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/pkg/provider" + "github.com/containous/traefik/pkg/provider/label" "github.com/gambol99/go-marathon" ) diff --git a/provider/marathon/config_test.go b/pkg/provider/marathon/config_test.go similarity index 99% rename from provider/marathon/config_test.go rename to pkg/provider/marathon/config_test.go index 5a97e7ca7..058d721f9 100644 --- a/provider/marathon/config_test.go +++ b/pkg/provider/marathon/config_test.go @@ -5,8 +5,8 @@ import ( "math" "testing" - "github.com/containous/traefik/config" - "github.com/containous/traefik/types" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/types" "github.com/gambol99/go-marathon" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/provider/marathon/fake_client_test.go b/pkg/provider/marathon/fake_client_test.go similarity index 90% rename from provider/marathon/fake_client_test.go rename to pkg/provider/marathon/fake_client_test.go index 42f5e0235..86b671081 100644 --- a/provider/marathon/fake_client_test.go +++ b/pkg/provider/marathon/fake_client_test.go @@ -3,7 +3,7 @@ package marathon import ( "errors" - "github.com/containous/traefik/provider/marathon/mocks" + "github.com/containous/traefik/pkg/provider/marathon/mocks" "github.com/gambol99/go-marathon" "github.com/stretchr/testify/mock" ) diff --git a/provider/marathon/label.go b/pkg/provider/marathon/label.go similarity index 95% rename from provider/marathon/label.go rename to pkg/provider/marathon/label.go index 4bddb4020..38a319227 100644 --- a/provider/marathon/label.go +++ b/pkg/provider/marathon/label.go @@ -4,7 +4,7 @@ import ( "math" "strings" - "github.com/containous/traefik/provider/label" + "github.com/containous/traefik/pkg/provider/label" "github.com/gambol99/go-marathon" ) diff --git a/provider/marathon/label_test.go b/pkg/provider/marathon/label_test.go similarity index 98% rename from provider/marathon/label_test.go rename to pkg/provider/marathon/label_test.go index 523e32ca0..8eee255e5 100644 --- a/provider/marathon/label_test.go +++ b/pkg/provider/marathon/label_test.go @@ -4,7 +4,7 @@ import ( "math" "testing" - "github.com/containous/traefik/provider" + "github.com/containous/traefik/pkg/provider" "github.com/gambol99/go-marathon" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/provider/marathon/marathon.go b/pkg/provider/marathon/marathon.go similarity index 96% rename from provider/marathon/marathon.go rename to pkg/provider/marathon/marathon.go index 4df91e749..3f0f49d23 100644 --- a/provider/marathon/marathon.go +++ b/pkg/provider/marathon/marathon.go @@ -11,12 +11,12 @@ import ( "github.com/cenkalti/backoff" "github.com/containous/flaeg/parse" - "github.com/containous/traefik/config" - "github.com/containous/traefik/job" - "github.com/containous/traefik/log" "github.com/containous/traefik/old/types" - "github.com/containous/traefik/provider" - "github.com/containous/traefik/safe" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/job" + "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/pkg/provider" + "github.com/containous/traefik/pkg/safe" "github.com/gambol99/go-marathon" "github.com/sirupsen/logrus" ) diff --git a/provider/marathon/mocks/Marathon.go b/pkg/provider/marathon/mocks/Marathon.go similarity index 100% rename from provider/marathon/mocks/Marathon.go rename to pkg/provider/marathon/mocks/Marathon.go diff --git a/provider/marathon/readiness.go b/pkg/provider/marathon/readiness.go similarity index 100% rename from provider/marathon/readiness.go rename to pkg/provider/marathon/readiness.go diff --git a/provider/marathon/readiness_test.go b/pkg/provider/marathon/readiness_test.go similarity index 100% rename from provider/marathon/readiness_test.go rename to pkg/provider/marathon/readiness_test.go diff --git a/provider/provider.go b/pkg/provider/provider.go similarity index 77% rename from provider/provider.go rename to pkg/provider/provider.go index 038f0843c..d64b69914 100644 --- a/provider/provider.go +++ b/pkg/provider/provider.go @@ -1,8 +1,8 @@ package provider import ( - "github.com/containous/traefik/config" - "github.com/containous/traefik/safe" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/safe" ) // Provider defines methods of a provider. diff --git a/provider/rest/rest.go b/pkg/provider/rest/rest.go similarity index 91% rename from provider/rest/rest.go rename to pkg/provider/rest/rest.go index 0fdee1ec8..071aef178 100644 --- a/provider/rest/rest.go +++ b/pkg/provider/rest/rest.go @@ -7,10 +7,10 @@ import ( "net/http" "github.com/containous/mux" - "github.com/containous/traefik/config" - "github.com/containous/traefik/log" - "github.com/containous/traefik/provider" - "github.com/containous/traefik/safe" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/pkg/provider" + "github.com/containous/traefik/pkg/safe" "github.com/unrolled/render" ) diff --git a/responsemodifiers/headers.go b/pkg/responsemodifiers/headers.go similarity index 97% rename from responsemodifiers/headers.go rename to pkg/responsemodifiers/headers.go index bd492472f..5494e812d 100644 --- a/responsemodifiers/headers.go +++ b/pkg/responsemodifiers/headers.go @@ -3,7 +3,7 @@ package responsemodifiers import ( "net/http" - "github.com/containous/traefik/config" + "github.com/containous/traefik/pkg/config" "github.com/unrolled/secure" ) diff --git a/responsemodifiers/log.go b/pkg/responsemodifiers/log.go similarity index 89% rename from responsemodifiers/log.go rename to pkg/responsemodifiers/log.go index 83be5dc16..fb2e2316e 100644 --- a/responsemodifiers/log.go +++ b/pkg/responsemodifiers/log.go @@ -3,7 +3,7 @@ package responsemodifiers import ( "context" - "github.com/containous/traefik/log" + "github.com/containous/traefik/pkg/log" "github.com/sirupsen/logrus" ) diff --git a/responsemodifiers/response_modifier.go b/pkg/responsemodifiers/response_modifier.go similarity index 96% rename from responsemodifiers/response_modifier.go rename to pkg/responsemodifiers/response_modifier.go index 3db627909..264059e30 100644 --- a/responsemodifiers/response_modifier.go +++ b/pkg/responsemodifiers/response_modifier.go @@ -4,7 +4,7 @@ import ( "context" "net/http" - "github.com/containous/traefik/config" + "github.com/containous/traefik/pkg/config" ) // NewBuilder creates a builder. diff --git a/responsemodifiers/response_modifier_test.go b/pkg/responsemodifiers/response_modifier_test.go similarity index 97% rename from responsemodifiers/response_modifier_test.go rename to pkg/responsemodifiers/response_modifier_test.go index 952f33486..e924238e4 100644 --- a/responsemodifiers/response_modifier_test.go +++ b/pkg/responsemodifiers/response_modifier_test.go @@ -6,8 +6,8 @@ import ( "net/http/httptest" "testing" - "github.com/containous/traefik/config" - "github.com/containous/traefik/middlewares/headers" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/middlewares/headers" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/rules/parser.go b/pkg/rules/parser.go similarity index 100% rename from rules/parser.go rename to pkg/rules/parser.go diff --git a/rules/rules.go b/pkg/rules/rules.go similarity index 97% rename from rules/rules.go rename to pkg/rules/rules.go index 7c1af84b0..e57d17ab6 100644 --- a/rules/rules.go +++ b/pkg/rules/rules.go @@ -6,8 +6,8 @@ import ( "strings" "github.com/containous/mux" - "github.com/containous/traefik/log" - "github.com/containous/traefik/middlewares/requestdecorator" + "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/pkg/middlewares/requestdecorator" "github.com/vulcand/predicate" ) diff --git a/rules/rules_test.go b/pkg/rules/rules_test.go similarity index 99% rename from rules/rules_test.go rename to pkg/rules/rules_test.go index c60ca8fd3..348c3af97 100644 --- a/rules/rules_test.go +++ b/pkg/rules/rules_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/containous/mux" - "github.com/containous/traefik/middlewares/requestdecorator" - "github.com/containous/traefik/testhelpers" + "github.com/containous/traefik/pkg/middlewares/requestdecorator" + "github.com/containous/traefik/pkg/testhelpers" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/safe/routine.go b/pkg/safe/routine.go similarity index 98% rename from safe/routine.go rename to pkg/safe/routine.go index e6c15134a..d9e213166 100644 --- a/safe/routine.go +++ b/pkg/safe/routine.go @@ -7,7 +7,7 @@ import ( "sync" "github.com/cenkalti/backoff" - "github.com/containous/traefik/log" + "github.com/containous/traefik/pkg/log" ) type routine struct { diff --git a/safe/routine_test.go b/pkg/safe/routine_test.go similarity index 100% rename from safe/routine_test.go rename to pkg/safe/routine_test.go diff --git a/safe/safe.go b/pkg/safe/safe.go similarity index 100% rename from safe/safe.go rename to pkg/safe/safe.go diff --git a/safe/safe_test.go b/pkg/safe/safe_test.go similarity index 100% rename from safe/safe_test.go rename to pkg/safe/safe_test.go diff --git a/server/aggregator.go b/pkg/server/aggregator.go similarity index 92% rename from server/aggregator.go rename to pkg/server/aggregator.go index 16d91af1e..09684dd1c 100644 --- a/server/aggregator.go +++ b/pkg/server/aggregator.go @@ -1,9 +1,9 @@ package server import ( - "github.com/containous/traefik/config" - "github.com/containous/traefik/server/internal" - "github.com/containous/traefik/tls" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/server/internal" + "github.com/containous/traefik/pkg/tls" ) func mergeConfiguration(configurations config.Configurations) config.Configuration { diff --git a/server/aggregator_test.go b/pkg/server/aggregator_test.go similarity index 98% rename from server/aggregator_test.go rename to pkg/server/aggregator_test.go index 4768f0523..c44c69cd3 100644 --- a/server/aggregator_test.go +++ b/pkg/server/aggregator_test.go @@ -3,7 +3,7 @@ package server import ( "testing" - "github.com/containous/traefik/config" + "github.com/containous/traefik/pkg/config" "github.com/stretchr/testify/assert" ) diff --git a/server/cookie/cookie.go b/pkg/server/cookie/cookie.go similarity index 96% rename from server/cookie/cookie.go rename to pkg/server/cookie/cookie.go index 780661963..b1d0e28ee 100644 --- a/server/cookie/cookie.go +++ b/pkg/server/cookie/cookie.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/containous/traefik/log" + "github.com/containous/traefik/pkg/log" ) const cookieNameLength = 6 diff --git a/server/cookie/cookie_test.go b/pkg/server/cookie/cookie_test.go similarity index 100% rename from server/cookie/cookie_test.go rename to pkg/server/cookie/cookie_test.go diff --git a/server/internal/provider.go b/pkg/server/internal/provider.go similarity index 96% rename from server/internal/provider.go rename to pkg/server/internal/provider.go index 0704068d5..5410b39c9 100644 --- a/server/internal/provider.go +++ b/pkg/server/internal/provider.go @@ -4,7 +4,7 @@ import ( "context" "strings" - "github.com/containous/traefik/log" + "github.com/containous/traefik/pkg/log" ) type contextKey int diff --git a/server/middleware/middlewares.go b/pkg/server/middleware/middlewares.go similarity index 87% rename from server/middleware/middlewares.go rename to pkg/server/middleware/middlewares.go index 504b1d962..b739c7c73 100644 --- a/server/middleware/middlewares.go +++ b/pkg/server/middleware/middlewares.go @@ -7,27 +7,27 @@ import ( "strings" "github.com/containous/alice" - "github.com/containous/traefik/config" - "github.com/containous/traefik/middlewares/addprefix" - "github.com/containous/traefik/middlewares/auth" - "github.com/containous/traefik/middlewares/buffering" - "github.com/containous/traefik/middlewares/chain" - "github.com/containous/traefik/middlewares/circuitbreaker" - "github.com/containous/traefik/middlewares/compress" - "github.com/containous/traefik/middlewares/customerrors" - "github.com/containous/traefik/middlewares/headers" - "github.com/containous/traefik/middlewares/ipwhitelist" - "github.com/containous/traefik/middlewares/maxconnection" - "github.com/containous/traefik/middlewares/passtlsclientcert" - "github.com/containous/traefik/middlewares/ratelimiter" - "github.com/containous/traefik/middlewares/redirect" - "github.com/containous/traefik/middlewares/replacepath" - "github.com/containous/traefik/middlewares/replacepathregex" - "github.com/containous/traefik/middlewares/retry" - "github.com/containous/traefik/middlewares/stripprefix" - "github.com/containous/traefik/middlewares/stripprefixregex" - "github.com/containous/traefik/middlewares/tracing" - "github.com/containous/traefik/server/internal" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/middlewares/addprefix" + "github.com/containous/traefik/pkg/middlewares/auth" + "github.com/containous/traefik/pkg/middlewares/buffering" + "github.com/containous/traefik/pkg/middlewares/chain" + "github.com/containous/traefik/pkg/middlewares/circuitbreaker" + "github.com/containous/traefik/pkg/middlewares/compress" + "github.com/containous/traefik/pkg/middlewares/customerrors" + "github.com/containous/traefik/pkg/middlewares/headers" + "github.com/containous/traefik/pkg/middlewares/ipwhitelist" + "github.com/containous/traefik/pkg/middlewares/maxconnection" + "github.com/containous/traefik/pkg/middlewares/passtlsclientcert" + "github.com/containous/traefik/pkg/middlewares/ratelimiter" + "github.com/containous/traefik/pkg/middlewares/redirect" + "github.com/containous/traefik/pkg/middlewares/replacepath" + "github.com/containous/traefik/pkg/middlewares/replacepathregex" + "github.com/containous/traefik/pkg/middlewares/retry" + "github.com/containous/traefik/pkg/middlewares/stripprefix" + "github.com/containous/traefik/pkg/middlewares/stripprefixregex" + "github.com/containous/traefik/pkg/middlewares/tracing" + "github.com/containous/traefik/pkg/server/internal" "github.com/pkg/errors" ) diff --git a/server/middleware/middlewares_test.go b/pkg/server/middleware/middlewares_test.go similarity index 99% rename from server/middleware/middlewares_test.go rename to pkg/server/middleware/middlewares_test.go index 920eff2a3..1cf14b8f5 100644 --- a/server/middleware/middlewares_test.go +++ b/pkg/server/middleware/middlewares_test.go @@ -7,8 +7,8 @@ import ( "net/http/httptest" "testing" - "github.com/containous/traefik/config" - "github.com/containous/traefik/server/internal" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/server/internal" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/server/roundtripper.go b/pkg/server/roundtripper.go similarity index 95% rename from server/roundtripper.go rename to pkg/server/roundtripper.go index 30f0b973a..367c5b4f3 100644 --- a/server/roundtripper.go +++ b/pkg/server/roundtripper.go @@ -7,10 +7,10 @@ import ( "net/http" "time" - "github.com/containous/traefik/config/static" - "github.com/containous/traefik/log" "github.com/containous/traefik/old/configuration" - traefiktls "github.com/containous/traefik/tls" + "github.com/containous/traefik/pkg/config/static" + "github.com/containous/traefik/pkg/log" + traefiktls "github.com/containous/traefik/pkg/tls" "github.com/pkg/errors" "golang.org/x/net/http2" ) diff --git a/server/router/route_appender_aggregator.go b/pkg/server/router/route_appender_aggregator.go similarity index 92% rename from server/router/route_appender_aggregator.go rename to pkg/server/router/route_appender_aggregator.go index c43b596b9..16260b63e 100644 --- a/server/router/route_appender_aggregator.go +++ b/pkg/server/router/route_appender_aggregator.go @@ -5,12 +5,12 @@ import ( "github.com/containous/alice" "github.com/containous/mux" - "github.com/containous/traefik/api" - "github.com/containous/traefik/config/static" - "github.com/containous/traefik/log" - "github.com/containous/traefik/metrics" - "github.com/containous/traefik/safe" - "github.com/containous/traefik/types" + "github.com/containous/traefik/pkg/api" + "github.com/containous/traefik/pkg/config/static" + "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/pkg/metrics" + "github.com/containous/traefik/pkg/safe" + "github.com/containous/traefik/pkg/types" ) // chainBuilder The contract of the middleware builder diff --git a/server/router/route_appender_aggregator_test.go b/pkg/server/router/route_appender_aggregator_test.go similarity index 96% rename from server/router/route_appender_aggregator_test.go rename to pkg/server/router/route_appender_aggregator_test.go index 809058658..7722e0628 100644 --- a/server/router/route_appender_aggregator_test.go +++ b/pkg/server/router/route_appender_aggregator_test.go @@ -8,8 +8,8 @@ import ( "github.com/containous/alice" "github.com/containous/mux" - "github.com/containous/traefik/config/static" - "github.com/containous/traefik/ping" + "github.com/containous/traefik/pkg/config/static" + "github.com/containous/traefik/pkg/ping" "github.com/stretchr/testify/assert" ) diff --git a/server/router/route_appender_factory.go b/pkg/server/router/route_appender_factory.go similarity index 82% rename from server/router/route_appender_factory.go rename to pkg/server/router/route_appender_factory.go index a9f209656..a22f36239 100644 --- a/server/router/route_appender_factory.go +++ b/pkg/server/router/route_appender_factory.go @@ -3,11 +3,11 @@ package router import ( "context" - "github.com/containous/traefik/config/static" - "github.com/containous/traefik/provider/acme" - "github.com/containous/traefik/safe" - "github.com/containous/traefik/server/middleware" - "github.com/containous/traefik/types" + "github.com/containous/traefik/pkg/config/static" + "github.com/containous/traefik/pkg/provider/acme" + "github.com/containous/traefik/pkg/safe" + "github.com/containous/traefik/pkg/server/middleware" + "github.com/containous/traefik/pkg/types" ) // NewRouteAppenderFactory Creates a new RouteAppenderFactory diff --git a/server/router/router.go b/pkg/server/router/router.go similarity index 90% rename from server/router/router.go rename to pkg/server/router/router.go index 015c99c86..68f21fd43 100644 --- a/server/router/router.go +++ b/pkg/server/router/router.go @@ -6,16 +6,16 @@ import ( "net/http" "github.com/containous/alice" - "github.com/containous/traefik/config" - "github.com/containous/traefik/log" - "github.com/containous/traefik/middlewares/accesslog" - "github.com/containous/traefik/middlewares/recovery" - "github.com/containous/traefik/middlewares/tracing" - "github.com/containous/traefik/responsemodifiers" - "github.com/containous/traefik/rules" - "github.com/containous/traefik/server/internal" - "github.com/containous/traefik/server/middleware" - "github.com/containous/traefik/server/service" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/pkg/middlewares/accesslog" + "github.com/containous/traefik/pkg/middlewares/recovery" + "github.com/containous/traefik/pkg/middlewares/tracing" + "github.com/containous/traefik/pkg/responsemodifiers" + "github.com/containous/traefik/pkg/rules" + "github.com/containous/traefik/pkg/server/internal" + "github.com/containous/traefik/pkg/server/middleware" + "github.com/containous/traefik/pkg/server/service" ) const ( diff --git a/server/router/router_test.go b/pkg/server/router/router_test.go similarity index 96% rename from server/router/router_test.go rename to pkg/server/router/router_test.go index ee2848766..c242b276b 100644 --- a/server/router/router_test.go +++ b/pkg/server/router/router_test.go @@ -8,14 +8,14 @@ import ( "strings" "testing" - "github.com/containous/traefik/config" - "github.com/containous/traefik/middlewares/accesslog" - "github.com/containous/traefik/middlewares/requestdecorator" - "github.com/containous/traefik/responsemodifiers" - "github.com/containous/traefik/server/middleware" - "github.com/containous/traefik/server/service" - "github.com/containous/traefik/testhelpers" - "github.com/containous/traefik/types" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/middlewares/accesslog" + "github.com/containous/traefik/pkg/middlewares/requestdecorator" + "github.com/containous/traefik/pkg/responsemodifiers" + "github.com/containous/traefik/pkg/server/middleware" + "github.com/containous/traefik/pkg/server/service" + "github.com/containous/traefik/pkg/testhelpers" + "github.com/containous/traefik/pkg/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/server/router/tcp/router.go b/pkg/server/router/tcp/router.go similarity index 92% rename from server/router/tcp/router.go rename to pkg/server/router/tcp/router.go index 15db18418..34d984b61 100644 --- a/server/router/tcp/router.go +++ b/pkg/server/router/tcp/router.go @@ -5,12 +5,12 @@ import ( "crypto/tls" "net/http" - "github.com/containous/traefik/config" - "github.com/containous/traefik/log" - "github.com/containous/traefik/rules" - "github.com/containous/traefik/server/internal" - tcpservice "github.com/containous/traefik/server/service/tcp" - "github.com/containous/traefik/tcp" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/pkg/rules" + "github.com/containous/traefik/pkg/server/internal" + tcpservice "github.com/containous/traefik/pkg/server/service/tcp" + "github.com/containous/traefik/pkg/tcp" ) // NewManager Creates a new Manager diff --git a/server/server.go b/pkg/server/server.go similarity index 91% rename from server/server.go rename to pkg/server/server.go index bfcc9a893..e0e62dbf3 100644 --- a/server/server.go +++ b/pkg/server/server.go @@ -9,22 +9,22 @@ import ( "sync" "time" - "github.com/containous/traefik/config" - "github.com/containous/traefik/config/static" - "github.com/containous/traefik/log" - "github.com/containous/traefik/metrics" - "github.com/containous/traefik/middlewares/accesslog" - "github.com/containous/traefik/middlewares/requestdecorator" - "github.com/containous/traefik/provider" - "github.com/containous/traefik/safe" - "github.com/containous/traefik/server/middleware" - "github.com/containous/traefik/tls" - "github.com/containous/traefik/tracing" - "github.com/containous/traefik/tracing/datadog" - "github.com/containous/traefik/tracing/instana" - "github.com/containous/traefik/tracing/jaeger" - "github.com/containous/traefik/tracing/zipkin" - "github.com/containous/traefik/types" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/config/static" + "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/pkg/metrics" + "github.com/containous/traefik/pkg/middlewares/accesslog" + "github.com/containous/traefik/pkg/middlewares/requestdecorator" + "github.com/containous/traefik/pkg/provider" + "github.com/containous/traefik/pkg/safe" + "github.com/containous/traefik/pkg/server/middleware" + "github.com/containous/traefik/pkg/tls" + "github.com/containous/traefik/pkg/tracing" + "github.com/containous/traefik/pkg/tracing/datadog" + "github.com/containous/traefik/pkg/tracing/instana" + "github.com/containous/traefik/pkg/tracing/jaeger" + "github.com/containous/traefik/pkg/tracing/zipkin" + "github.com/containous/traefik/pkg/types" ) // Server is the reverse-proxy/load-balancer engine diff --git a/server/server_configuration.go b/pkg/server/server_configuration.go similarity index 92% rename from server/server_configuration.go rename to pkg/server/server_configuration.go index dc1efda51..915fb3b1d 100644 --- a/server/server_configuration.go +++ b/pkg/server/server_configuration.go @@ -10,18 +10,18 @@ import ( "github.com/containous/alice" "github.com/containous/mux" - "github.com/containous/traefik/config" - "github.com/containous/traefik/log" - "github.com/containous/traefik/middlewares/accesslog" - "github.com/containous/traefik/middlewares/requestdecorator" - "github.com/containous/traefik/middlewares/tracing" - "github.com/containous/traefik/responsemodifiers" - "github.com/containous/traefik/server/middleware" - "github.com/containous/traefik/server/router" - routertcp "github.com/containous/traefik/server/router/tcp" - "github.com/containous/traefik/server/service" - "github.com/containous/traefik/server/service/tcp" - tcpCore "github.com/containous/traefik/tcp" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/pkg/middlewares/accesslog" + "github.com/containous/traefik/pkg/middlewares/requestdecorator" + "github.com/containous/traefik/pkg/middlewares/tracing" + "github.com/containous/traefik/pkg/responsemodifiers" + "github.com/containous/traefik/pkg/server/middleware" + "github.com/containous/traefik/pkg/server/router" + routertcp "github.com/containous/traefik/pkg/server/router/tcp" + "github.com/containous/traefik/pkg/server/service" + "github.com/containous/traefik/pkg/server/service/tcp" + tcpCore "github.com/containous/traefik/pkg/tcp" "github.com/eapache/channels" "github.com/sirupsen/logrus" ) diff --git a/server/server_configuration_test.go b/pkg/server/server_configuration_test.go similarity index 95% rename from server/server_configuration_test.go rename to pkg/server/server_configuration_test.go index 9d91ccc9d..2e9e76c38 100644 --- a/server/server_configuration_test.go +++ b/pkg/server/server_configuration_test.go @@ -7,9 +7,9 @@ import ( "testing" "time" - "github.com/containous/traefik/config" - "github.com/containous/traefik/config/static" - th "github.com/containous/traefik/testhelpers" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/config/static" + th "github.com/containous/traefik/pkg/testhelpers" "github.com/stretchr/testify/assert" ) diff --git a/server/server_entrypoint_tcp.go b/pkg/server/server_entrypoint_tcp.go similarity index 96% rename from server/server_entrypoint_tcp.go rename to pkg/server/server_entrypoint_tcp.go index 8ffc3a374..2daefd125 100644 --- a/server/server_entrypoint_tcp.go +++ b/pkg/server/server_entrypoint_tcp.go @@ -9,14 +9,14 @@ import ( "time" "github.com/armon/go-proxyproto" - "github.com/containous/traefik/config/static" - "github.com/containous/traefik/h2c" - "github.com/containous/traefik/ip" - "github.com/containous/traefik/log" - "github.com/containous/traefik/middlewares" - "github.com/containous/traefik/middlewares/forwardedheaders" - "github.com/containous/traefik/safe" - "github.com/containous/traefik/tcp" + "github.com/containous/traefik/pkg/config/static" + "github.com/containous/traefik/pkg/h2c" + "github.com/containous/traefik/pkg/ip" + "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/pkg/middlewares" + "github.com/containous/traefik/pkg/middlewares/forwardedheaders" + "github.com/containous/traefik/pkg/safe" + "github.com/containous/traefik/pkg/tcp" ) type httpForwarder struct { diff --git a/server/server_entrypoint_tcp_test.go b/pkg/server/server_entrypoint_tcp_test.go similarity index 97% rename from server/server_entrypoint_tcp_test.go rename to pkg/server/server_entrypoint_tcp_test.go index 40e0c3778..c6b590ede 100644 --- a/server/server_entrypoint_tcp_test.go +++ b/pkg/server/server_entrypoint_tcp_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/containous/flaeg/parse" - "github.com/containous/traefik/config/static" - "github.com/containous/traefik/tcp" + "github.com/containous/traefik/pkg/config/static" + "github.com/containous/traefik/pkg/tcp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/server/server_signals.go b/pkg/server/server_signals.go similarity index 94% rename from server/server_signals.go rename to pkg/server/server_signals.go index 028ac5493..63bf9d5c0 100644 --- a/server/server_signals.go +++ b/pkg/server/server_signals.go @@ -6,7 +6,7 @@ import ( "os/signal" "syscall" - "github.com/containous/traefik/log" + "github.com/containous/traefik/pkg/log" ) func (s *Server) configureSignals() { diff --git a/server/server_signals_windows.go b/pkg/server/server_signals_windows.go similarity index 100% rename from server/server_signals_windows.go rename to pkg/server/server_signals_windows.go diff --git a/server/server_test.go b/pkg/server/server_test.go similarity index 98% rename from server/server_test.go rename to pkg/server/server_test.go index 165147810..a1c538ab3 100644 --- a/server/server_test.go +++ b/pkg/server/server_test.go @@ -8,9 +8,9 @@ import ( "time" "github.com/containous/flaeg/parse" - "github.com/containous/traefik/config" - "github.com/containous/traefik/config/static" - th "github.com/containous/traefik/testhelpers" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/config/static" + th "github.com/containous/traefik/pkg/testhelpers" "github.com/stretchr/testify/assert" ) diff --git a/server/service/bufferpool.go b/pkg/server/service/bufferpool.go similarity index 100% rename from server/service/bufferpool.go rename to pkg/server/service/bufferpool.go diff --git a/server/service/proxy.go b/pkg/server/service/proxy.go similarity index 96% rename from server/service/proxy.go rename to pkg/server/service/proxy.go index 6ea96d769..3e15c5a05 100644 --- a/server/service/proxy.go +++ b/pkg/server/service/proxy.go @@ -11,8 +11,8 @@ import ( "time" "github.com/containous/flaeg/parse" - "github.com/containous/traefik/config" - "github.com/containous/traefik/log" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/log" ) // StatusClientClosedRequest non-standard HTTP status code for client disconnection diff --git a/server/service/proxy_test.go b/pkg/server/service/proxy_test.go similarity index 93% rename from server/service/proxy_test.go rename to pkg/server/service/proxy_test.go index 76eb791c1..5201741ab 100644 --- a/server/service/proxy_test.go +++ b/pkg/server/service/proxy_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/containous/traefik/testhelpers" + "github.com/containous/traefik/pkg/testhelpers" ) type staticTransport struct { diff --git a/server/service/proxy_websocket_test.go b/pkg/server/service/proxy_websocket_test.go similarity index 100% rename from server/service/proxy_websocket_test.go rename to pkg/server/service/proxy_websocket_test.go diff --git a/server/service/service.go b/pkg/server/service/service.go similarity index 95% rename from server/service/service.go rename to pkg/server/service/service.go index cbe13acbc..577519b4f 100644 --- a/server/service/service.go +++ b/pkg/server/service/service.go @@ -9,14 +9,14 @@ import ( "time" "github.com/containous/alice" - "github.com/containous/traefik/config" - "github.com/containous/traefik/healthcheck" - "github.com/containous/traefik/log" - "github.com/containous/traefik/middlewares/accesslog" - "github.com/containous/traefik/middlewares/emptybackendhandler" "github.com/containous/traefik/old/middlewares/pipelining" - "github.com/containous/traefik/server/cookie" - "github.com/containous/traefik/server/internal" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/healthcheck" + "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/pkg/middlewares/accesslog" + "github.com/containous/traefik/pkg/middlewares/emptybackendhandler" + "github.com/containous/traefik/pkg/server/cookie" + "github.com/containous/traefik/pkg/server/internal" "github.com/vulcand/oxy/roundrobin" ) diff --git a/server/service/service_test.go b/pkg/server/service/service_test.go similarity index 98% rename from server/service/service_test.go rename to pkg/server/service/service_test.go index c908aa56f..d066fbee2 100644 --- a/server/service/service_test.go +++ b/pkg/server/service/service_test.go @@ -6,9 +6,9 @@ import ( "net/http/httptest" "testing" - "github.com/containous/traefik/config" - "github.com/containous/traefik/server/internal" - "github.com/containous/traefik/testhelpers" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/server/internal" + "github.com/containous/traefik/pkg/testhelpers" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/server/service/tcp/service.go b/pkg/server/service/tcp/service.go similarity index 90% rename from server/service/tcp/service.go rename to pkg/server/service/tcp/service.go index 729089991..e91deeb09 100644 --- a/server/service/tcp/service.go +++ b/pkg/server/service/tcp/service.go @@ -5,10 +5,10 @@ import ( "fmt" "net" - "github.com/containous/traefik/config" - "github.com/containous/traefik/log" - "github.com/containous/traefik/server/internal" - "github.com/containous/traefik/tcp" + "github.com/containous/traefik/pkg/config" + "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/pkg/server/internal" + "github.com/containous/traefik/pkg/tcp" ) // Manager is the TCPHandlers factory diff --git a/server/uuid/uuid.go b/pkg/server/uuid/uuid.go similarity index 100% rename from server/uuid/uuid.go rename to pkg/server/uuid/uuid.go diff --git a/tcp/handler.go b/pkg/tcp/handler.go similarity index 100% rename from tcp/handler.go rename to pkg/tcp/handler.go diff --git a/tcp/proxy.go b/pkg/tcp/proxy.go similarity index 96% rename from tcp/proxy.go rename to pkg/tcp/proxy.go index bd1cc7d48..7528cb626 100644 --- a/tcp/proxy.go +++ b/pkg/tcp/proxy.go @@ -4,7 +4,7 @@ import ( "io" "net" - "github.com/containous/traefik/log" + "github.com/containous/traefik/pkg/log" ) // Proxy forwards a TCP request to a TCP service diff --git a/tcp/router.go b/pkg/tcp/router.go similarity index 99% rename from tcp/router.go rename to pkg/tcp/router.go index 5412ef9b5..9287abeef 100644 --- a/tcp/router.go +++ b/pkg/tcp/router.go @@ -9,7 +9,7 @@ import ( "net/http" "strings" - "github.com/containous/traefik/log" + "github.com/containous/traefik/pkg/log" ) // Router is a TCP router diff --git a/tcp/rr_load_balancer.go b/pkg/tcp/rr_load_balancer.go similarity index 95% rename from tcp/rr_load_balancer.go rename to pkg/tcp/rr_load_balancer.go index 37e7da4e1..15a27af5d 100644 --- a/tcp/rr_load_balancer.go +++ b/pkg/tcp/rr_load_balancer.go @@ -4,7 +4,7 @@ import ( "net" "sync" - "github.com/containous/traefik/log" + "github.com/containous/traefik/pkg/log" ) // RRLoadBalancer is a naive RoundRobin load balancer for TCP services diff --git a/tcp/switcher.go b/pkg/tcp/switcher.go similarity index 92% rename from tcp/switcher.go rename to pkg/tcp/switcher.go index 145529aa7..9ff7e31d9 100644 --- a/tcp/switcher.go +++ b/pkg/tcp/switcher.go @@ -3,7 +3,7 @@ package tcp import ( "net" - "github.com/containous/traefik/safe" + "github.com/containous/traefik/pkg/safe" ) // HandlerSwitcher is a TCP handler switcher diff --git a/tcp/tls.go b/pkg/tcp/tls.go similarity index 100% rename from tcp/tls.go rename to pkg/tcp/tls.go diff --git a/testhelpers/config.go b/pkg/testhelpers/config.go similarity index 98% rename from testhelpers/config.go rename to pkg/testhelpers/config.go index 0df261c52..701b5e9f7 100644 --- a/testhelpers/config.go +++ b/pkg/testhelpers/config.go @@ -1,7 +1,7 @@ package testhelpers import ( - "github.com/containous/traefik/config" + "github.com/containous/traefik/pkg/config" ) // BuildConfiguration is a helper to create a configuration. diff --git a/testhelpers/helpers.go b/pkg/testhelpers/helpers.go similarity index 100% rename from testhelpers/helpers.go rename to pkg/testhelpers/helpers.go diff --git a/testhelpers/metrics.go b/pkg/testhelpers/metrics.go similarity index 100% rename from testhelpers/metrics.go rename to pkg/testhelpers/metrics.go diff --git a/tls/certificate.go b/pkg/tls/certificate.go similarity index 98% rename from tls/certificate.go rename to pkg/tls/certificate.go index 7cf8df633..3da49dbce 100644 --- a/tls/certificate.go +++ b/pkg/tls/certificate.go @@ -9,8 +9,8 @@ import ( "sort" "strings" - "github.com/containous/traefik/log" - "github.com/containous/traefik/tls/generate" + "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/pkg/tls/generate" ) var ( diff --git a/tls/certificate_store.go b/pkg/tls/certificate_store.go similarity index 97% rename from tls/certificate_store.go rename to pkg/tls/certificate_store.go index db9116e1e..040d2b978 100644 --- a/tls/certificate_store.go +++ b/pkg/tls/certificate_store.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "github.com/containous/traefik/log" - "github.com/containous/traefik/safe" + "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/pkg/safe" "github.com/patrickmn/go-cache" ) diff --git a/tls/certificate_store_test.go b/pkg/tls/certificate_store_test.go similarity index 90% rename from tls/certificate_store_test.go rename to pkg/tls/certificate_store_test.go index a1f24d19b..b67ac3cff 100644 --- a/tls/certificate_store_test.go +++ b/pkg/tls/certificate_store_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/containous/traefik/safe" + "github.com/containous/traefik/pkg/safe" "github.com/patrickmn/go-cache" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -96,8 +96,8 @@ func loadTestCert(certName string, uppercase bool) (*tls.Certificate, error) { } staticCert, err := tls.LoadX509KeyPair( - fmt.Sprintf("../integration/fixtures/https/%s.cert", strings.Replace(certName, "*", replacement, -1)), - fmt.Sprintf("../integration/fixtures/https/%s.key", strings.Replace(certName, "*", replacement, -1)), + fmt.Sprintf("../../integration/fixtures/https/%s.cert", strings.Replace(certName, "*", replacement, -1)), + fmt.Sprintf("../../integration/fixtures/https/%s.key", strings.Replace(certName, "*", replacement, -1)), ) if err != nil { return nil, err diff --git a/tls/generate/generate.go b/pkg/tls/generate/generate.go similarity index 100% rename from tls/generate/generate.go rename to pkg/tls/generate/generate.go diff --git a/tls/tls.go b/pkg/tls/tls.go similarity index 100% rename from tls/tls.go rename to pkg/tls/tls.go diff --git a/tls/tlsmanager.go b/pkg/tls/tlsmanager.go similarity index 97% rename from tls/tlsmanager.go rename to pkg/tls/tlsmanager.go index 784974354..0de0a6f8d 100644 --- a/tls/tlsmanager.go +++ b/pkg/tls/tlsmanager.go @@ -6,9 +6,9 @@ import ( "fmt" "sync" - "github.com/containous/traefik/log" - "github.com/containous/traefik/tls/generate" - "github.com/containous/traefik/types" + "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/pkg/tls/generate" + "github.com/containous/traefik/pkg/types" "github.com/go-acme/lego/challenge/tlsalpn01" "github.com/sirupsen/logrus" ) diff --git a/tls/tlsmanager_test.go b/pkg/tls/tlsmanager_test.go similarity index 100% rename from tls/tlsmanager_test.go rename to pkg/tls/tlsmanager_test.go diff --git a/tracing/carrier.go b/pkg/tracing/carrier.go similarity index 100% rename from tracing/carrier.go rename to pkg/tracing/carrier.go diff --git a/tracing/datadog/datadog.go b/pkg/tracing/datadog/datadog.go similarity index 97% rename from tracing/datadog/datadog.go rename to pkg/tracing/datadog/datadog.go index 3bd9ed78b..39635375e 100644 --- a/tracing/datadog/datadog.go +++ b/pkg/tracing/datadog/datadog.go @@ -4,7 +4,7 @@ import ( "io" "strings" - "github.com/containous/traefik/log" + "github.com/containous/traefik/pkg/log" "github.com/opentracing/opentracing-go" ddtracer "gopkg.in/DataDog/dd-trace-go.v1/ddtrace/opentracer" datadog "gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer" diff --git a/tracing/instana/instana.go b/pkg/tracing/instana/instana.go similarity index 96% rename from tracing/instana/instana.go rename to pkg/tracing/instana/instana.go index 3ddc88c93..5302281d6 100644 --- a/tracing/instana/instana.go +++ b/pkg/tracing/instana/instana.go @@ -3,7 +3,7 @@ package instana import ( "io" - "github.com/containous/traefik/log" + "github.com/containous/traefik/pkg/log" instana "github.com/instana/go-sensor" "github.com/opentracing/opentracing-go" ) diff --git a/tracing/jaeger/jaeger.go b/pkg/tracing/jaeger/jaeger.go similarity index 98% rename from tracing/jaeger/jaeger.go rename to pkg/tracing/jaeger/jaeger.go index 0ece7e2ac..048bf8849 100644 --- a/tracing/jaeger/jaeger.go +++ b/pkg/tracing/jaeger/jaeger.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - "github.com/containous/traefik/log" + "github.com/containous/traefik/pkg/log" "github.com/opentracing/opentracing-go" jaeger "github.com/uber/jaeger-client-go" jaegercfg "github.com/uber/jaeger-client-go/config" diff --git a/tracing/jaeger/logger.go b/pkg/tracing/jaeger/logger.go similarity index 93% rename from tracing/jaeger/logger.go rename to pkg/tracing/jaeger/logger.go index e2c934d5c..6e6d8a439 100644 --- a/tracing/jaeger/logger.go +++ b/pkg/tracing/jaeger/logger.go @@ -1,7 +1,7 @@ package jaeger import ( - "github.com/containous/traefik/log" + "github.com/containous/traefik/pkg/log" "github.com/sirupsen/logrus" ) diff --git a/tracing/operation_name.go b/pkg/tracing/operation_name.go similarity index 97% rename from tracing/operation_name.go rename to pkg/tracing/operation_name.go index 2321eec8e..8d0887a04 100644 --- a/tracing/operation_name.go +++ b/pkg/tracing/operation_name.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/containous/traefik/log" + "github.com/containous/traefik/pkg/log" ) // TraceNameHashLength defines the number of characters to use from the head of the generated hash. diff --git a/tracing/operation_name_test.go b/pkg/tracing/operation_name_test.go similarity index 100% rename from tracing/operation_name_test.go rename to pkg/tracing/operation_name_test.go diff --git a/tracing/tracing.go b/pkg/tracing/tracing.go similarity index 99% rename from tracing/tracing.go rename to pkg/tracing/tracing.go index 339ac6228..463a497f4 100644 --- a/tracing/tracing.go +++ b/pkg/tracing/tracing.go @@ -7,7 +7,7 @@ import ( "io" "net/http" - "github.com/containous/traefik/log" + "github.com/containous/traefik/pkg/log" "github.com/opentracing/opentracing-go" "github.com/opentracing/opentracing-go/ext" ) diff --git a/tracing/zipkin/zipkin.go b/pkg/tracing/zipkin/zipkin.go similarity index 97% rename from tracing/zipkin/zipkin.go rename to pkg/tracing/zipkin/zipkin.go index 133ca5749..84d776b5a 100644 --- a/tracing/zipkin/zipkin.go +++ b/pkg/tracing/zipkin/zipkin.go @@ -4,7 +4,7 @@ import ( "io" "time" - "github.com/containous/traefik/log" + "github.com/containous/traefik/pkg/log" "github.com/opentracing/opentracing-go" zipkin "github.com/openzipkin/zipkin-go-opentracing" ) diff --git a/types/constraints.go b/pkg/types/constraints.go similarity index 100% rename from types/constraints.go rename to pkg/types/constraints.go diff --git a/types/dns_resolvers.go b/pkg/types/dns_resolvers.go similarity index 100% rename from types/dns_resolvers.go rename to pkg/types/dns_resolvers.go diff --git a/types/domain_test.go b/pkg/types/domain_test.go similarity index 100% rename from types/domain_test.go rename to pkg/types/domain_test.go diff --git a/types/domains.go b/pkg/types/domains.go similarity index 100% rename from types/domains.go rename to pkg/types/domains.go diff --git a/types/host_resolver.go b/pkg/types/host_resolver.go similarity index 100% rename from types/host_resolver.go rename to pkg/types/host_resolver.go diff --git a/types/http_code_range.go b/pkg/types/http_code_range.go similarity index 100% rename from types/http_code_range.go rename to pkg/types/http_code_range.go diff --git a/types/logs.go b/pkg/types/logs.go similarity index 100% rename from types/logs.go rename to pkg/types/logs.go diff --git a/types/logs_test.go b/pkg/types/logs_test.go similarity index 100% rename from types/logs_test.go rename to pkg/types/logs_test.go diff --git a/types/metrics.go b/pkg/types/metrics.go similarity index 100% rename from types/metrics.go rename to pkg/types/metrics.go diff --git a/types/route_appender.go b/pkg/types/route_appender.go similarity index 100% rename from types/route_appender.go rename to pkg/types/route_appender.go diff --git a/types/tls.go b/pkg/types/tls.go similarity index 98% rename from types/tls.go rename to pkg/types/tls.go index f8ab3ef58..4f1c66ff7 100644 --- a/types/tls.go +++ b/pkg/types/tls.go @@ -8,7 +8,7 @@ import ( "io/ioutil" "os" - "github.com/containous/traefik/log" + "github.com/containous/traefik/pkg/log" ) // ClientTLS holds TLS specific configurations as client diff --git a/version/version.go b/pkg/version/version.go similarity index 98% rename from version/version.go rename to pkg/version/version.go index a9dbba455..386df6153 100644 --- a/version/version.go +++ b/pkg/version/version.go @@ -6,7 +6,7 @@ import ( "net/url" "github.com/containous/mux" - "github.com/containous/traefik/log" + "github.com/containous/traefik/pkg/log" "github.com/google/go-github/github" goversion "github.com/hashicorp/go-version" "github.com/unrolled/render" diff --git a/script/binary b/script/binary index 183516e4a..79ce53e31 100755 --- a/script/binary +++ b/script/binary @@ -27,7 +27,7 @@ fi # Build binaries CGO_ENABLED=0 GOGC=off go build $FLAGS -ldflags "-s -w \ - -X github.com/containous/traefik/version.Version=$VERSION \ - -X github.com/containous/traefik/version.Codename=$CODENAME \ - -X github.com/containous/traefik/version.BuildDate=$DATE" \ + -X github.com/containous/traefik/pkg/version.Version=$VERSION \ + -X github.com/containous/traefik/pkg/version.Codename=$CODENAME \ + -X github.com/containous/traefik/pkg/version.BuildDate=$DATE" \ -a -installsuffix nocgo -o dist/traefik ./cmd/traefik diff --git a/script/crossbinary-default b/script/crossbinary-default index c5e837db4..e212207e2 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/version' +GIT_REPO_URL='github.com/containous/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/crossbinary-others b/script/crossbinary-others index 91658887d..aca441662 100755 --- a/script/crossbinary-others +++ b/script/crossbinary-others @@ -20,7 +20,7 @@ fi echo "Building ${VERSION} ${CODENAME} ${DATE}" -GIT_REPO_URL='github.com/containous/traefik/version' +GIT_REPO_URL='github.com/containous/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/test-integration b/script/test-integration index 0cf7ccf8b..079565a86 100755 --- a/script/test-integration +++ b/script/test-integration @@ -8,8 +8,11 @@ TESTFLAGS="${TESTFLAGS} -test.timeout=20m -check.v" if [ -n "$VERBOSE" ]; then TESTFLAGS="${TESTFLAGS} -v" +elif [ -n "$VERBOSE_INTEGRATION" ]; then + TESTFLAGS="${TESTFLAGS} -v" fi + cd integration echo "Testing against…" docker version diff --git a/script/test-unit b/script/test-unit index ae5f650a0..0d11fcd93 100755 --- a/script/test-unit +++ b/script/test-unit @@ -10,53 +10,23 @@ RED=$'\033[31m' GREEN=$'\033[32m' TEXTRESET=$'\033[0m' # reset the foreground colour -# This helper function walks the current directory looking for directories -# holding certain files ($1 parameter), and prints their paths on standard -# output, one per line. -find_dirs() { - find . -not \( \ - \( \ - -path './integration/*' \ - -o -path './old/*' \ - -o -path './vendor/*' \ - -o -path './.git/*' \ - \) \ - -prune \ - \) -name "$1" -print0 | xargs -0n1 dirname | sort -u -} - +# -failfast -timeout=5m TESTFLAGS="-cover -coverprofile=cover.out ${TESTFLAGS}" if [ -n "$VERBOSE" ]; then TESTFLAGS="${TESTFLAGS} -v" +elif [ -n "$VERBOSE_UNIT" ]; then + TESTFLAGS="${TESTFLAGS} -v" fi -if [ -z "$TESTDIRS" ]; then - TESTDIRS=$(find_dirs '*_test.go') -fi +set +e -TESTS_FAILED=() +go test ${TESTFLAGS} ./pkg/... -for dir in $TESTDIRS; do - echo '+ go test' $TESTFLAGS "${dir}" - go test ${TESTFLAGS} ${dir} - if [ $? != 0 ]; then - TESTS_FAILED+=("$dir") - echo - echo "${RED}Tests failed: $dir${TEXTRESET}" - sleep 1 # give it a second, so observers watching can take note - fi -done -echo - -# if some tests fail, we want the bundlescript to fail, but we want to -# try running ALL the tests first, hence TESTS_FAILED -if [ "${#TESTS_FAILED[@]}" -gt 0 ]; then - echo "${RED}Test failures in: ${TESTS_FAILED[@]}${TEXTRESET}" - echo - false +CODE=$? +if [ ${CODE} != 0 ]; then + echo "${RED}Tests failed [code ${CODE}].${TEXTRESET}" + exit ${CODE} else - echo "${GREEN}Test success${TEXTRESET}" - echo - true + echo "${GREEN}Tests succeed.${TEXTRESET}" fi diff --git a/script/update-generated-crd-code.sh b/script/update-generated-crd-code.sh index 49b8e3a84..7186e827c 100755 --- a/script/update-generated-crd-code.sh +++ b/script/update-generated-crd-code.sh @@ -5,10 +5,10 @@ REPO_ROOT=${HACK_DIR}/.. ${REPO_ROOT}/vendor/k8s.io/code-generator/generate-groups.sh \ all \ - github.com/containous/traefik/provider/kubernetes/crd/generated \ - github.com/containous/traefik/provider/kubernetes/crd \ + github.com/containous/traefik/pkg/provider/kubernetes/crd/generated \ + github.com/containous/traefik/pkg/provider/kubernetes/crd \ traefik:v1alpha1 \ --go-header-file ${HACK_DIR}/boilerplate.go.tmpl \ $@ -deepcopy-gen --input-dirs github.com/containous/traefik/config -O zz_generated.deepcopy --go-header-file ${HACK_DIR}/boilerplate.go.tmpl +deepcopy-gen --input-dirs github.com/containous/traefik/pkg/config -O zz_generated.deepcopy --go-header-file ${HACK_DIR}/boilerplate.go.tmpl