Fix the godep-save script.

Godeps/Godeps.json

@@ -2363,18 +2363,18 @@
 		},
 		{
 			"ImportPath": "github.com/r2d4/external-storage/lib/controller",
-			"Comment": "v1.0.0-23-g4ebf52e",
-			"Rev": "4ebf52ebe22099f73d229bf1ddd855d9113981f6"
+			"Comment": "v1.0.0-26-g8c0e860",
+			"Rev": "8c0e8605dc7b85893e144efd8e76d4a473f4bc7d"
 		},
 		{
 			"ImportPath": "github.com/r2d4/external-storage/lib/leaderelection",
-			"Comment": "v1.0.0-23-g4ebf52e",
-			"Rev": "4ebf52ebe22099f73d229bf1ddd855d9113981f6"
+			"Comment": "v1.0.0-26-g8c0e860",
+			"Rev": "8c0e8605dc7b85893e144efd8e76d4a473f4bc7d"
 		},
 		{
 			"ImportPath": "github.com/r2d4/external-storage/lib/leaderelection/resourcelock",
-			"Comment": "v1.0.0-23-g4ebf52e",
-			"Rev": "4ebf52ebe22099f73d229bf1ddd855d9113981f6"
+			"Comment": "v1.0.0-26-g8c0e860",
+			"Rev": "8c0e8605dc7b85893e144efd8e76d4a473f4bc7d"
 		},
 		{
 			"ImportPath": "github.com/rancher/go-rancher/client",

hack/godeps/godep-save.sh

@@ -27,6 +27,12 @@ godep::ensure_godep_version v79
 godep::sync_staging
 
 rm -rf ${MINIKUBE_ROOT}/vendor ${MINIKUBE_ROOT}/Godeps
+
+# We use a different version of viper than Kubernetes.
+pushd ${GOPATH}/src/github.com/spf13/viper >/dev/null
+    git checkout 25b30aa063fc18e48662b86996252eabdcf2f0c7
+popd >/dev/null
+
 godep save ./...
 
 cp -r ${KUBE_ROOT}/pkg/generated/openapi ${MINIKUBE_ROOT}/vendor/k8s.io/kubernetes/pkg/generated/

hack/kube-proxy-patch.diff

@@ -1,7 +1,7 @@
-diff --git a/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server.go b/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server.go
-index 2f9ea2eac..35a7c14e5 100644
---- a/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server.go
-+++ b/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server.go
+diff --git b/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server.go a/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server.go
+index 2f9ea2ea..35a7c14e 100644
+--- b/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server.go
++++ a/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server.go
 @@ -318,6 +318,10 @@ func (o *Options) ApplyDefaults(in *kubeproxyconfig.KubeProxyConfiguration) (*ku
  	return out, nil
  }
@@ -13,10 +13,23 @@ index 2f9ea2eac..35a7c14e5 100644
  // NewProxyCommand creates a *cobra.Command object with default parameters
  func NewProxyCommand() *cobra.Command {
  	opts := NewOptions()
-diff --git a/vendor/k8s.io/kubernetes/plugin/cmd/kube-scheduler/app/server.go b/vendor/k8s.io/kubernetes/plugin/cmd/kube-scheduler/app/server.go
-index 93982f898..a116da41f 100644
---- a/vendor/k8s.io/kubernetes/plugin/cmd/kube-scheduler/app/server.go
-+++ b/vendor/k8s.io/kubernetes/plugin/cmd/kube-scheduler/app/server.go
+diff --git b/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server_others.go a/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server_others.go
+index 380e83e2..51bb09fd 100644
+--- b/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server_others.go
++++ a/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server_others.go
+@@ -72,7 +72,7 @@ func newProxyServer(
+ 	if c, err := configz.New(proxyconfigapi.GroupName); err == nil {
+ 		c.Set(config)
+ 	} else {
+-		return nil, fmt.Errorf("unable to register configz: %s", err)
++		glog.Warningf("unable to register configz: %s", err)
+ 	}
+ 
+ 	protocol := utiliptables.ProtocolIpv4
+diff --git b/vendor/k8s.io/kubernetes/plugin/cmd/kube-scheduler/app/server.go a/vendor/k8s.io/kubernetes/plugin/cmd/kube-scheduler/app/server.go
+index 93982f89..a116da41 100644
+--- b/vendor/k8s.io/kubernetes/plugin/cmd/kube-scheduler/app/server.go
++++ a/vendor/k8s.io/kubernetes/plugin/cmd/kube-scheduler/app/server.go
 @@ -380,7 +380,7 @@ func NewSchedulerServer(config *componentconfig.KubeSchedulerConfiguration, mast
  	if c, err := configz.New("componentconfig"); err == nil {
  		c.Set(config)