Merge pull request #195 from dlorenc/k8s

Update k8s.

docs/minikube.md

@@ -10,15 +10,15 @@ Minikube is a CLI tool that provisions and manages single-node Kubernetes cluste
 ### Options
 
 ```
-      --alsologtostderr value          log to standard error as well as files
-      --log-flush-frequency duration   Maximum number of seconds between log flushes (default 5s)
-      --log_backtrace_at value         when logging hits line file:N, emit a stack trace (default :0)
-      --log_dir value                  If non-empty, write log files in this directory
-      --logtostderr value              log to standard error instead of files
-      --show-libmachine-logs           Whether or not to show logs from libmachine.
-      --stderrthreshold value          logs at or above this threshold go to stderr (default 2)
-  -v, --v value                        log level for V logs
-      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
+      --alsologtostderr[=false]: log to standard error as well as files
+      --log-flush-frequency=5s: Maximum number of seconds between log flushes
+      --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace
+      --log_dir="": If non-empty, write log files in this directory
+      --logtostderr[=false]: log to standard error instead of files
+      --show-libmachine-logs[=false]: Whether or not to show logs from libmachine.
+      --stderrthreshold=2: logs at or above this threshold go to stderr
+      --v=0: log level for V logs
+      --vmodule=: comma-separated list of pattern=N settings for file-filtered logging
 ```
 
 ### SEE ALSO

docs/minikube_dashboard.md

@@ -14,21 +14,21 @@ minikube dashboard
 ### Options
 
 ```
-      --url   Display the kubernetes dashboard in the CLI instead of opening it in the default browser
+      --url[=false]: Display the kubernetes dashboard in the CLI instead of opening it in the default browser
 ```
 
 ### Options inherited from parent commands
 
 ```
-      --alsologtostderr value          log to standard error as well as files
-      --log-flush-frequency duration   Maximum number of seconds between log flushes (default 5s)
-      --log_backtrace_at value         when logging hits line file:N, emit a stack trace (default :0)
-      --log_dir value                  If non-empty, write log files in this directory
-      --logtostderr value              log to standard error instead of files
-      --show-libmachine-logs           Whether or not to show logs from libmachine.
-      --stderrthreshold value          logs at or above this threshold go to stderr (default 2)
-  -v, --v value                        log level for V logs
-      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
+      --alsologtostderr[=false]: log to standard error as well as files
+      --log-flush-frequency=5s: Maximum number of seconds between log flushes
+      --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace
+      --log_dir="": If non-empty, write log files in this directory
+      --logtostderr[=false]: log to standard error instead of files
+      --show-libmachine-logs[=false]: Whether or not to show logs from libmachine.
+      --stderrthreshold=2: logs at or above this threshold go to stderr
+      --v=0: log level for V logs
+      --vmodule=: comma-separated list of pattern=N settings for file-filtered logging
 ```
 
 ### SEE ALSO

docs/minikube_delete.md

@@ -15,15 +15,15 @@ minikube delete
 ### Options inherited from parent commands
 
 ```
-      --alsologtostderr value          log to standard error as well as files
-      --log-flush-frequency duration   Maximum number of seconds between log flushes (default 5s)
-      --log_backtrace_at value         when logging hits line file:N, emit a stack trace (default :0)
-      --log_dir value                  If non-empty, write log files in this directory
-      --logtostderr value              log to standard error instead of files
-      --show-libmachine-logs           Whether or not to show logs from libmachine.
-      --stderrthreshold value          logs at or above this threshold go to stderr (default 2)
-  -v, --v value                        log level for V logs
-      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
+      --alsologtostderr[=false]: log to standard error as well as files
+      --log-flush-frequency=5s: Maximum number of seconds between log flushes
+      --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace
+      --log_dir="": If non-empty, write log files in this directory
+      --logtostderr[=false]: log to standard error instead of files
+      --show-libmachine-logs[=false]: Whether or not to show logs from libmachine.
+      --stderrthreshold=2: logs at or above this threshold go to stderr
+      --v=0: log level for V logs
+      --vmodule=: comma-separated list of pattern=N settings for file-filtered logging
 ```
 
 ### SEE ALSO

docs/minikube_docker-env.md

@@ -14,15 +14,15 @@ minikube docker-env
 ### Options inherited from parent commands
 
 ```
-      --alsologtostderr value          log to standard error as well as files
-      --log-flush-frequency duration   Maximum number of seconds between log flushes (default 5s)
-      --log_backtrace_at value         when logging hits line file:N, emit a stack trace (default :0)
-      --log_dir value                  If non-empty, write log files in this directory
-      --logtostderr value              log to standard error instead of files
-      --show-libmachine-logs           Whether or not to show logs from libmachine.
-      --stderrthreshold value          logs at or above this threshold go to stderr (default 2)
-  -v, --v value                        log level for V logs
-      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
+      --alsologtostderr[=false]: log to standard error as well as files
+      --log-flush-frequency=5s: Maximum number of seconds between log flushes
+      --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace
+      --log_dir="": If non-empty, write log files in this directory
+      --logtostderr[=false]: log to standard error instead of files
+      --show-libmachine-logs[=false]: Whether or not to show logs from libmachine.
+      --stderrthreshold=2: logs at or above this threshold go to stderr
+      --v=0: log level for V logs
+      --vmodule=: comma-separated list of pattern=N settings for file-filtered logging
 ```
 
 ### SEE ALSO

docs/minikube_ip.md

@@ -14,15 +14,15 @@ minikube ip
 ### Options inherited from parent commands
 
 ```
-      --alsologtostderr value          log to standard error as well as files
-      --log-flush-frequency duration   Maximum number of seconds between log flushes (default 5s)
-      --log_backtrace_at value         when logging hits line file:N, emit a stack trace (default :0)
-      --log_dir value                  If non-empty, write log files in this directory
-      --logtostderr value              log to standard error instead of files
-      --show-libmachine-logs           Whether or not to show logs from libmachine.
-      --stderrthreshold value          logs at or above this threshold go to stderr (default 2)
-  -v, --v value                        log level for V logs
-      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
+      --alsologtostderr[=false]: log to standard error as well as files
+      --log-flush-frequency=5s: Maximum number of seconds between log flushes
+      --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace
+      --log_dir="": If non-empty, write log files in this directory
+      --logtostderr[=false]: log to standard error instead of files
+      --show-libmachine-logs[=false]: Whether or not to show logs from libmachine.
+      --stderrthreshold=2: logs at or above this threshold go to stderr
+      --v=0: log level for V logs
+      --vmodule=: comma-separated list of pattern=N settings for file-filtered logging
 ```
 
 ### SEE ALSO

docs/minikube_logs.md

@@ -14,15 +14,15 @@ minikube logs
 ### Options inherited from parent commands
 
 ```
-      --alsologtostderr value          log to standard error as well as files
-      --log-flush-frequency duration   Maximum number of seconds between log flushes (default 5s)
-      --log_backtrace_at value         when logging hits line file:N, emit a stack trace (default :0)
-      --log_dir value                  If non-empty, write log files in this directory
-      --logtostderr value              log to standard error instead of files
-      --show-libmachine-logs           Whether or not to show logs from libmachine.
-      --stderrthreshold value          logs at or above this threshold go to stderr (default 2)
-  -v, --v value                        log level for V logs
-      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
+      --alsologtostderr[=false]: log to standard error as well as files
+      --log-flush-frequency=5s: Maximum number of seconds between log flushes
+      --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace
+      --log_dir="": If non-empty, write log files in this directory
+      --logtostderr[=false]: log to standard error instead of files
+      --show-libmachine-logs[=false]: Whether or not to show logs from libmachine.
+      --stderrthreshold=2: logs at or above this threshold go to stderr
+      --v=0: log level for V logs
+      --vmodule=: comma-separated list of pattern=N settings for file-filtered logging
 ```
 
 ### SEE ALSO

docs/minikube_ssh.md

@@ -14,15 +14,15 @@ minikube ssh
 ### Options inherited from parent commands
 
 ```
-      --alsologtostderr value          log to standard error as well as files
-      --log-flush-frequency duration   Maximum number of seconds between log flushes (default 5s)
-      --log_backtrace_at value         when logging hits line file:N, emit a stack trace (default :0)
-      --log_dir value                  If non-empty, write log files in this directory
-      --logtostderr value              log to standard error instead of files
-      --show-libmachine-logs           Whether or not to show logs from libmachine.
-      --stderrthreshold value          logs at or above this threshold go to stderr (default 2)
-  -v, --v value                        log level for V logs
-      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
+      --alsologtostderr[=false]: log to standard error as well as files
+      --log-flush-frequency=5s: Maximum number of seconds between log flushes
+      --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace
+      --log_dir="": If non-empty, write log files in this directory
+      --logtostderr[=false]: log to standard error instead of files
+      --show-libmachine-logs[=false]: Whether or not to show logs from libmachine.
+      --stderrthreshold=2: logs at or above this threshold go to stderr
+      --v=0: log level for V logs
+      --vmodule=: comma-separated list of pattern=N settings for file-filtered logging
 ```
 
 ### SEE ALSO

docs/minikube_start.md

@@ -15,21 +15,21 @@ minikube start
 ### Options
 
 ```
-      --iso-url string   Location of the minikube iso (default "https://storage.googleapis.com/minikube/minikube-0.3.iso")
+      --iso-url="https://storage.googleapis.com/minikube/minikube-0.3.iso": Location of the minikube iso
 ```
 
 ### Options inherited from parent commands
 
 ```
-      --alsologtostderr value          log to standard error as well as files
-      --log-flush-frequency duration   Maximum number of seconds between log flushes (default 5s)
-      --log_backtrace_at value         when logging hits line file:N, emit a stack trace (default :0)
-      --log_dir value                  If non-empty, write log files in this directory
-      --logtostderr value              log to standard error instead of files
-      --show-libmachine-logs           Whether or not to show logs from libmachine.
-      --stderrthreshold value          logs at or above this threshold go to stderr (default 2)
-  -v, --v value                        log level for V logs
-      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
+      --alsologtostderr[=false]: log to standard error as well as files
+      --log-flush-frequency=5s: Maximum number of seconds between log flushes
+      --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace
+      --log_dir="": If non-empty, write log files in this directory
+      --logtostderr[=false]: log to standard error instead of files
+      --show-libmachine-logs[=false]: Whether or not to show logs from libmachine.
+      --stderrthreshold=2: logs at or above this threshold go to stderr
+      --v=0: log level for V logs
+      --vmodule=: comma-separated list of pattern=N settings for file-filtered logging
 ```
 
 ### SEE ALSO

docs/minikube_status.md

@@ -14,15 +14,15 @@ minikube status
 ### Options inherited from parent commands
 
 ```
-      --alsologtostderr value          log to standard error as well as files
-      --log-flush-frequency duration   Maximum number of seconds between log flushes (default 5s)
-      --log_backtrace_at value         when logging hits line file:N, emit a stack trace (default :0)
-      --log_dir value                  If non-empty, write log files in this directory
-      --logtostderr value              log to standard error instead of files
-      --show-libmachine-logs           Whether or not to show logs from libmachine.
-      --stderrthreshold value          logs at or above this threshold go to stderr (default 2)
-  -v, --v value                        log level for V logs
-      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
+      --alsologtostderr[=false]: log to standard error as well as files
+      --log-flush-frequency=5s: Maximum number of seconds between log flushes
+      --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace
+      --log_dir="": If non-empty, write log files in this directory
+      --logtostderr[=false]: log to standard error instead of files
+      --show-libmachine-logs[=false]: Whether or not to show logs from libmachine.
+      --stderrthreshold=2: logs at or above this threshold go to stderr
+      --v=0: log level for V logs
+      --vmodule=: comma-separated list of pattern=N settings for file-filtered logging
 ```
 
 ### SEE ALSO

docs/minikube_stop.md

@@ -15,15 +15,15 @@ minikube stop
 ### Options inherited from parent commands
 
 ```
-      --alsologtostderr value          log to standard error as well as files
-      --log-flush-frequency duration   Maximum number of seconds between log flushes (default 5s)
-      --log_backtrace_at value         when logging hits line file:N, emit a stack trace (default :0)
-      --log_dir value                  If non-empty, write log files in this directory
-      --logtostderr value              log to standard error instead of files
-      --show-libmachine-logs           Whether or not to show logs from libmachine.
-      --stderrthreshold value          logs at or above this threshold go to stderr (default 2)
-  -v, --v value                        log level for V logs
-      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
+      --alsologtostderr[=false]: log to standard error as well as files
+      --log-flush-frequency=5s: Maximum number of seconds between log flushes
+      --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace
+      --log_dir="": If non-empty, write log files in this directory
+      --logtostderr[=false]: log to standard error instead of files
+      --show-libmachine-logs[=false]: Whether or not to show logs from libmachine.
+      --stderrthreshold=2: logs at or above this threshold go to stderr
+      --v=0: log level for V logs
+      --vmodule=: comma-separated list of pattern=N settings for file-filtered logging
 ```
 
 ### SEE ALSO

docs/minikube_version.md

@@ -14,15 +14,15 @@ minikube version
 ### Options inherited from parent commands
 
 ```
-      --alsologtostderr value          log to standard error as well as files
-      --log-flush-frequency duration   Maximum number of seconds between log flushes (default 5s)
-      --log_backtrace_at value         when logging hits line file:N, emit a stack trace (default :0)
-      --log_dir value                  If non-empty, write log files in this directory
-      --logtostderr value              log to standard error instead of files
-      --show-libmachine-logs           Whether or not to show logs from libmachine.
-      --stderrthreshold value          logs at or above this threshold go to stderr (default 2)
-  -v, --v value                        log level for V logs
-      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
+      --alsologtostderr[=false]: log to standard error as well as files
+      --log-flush-frequency=5s: Maximum number of seconds between log flushes
+      --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace
+      --log_dir="": If non-empty, write log files in this directory
+      --logtostderr[=false]: log to standard error instead of files
+      --show-libmachine-logs[=false]: Whether or not to show logs from libmachine.
+      --stderrthreshold=2: logs at or above this threshold go to stderr
+      --v=0: log level for V logs
+      --vmodule=: comma-separated list of pattern=N settings for file-filtered logging
 ```
 
 ### SEE ALSO

pkg/localkube/dns.go

@@ -24,14 +24,16 @@ import (
 
 	"k8s.io/minikube/pkg/localkube/kube2sky"
 
-	"github.com/coreos/go-etcd/etcd"
+	etcd "github.com/coreos/etcd/client"
 	"github.com/golang/glog"
 	backendetcd "github.com/skynetservices/skydns/backends/etcd"
+	"github.com/skynetservices/skydns/metrics"
 	skydns "github.com/skynetservices/skydns/server"
 	kube "k8s.io/kubernetes/pkg/api"
 	kubeclient "k8s.io/kubernetes/pkg/client/unversioned"
 	"k8s.io/kubernetes/pkg/util/intstr"
 
+	"golang.org/x/net/context"
 	"k8s.io/minikube/pkg/util"
 )
 
@@ -68,7 +70,16 @@ func (lk LocalkubeServer) NewDNSServer(rootDomain, clusterIP, kubeAPIServer stri
 	}
 
 	// setup skydns
-	etcdClient := etcd.NewClient(DNSEtcdURLs)
+	cfg := etcd.Config{
+		Endpoints: DNSEtcdURLs,
+		Transport: etcd.DefaultTransport,
+	}
+	etcdClient, err := etcd.New(cfg)
+	if err != nil {
+		return nil, err
+	}
+	keysApi := etcd.NewKeysAPI(etcdClient)
+
 	skyConfig := &skydns.Config{
 		DnsAddr: serverAddress,
 		Domain:  rootDomain,
@@ -81,14 +92,17 @@ func (lk LocalkubeServer) NewDNSServer(rootDomain, clusterIP, kubeAPIServer stri
 
 	skydns.SetDefaults(skyConfig)
 
-	backend := backendetcd.NewBackend(etcdClient, &backendetcd.Config{
-		Ttl:      skyConfig.Ttl,
-		Priority: skyConfig.Priority,
-	})
+	backend := backendetcd.NewBackend(
+		keysApi,
+		context.Background(),
+		&backendetcd.Config{
+			Ttl:      skyConfig.Ttl,
+			Priority: skyConfig.Priority,
+		})
 	skyServer := skydns.New(backend, skyConfig)
 
 	// setup so prometheus doesn't run into nil
-	skydns.Metrics()
+	metrics.Metrics()
 
 	// setup kube2sky
 	k2s := kube2sky.NewKube2Sky(rootDomain, DNSEtcdURLs[0], "", kubeAPIServer, 10*time.Second, 8081)