Merge pull request #551 from dpasiukevich/upgrade_skydns

Imported and upgraded skydns dependency (plus upgraded coredns to the latest 1.10.0)

cmd/kube-dns/app/server.go

@@ -19,22 +19,21 @@ package app
 import (
 	"fmt"
 	"net/http"
+	_ "net/http/pprof"
 	"os"
 	"os/signal"
 	"runtime"
 	"strings"
 	"syscall"
 
-	"github.com/skynetservices/skydns/metrics"
-	"github.com/skynetservices/skydns/server"
 	"github.com/spf13/pflag"
+	"k8s.io/dns/third_party/forked/skydns/metrics"
+	"k8s.io/dns/third_party/forked/skydns/server"
 
 	"k8s.io/dns/cmd/kube-dns/app/options"
 	"k8s.io/dns/pkg/dns"
 	dnsconfig "k8s.io/dns/pkg/dns/config"
 
-	_ "net/http/pprof"
-
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"

cmd/kube-dns/dns.go

@@ -35,6 +35,8 @@ func main() {
 	config := options.NewKubeDNSConfig()
 	config.AddFlags(pflag.CommandLine)
 
+	pflag.CommandLine.SetNormalizeFunc(flag.WordSepNormalizeFunc)
+	logs.AddFlags(pflag.CommandLine)
 	flag.InitFlags()
 	// Convinces goflags that we have called Parse() to avoid noisy logs.
 	// OSS Issue: kubernetes/kubernetes#17162.

cmd/node-cache/main.go

@@ -27,8 +27,7 @@ import (
 	clog "github.com/coredns/coredns/plugin/pkg/log"
 	utilnet "k8s.io/utils/net"
 
-	// This should match the caddy dep used by github.com/vendor/coredns/coredns/coremain/run.go.
-	"github.com/caddyserver/caddy"
+	"github.com/coredns/caddy"
 	// blank imports to make sure the plugin code is pulled in from vendor when building node-cache image
 	_ "github.com/coredns/coredns/plugin/bind"
 	_ "github.com/coredns/coredns/plugin/bufsize"

cmd/sidecar/main.go

@@ -41,6 +41,10 @@ const (
 func main() {
 	options := sidecar.NewOptions()
 	configureFlags(options, pflag.CommandLine)
+
+	pflag.CommandLine.SetNormalizeFunc(flag.WordSepNormalizeFunc)
+	logs.AddFlags(pflag.CommandLine)
+
 	flag.InitFlags()
 	// Convinces goflags that we have called Parse() to avoid noisy logs.
 	// OSS Issue: kubernetes/kubernetes#17162.

go.mod

@@ -3,128 +3,140 @@ module k8s.io/dns
 go 1.18
 
 require (
-	github.com/caddyserver/caddy v1.0.5
-	github.com/coredns/coredns v1.7.0
-	github.com/coreos/etcd v3.3.25+incompatible
-	github.com/miekg/dns v1.1.42
-	github.com/onsi/ginkgo v1.16.4
-	github.com/onsi/gomega v1.13.0
-	github.com/prometheus/client_golang v1.11.0
-	github.com/skynetservices/skydns v0.0.0-20191015171621-94b2ea0d8bfa
+	github.com/coredns/caddy v1.1.1
+	github.com/coredns/coredns v1.10.0
+	github.com/coreos/etcd v3.3.13+incompatible
+	github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf
+	github.com/miekg/dns v1.1.50
+	github.com/onsi/ginkgo v1.16.5
+	github.com/onsi/gomega v1.19.0
+	github.com/prometheus/client_golang v1.13.0
 	github.com/spf13/pflag v1.0.5
-	github.com/stretchr/testify v1.7.0
+	github.com/stretchr/testify v1.8.0
 	github.com/vishvananda/netlink v1.1.0
-	k8s.io/api v0.21.6
-	k8s.io/apimachinery v0.21.6
-	k8s.io/client-go v0.21.6
-	k8s.io/component-base v0.21.6
-	k8s.io/klog/v2 v2.9.0
-	k8s.io/kubernetes v1.21.6
-	k8s.io/utils v0.0.0-20210527160623-6fdb442a123b
+	go.etcd.io/etcd/api/v3 v3.5.5
+	go.etcd.io/etcd/client/v2 v2.305.5
+	go.etcd.io/etcd/client/v3 v3.5.4
+	golang.org/x/net v0.1.0
+	k8s.io/api v0.25.0
+	k8s.io/apimachinery v0.25.0
+	k8s.io/client-go v0.24.7
+	k8s.io/component-base v0.24.7
+	k8s.io/klog/v2 v2.80.1
+	k8s.io/kubernetes v1.24.7
+	k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed
 )
 
 require (
-	github.com/DataDog/datadog-go v3.5.0+incompatible // indirect
-	github.com/DataDog/zstd v1.3.5 // indirect
-	github.com/Shopify/sarama v1.21.0 // indirect
-	github.com/apache/thrift v0.13.0 // indirect
+	github.com/DataDog/datadog-agent/pkg/obfuscate v0.0.0-20211129110424-6491aa3bf583 // indirect
+	github.com/DataDog/datadog-go v4.8.2+incompatible // indirect
+	github.com/DataDog/datadog-go/v5 v5.0.2 // indirect
+	github.com/DataDog/sketches-go v1.2.1 // indirect
+	github.com/Microsoft/go-winio v0.5.1 // indirect
+	github.com/PuerkitoBio/purell v1.1.1 // indirect
+	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
+	github.com/apparentlymart/go-cidr v1.1.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/blang/semver v3.5.1+incompatible // indirect
-	github.com/cenkalti/backoff/v4 v4.0.2 // indirect
-	github.com/cespare/xxhash/v2 v2.1.1 // indirect
+	github.com/blang/semver/v4 v4.0.0 // indirect
+	github.com/cespare/xxhash/v2 v2.1.2 // indirect
 	github.com/coreos/go-semver v0.3.0 // indirect
-	github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e // indirect
+	github.com/coreos/go-systemd/v22 v22.3.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/dnstap/golang-dnstap v0.2.0 // indirect
-	github.com/eapache/go-resiliency v1.1.0 // indirect
-	github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect
-	github.com/eapache/queue v1.1.0 // indirect
-	github.com/evanphx/json-patch v4.9.0+incompatible // indirect
-	github.com/farsightsec/golang-framestream v0.0.0-20190425193708-fa4b164d59b8 // indirect
+	github.com/dgraph-io/ristretto v0.1.0 // indirect
+	github.com/dnstap/golang-dnstap v0.4.0 // indirect
+	github.com/dustin/go-humanize v1.0.0 // indirect
+	github.com/emicklei/go-restful/v3 v3.8.0 // indirect
+	github.com/evanphx/json-patch v4.12.0+incompatible // indirect
+	github.com/farsightsec/golang-framestream v0.3.0 // indirect
 	github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 // indirect
 	github.com/fsnotify/fsnotify v1.4.9 // indirect
-	github.com/go-logfmt/logfmt v0.5.0 // indirect
-	github.com/go-logr/logr v0.4.0 // indirect
+	github.com/go-logr/logr v1.2.3 // indirect
+	github.com/go-openapi/jsonpointer v0.19.5 // indirect
+	github.com/go-openapi/jsonreference v0.19.5 // indirect
+	github.com/go-openapi/swag v0.19.14 // indirect
 	github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/glog v1.0.0 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db // indirect
-	github.com/google/go-cmp v0.5.5 // indirect
-	github.com/google/gofuzz v1.1.0 // indirect
-	github.com/google/uuid v1.1.2 // indirect
-	github.com/googleapis/gnostic v0.4.1 // indirect
+	github.com/google/gnostic v0.5.7-v3refs // indirect
+	github.com/google/go-cmp v0.5.8 // indirect
+	github.com/google/gofuzz v1.2.0 // indirect
+	github.com/google/uuid v1.3.0 // indirect
 	github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 // indirect
-	github.com/hashicorp/golang-lru v0.5.4 // indirect
-	github.com/imdario/mergo v0.3.9 // indirect
-	github.com/json-iterator/go v1.1.11 // indirect
+	github.com/imdario/mergo v0.3.12 // indirect
+	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.1 // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/nxadm/tail v1.4.8 // indirect
 	github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492 // indirect
-	github.com/opentracing/opentracing-go v1.1.0 // indirect
-	github.com/openzipkin-contrib/zipkin-go-opentracing v0.3.5 // indirect
-	github.com/philhofer/fwd v1.0.0 // indirect
-	github.com/pierrec/lz4 v2.0.5+incompatible // indirect
+	github.com/opentracing/opentracing-go v1.2.0 // indirect
+	github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5 // indirect
+	github.com/openzipkin/zipkin-go v0.4.0 // indirect
+	github.com/philhofer/fwd v1.1.1 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/prometheus/client_model v0.2.0 // indirect
-	github.com/prometheus/common v0.26.0 // indirect
-	github.com/prometheus/procfs v0.6.0 // indirect
-	github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a // indirect
+	github.com/prometheus/common v0.37.0 // indirect
+	github.com/prometheus/procfs v0.8.0 // indirect
+	github.com/spf13/cobra v1.4.0 // indirect
 	github.com/tinylib/msgp v1.1.2 // indirect
 	github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae // indirect
-	go.uber.org/atomic v1.6.0 // indirect
-	go.uber.org/multierr v1.5.0 // indirect
-	go.uber.org/zap v1.14.1 // indirect
-	golang.org/x/net v0.0.0-20210428140749-89ef3d95e781 // indirect
-	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
-	golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40 // indirect
-	golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
-	golang.org/x/text v0.3.6 // indirect
-	golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
-	golang.org/x/tools v0.1.0 // indirect
-	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
-	google.golang.org/appengine v1.6.5 // indirect
-	google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a // indirect
-	google.golang.org/grpc v1.29.1 // indirect
-	google.golang.org/protobuf v1.26.0 // indirect
-	gopkg.in/DataDog/dd-trace-go.v1 v1.24.1 // indirect
+	go.etcd.io/etcd/client/pkg/v3 v3.5.5 // indirect
+	go.uber.org/atomic v1.9.0 // indirect
+	go.uber.org/multierr v1.6.0 // indirect
+	go.uber.org/zap v1.19.0 // indirect
+	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
+	golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094 // indirect
+	golang.org/x/sys v0.1.0 // indirect
+	golang.org/x/term v0.1.0 // indirect
+	golang.org/x/text v0.4.0 // indirect
+	golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
+	golang.org/x/tools v0.1.12 // indirect
+	golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
+	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/genproto v0.0.0-20220624142145-8cd45d7dbd1f // indirect
+	google.golang.org/grpc v1.49.0 // indirect
+	google.golang.org/protobuf v1.28.1 // indirect
+	gopkg.in/DataDog/dd-trace-go.v1 v1.41.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
-	k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
+	sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 	sigs.k8s.io/yaml v1.2.0 // indirect
 )
 
 replace (
-	// Needed to pin old version for skydns.
-	github.com/coreos/go-systemd => github.com/coreos/go-systemd v0.0.0-20180409111510-d1b7d058aa2a
-
-	k8s.io/api => k8s.io/api v0.21.6
-	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.21.6
-	k8s.io/apimachinery => k8s.io/apimachinery v0.21.6
-	k8s.io/apiserver => k8s.io/apiserver v0.21.6
-	k8s.io/cli-runtime => k8s.io/cli-runtime v0.21.6
-	k8s.io/client-go => k8s.io/client-go v0.21.6
-	k8s.io/cloud-provider => k8s.io/cloud-provider v0.21.6
-	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.21.6
-	k8s.io/code-generator => k8s.io/code-generator v0.21.6
-	k8s.io/component-base => k8s.io/component-base v0.21.6
-	k8s.io/component-helpers => k8s.io/component-helpers v0.21.6
-	k8s.io/controller-manager => k8s.io/controller-manager v0.21.6
-	k8s.io/cri-api => k8s.io/cri-api v0.21.6
-	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.21.6
-	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.21.6
-	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.21.6
-	k8s.io/kube-proxy => k8s.io/kube-proxy v0.21.6
-	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.21.6
-	k8s.io/kubectl => k8s.io/kubectl v0.21.6
-	k8s.io/kubelet => k8s.io/kubelet v0.21.6
-	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.21.6
-	k8s.io/metrics => k8s.io/metrics v0.21.6
-	k8s.io/mount-utils => k8s.io/mount-utils v0.21.6
-	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.21.6
+	k8s.io/api => k8s.io/api v0.24.7
+	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.24.7
+	k8s.io/apimachinery => k8s.io/apimachinery v0.24.7
+	k8s.io/apiserver => k8s.io/apiserver v0.24.7
+	k8s.io/cli-runtime => k8s.io/cli-runtime v0.24.7
+	k8s.io/client-go => k8s.io/client-go v0.24.7
+	k8s.io/cloud-provider => k8s.io/cloud-provider v0.24.7
+	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.24.7
+	k8s.io/code-generator => k8s.io/code-generator v0.24.7
+	k8s.io/component-base => k8s.io/component-base v0.24.7
+	k8s.io/component-helpers => k8s.io/component-helpers v0.24.7
+	k8s.io/controller-manager => k8s.io/controller-manager v0.24.7
+	k8s.io/cri-api => k8s.io/cri-api v0.24.7
+	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.24.7
+	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.24.7
+	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.24.7
+	k8s.io/kube-proxy => k8s.io/kube-proxy v0.24.7
+	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.24.7
+	k8s.io/kubectl => k8s.io/kubectl v0.24.7
+	k8s.io/kubelet => k8s.io/kubelet v0.24.7
+	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.24.7
+	k8s.io/metrics => k8s.io/metrics v0.24.7
+	k8s.io/mount-utils => k8s.io/mount-utils v0.24.7
+	k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.24.7
+	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.24.7
 )