Skip to content

Commit

Permalink
Update caddy import to use the one from coredns
Browse files Browse the repository at this point in the history
When caddy moved to v2, coredns chose to stay with v1 by moving it
in-tree. Plugins need to update their imports to reflect this.

Note that this will fail the build-coredns ci job until the
openshift/coredns repo has been updated to the new version. I have
tested it locally with a newer version and it works.
  • Loading branch information
cybertron committed Feb 22, 2021
1 parent 40ceeed commit 2cb0b98
Show file tree
Hide file tree
Showing 932 changed files with 100,473 additions and 120,027 deletions.
49 changes: 45 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,13 +1,54 @@
module github.com/openshift/coredns-mdns

require (
github.com/caddyserver/caddy v1.0.4
cloud.google.com/go v0.78.0 // indirect
github.com/Azure/azure-sdk-for-go v51.3.0+incompatible // indirect
github.com/Azure/go-autorest/autorest v0.11.18 // indirect
github.com/Azure/go-autorest/autorest/azure/auth v0.5.7 // indirect
github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect
github.com/DataDog/datadog-go v4.4.0+incompatible // indirect
github.com/Microsoft/go-winio v0.4.16 // indirect
github.com/Shopify/sarama v1.21.0 // indirect
github.com/aws/aws-sdk-go v1.37.16 // indirect
github.com/caddyserver/caddy v1.0.4 // indirect
github.com/celebdor/zeroconf v0.0.0-20190404095836-c328d57fca11
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
github.com/coredns/coredns v1.6.6
github.com/miekg/dns v1.1.25
github.com/coredns/caddy v1.1.0
github.com/coredns/coredns v1.8.1
github.com/coredns/federation v0.0.0-20190818181423-e032b096babe // indirect
github.com/coreos/etcd v3.3.25+incompatible // indirect
github.com/coreos/go-semver v0.3.0 // indirect
github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect
github.com/coreos/go-systemd/v22 v22.1.0 // indirect
github.com/dnstap/golang-dnstap v0.4.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.2.0 // indirect
github.com/googleapis/gnostic v0.5.4 // indirect
github.com/gophercloud/gophercloud v0.15.0 // indirect
github.com/imdario/mergo v0.3.11 // indirect
github.com/infobloxopen/go-trees v0.0.0-20200715205103-96a057b8dfb9 // indirect
github.com/miekg/dns v1.1.38
github.com/openshift/mdns-publisher v0.0.0-20200219161514-0e41fab1ddec
golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553
github.com/openzipkin/zipkin-go v0.2.5 // indirect
github.com/prometheus/common v0.17.0 // indirect
github.com/prometheus/procfs v0.6.0 // indirect
github.com/tinylib/msgp v1.1.5 // indirect
go.etcd.io/etcd v3.3.25+incompatible // indirect
go.opencensus.io v0.22.6 // indirect
go.uber.org/multierr v1.6.0 // indirect
go.uber.org/zap v1.16.0 // indirect
golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 // indirect
golang.org/x/net v0.0.0-20210222171744-9060382bd457
golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93 // indirect
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/api v0.20.4 // indirect
k8s.io/client-go v11.0.0+incompatible // indirect
k8s.io/klog/v2 v2.5.0 // indirect
k8s.io/utils v0.0.0-20210111153108-fddb29f9d009 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.0.3 // indirect
)

go 1.13
724 changes: 724 additions & 0 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"github.com/coredns/coredns/core/dnsserver"
"github.com/coredns/coredns/plugin"

"github.com/caddyserver/caddy"
"github.com/celebdor/zeroconf"
"github.com/coredns/caddy"
)

func init() {
Expand Down
88 changes: 0 additions & 88 deletions vendor/github.com/caddyserver/caddy/azure-pipelines.yml

This file was deleted.

24 changes: 0 additions & 24 deletions vendor/github.com/caddyserver/caddy/go.mod

This file was deleted.

Loading

0 comments on commit 2cb0b98

Please sign in to comment.