diff options
| author |  Miek Gieben <miek@miek.nl>
| 2020-09-24 18:14:41 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2020-09-24 18:14:41 +0200 |
| commit | b003d06003750e26d1621c1d6167ce63ecd824d5 (patch) | |
| tree | 364892e67a24826063c2e3a5d308b1dadbeaa8b3 /plugin/kubernetes | |
| parent | 24e668ecf085597faa3100f130a85c480a36c7cb (diff) | |
| download | coredns-b003d06003750e26d1621c1d6167ce63ecd824d5.tar.gz coredns-b003d06003750e26d1621c1d6167ce63ecd824d5.tar.zst coredns-b003d06003750e26d1621c1d6167ce63ecd824d5.zip | |
For caddy v1 in our org (#4018)
* For caddy v1 in our org
This RP changes all imports for caddyserver/caddy to coredns/caddy. This
is the v1 code of caddy.
For the coredns/caddy repo the following changes have been made:
* anything not needed by us is deleted
* all `telemetry` stuff is deleted
* all its import paths are also changed to point to coredns/caddy
* the v1 branch has been moved to the master branch
* a v1.1.0 tag has been added to signal the latest release
Signed-off-by: Miek Gieben <miek@miek.nl>
* Fix imports
Signed-off-by: Miek Gieben <miek@miek.nl>
* Group coredns/caddy with out plugins
Signed-off-by: Miek Gieben <miek@miek.nl>
* remove this file
Signed-off-by: Miek Gieben <miek@miek.nl>
* Relax import ordering
github.com/coredns is now also a coredns dep, this makes
github.com/coredns/caddy fit more natural in the list.
Signed-off-by: Miek Gieben <miek@miek.nl>
* Fix final import
Signed-off-by: Miek Gieben <miek@miek.nl>
Diffstat (limited to 'plugin/kubernetes')
| -rw-r--r-- | plugin/kubernetes/local.go | 2 | ||||
| -rw-r--r-- | plugin/kubernetes/setup.go | 2 | ||||
| -rw-r--r-- | plugin/kubernetes/setup_reverse_test.go | 2 | ||||
| -rw-r--r-- | plugin/kubernetes/setup_test.go | 2 | ||||
| -rw-r--r-- | plugin/kubernetes/setup_transfer_test.go | 2 | ||||
| -rw-r--r-- | plugin/kubernetes/setup_ttl_test.go | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/plugin/kubernetes/local.go b/plugin/kubernetes/local.go index fccbb2a8a..a754f2125 100644 --- a/plugin/kubernetes/local.go +++ b/plugin/kubernetes/local.go @@ -3,7 +3,7 @@ package kubernetes import ( "net" - "github.com/caddyserver/caddy" + "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" ) diff --git a/plugin/kubernetes/setup.go b/plugin/kubernetes/setup.go index 395bef333..a412f57f5 100644 --- a/plugin/kubernetes/setup.go +++ b/plugin/kubernetes/setup.go @@ -9,6 +9,7 @@ import ( "strings" "time" + "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" "github.com/coredns/coredns/plugin" "github.com/coredns/coredns/plugin/pkg/dnsutil" @@ -16,7 +17,6 @@ import ( "github.com/coredns/coredns/plugin/pkg/parse" "github.com/coredns/coredns/plugin/pkg/upstream" - "github.com/caddyserver/caddy" "github.com/miekg/dns" meta "k8s.io/apimachinery/pkg/apis/meta/v1" _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" // pull this in here, because we want it excluded if plugin.cfg doesn't have k8s diff --git a/plugin/kubernetes/setup_reverse_test.go b/plugin/kubernetes/setup_reverse_test.go index 50fefb062..e9b878319 100644 --- a/plugin/kubernetes/setup_reverse_test.go +++ b/plugin/kubernetes/setup_reverse_test.go @@ -3,7 +3,7 @@ package kubernetes import ( "testing" - "github.com/caddyserver/caddy" + "github.com/coredns/caddy" ) func TestKubernetesParseReverseZone(t *testing.T) { diff --git a/plugin/kubernetes/setup_test.go b/plugin/kubernetes/setup_test.go index 634401d9d..14781a862 100644 --- a/plugin/kubernetes/setup_test.go +++ b/plugin/kubernetes/setup_test.go @@ -4,9 +4,9 @@ import ( "strings" "testing" + "github.com/coredns/caddy" "github.com/coredns/coredns/plugin/pkg/fall" - "github.com/caddyserver/caddy" meta "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/plugin/kubernetes/setup_transfer_test.go b/plugin/kubernetes/setup_transfer_test.go index fce4e10c5..57d665821 100644 --- a/plugin/kubernetes/setup_transfer_test.go +++ b/plugin/kubernetes/setup_transfer_test.go @@ -3,7 +3,7 @@ package kubernetes import ( "testing" - "github.com/caddyserver/caddy" + "github.com/coredns/caddy" ) func TestKubernetesParseTransfer(t *testing.T) { diff --git a/plugin/kubernetes/setup_ttl_test.go b/plugin/kubernetes/setup_ttl_test.go index c4a001302..16b9b4a70 100644 --- a/plugin/kubernetes/setup_ttl_test.go +++ b/plugin/kubernetes/setup_ttl_test.go @@ -3,7 +3,7 @@ package kubernetes import ( "testing" - "github.com/caddyserver/caddy" + "github.com/coredns/caddy" ) func TestKubernetesParseTTL(t *testing.T) { |