Merge pull request #28374 from mml/kubedns-flags

Automatic merge from submit-queue

Add version and flag logging to kube-dns.

Helps with #28358

Stopgap until we have a general solution for #27744
This commit is contained in:
k8s-merge-robot 2016-07-01 12:28:39 -07:00 committed by GitHub
commit 0881419e48

View File

@ -26,12 +26,15 @@ import (
"github.com/golang/glog" "github.com/golang/glog"
"github.com/skynetservices/skydns/metrics" "github.com/skynetservices/skydns/metrics"
"github.com/skynetservices/skydns/server" "github.com/skynetservices/skydns/server"
"github.com/spf13/pflag"
"k8s.io/kubernetes/cmd/kube-dns/app/options" "k8s.io/kubernetes/cmd/kube-dns/app/options"
"k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/unversioned"
clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
"k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/restclient"
kclientcmd "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" kclientcmd "k8s.io/kubernetes/pkg/client/unversioned/clientcmd"
kdns "k8s.io/kubernetes/pkg/dns" kdns "k8s.io/kubernetes/pkg/dns"
"k8s.io/kubernetes/pkg/version"
) )
type KubeDNSServer struct { type KubeDNSServer struct {
@ -94,6 +97,10 @@ func newKubeClient(dnsConfig *options.KubeDNSConfig) (clientset.Interface, error
} }
func (server *KubeDNSServer) Run() { func (server *KubeDNSServer) Run() {
glog.Infof("%+v", version.Get())
pflag.VisitAll(func(flag *pflag.Flag) {
glog.Infof("FLAG: --%s=%q", flag.Name, flag.Value)
})
setupSignalHandlers() setupSignalHandlers()
server.startSkyDNSServer() server.startSkyDNSServer()
server.kd.Start() server.kd.Start()