add vendor

kubernetes · Oct 13, 2017 · e5002af · e5002af
1 parent c28c583
commit e5002af
Show file tree

Hide file tree

Showing 5,597 changed files with 651,846 additions and 849,807 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/hack/kube-proxy-patch.diff b/hack/kube-proxy-patch.diff
@@ -1,13 +1,13 @@
-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 8d1ae7774..8745a176f 100644
---- a/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server.go
-+++ b/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server.go
-@@ -422,7 +422,7 @@ func NewProxyServer(config *componentconfig.KubeProxyConfiguration, cleanupAndEx
+diff --git a/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server_others.go b/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server_others.go
+index b0f0eace5..02b631fb6 100644
+--- a/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server_others.go
++++ b/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server_others.go
+@@ -60,7 +60,7 @@ func NewProxyServer(config *componentconfig.KubeProxyConfiguration, cleanupAndEx
  	if c, err := configz.New("componentconfig"); err == nil {
  		c.Set(config)
  	} else {
 -		return nil, fmt.Errorf("unable to register configz: %s", err)
-+		glog.Errorf("unable to register configz: %s", err)
++		glog.Warningf("unable to register configz: %s", err)
  	}
 
  	protocol := utiliptables.ProtocolIpv4
diff --git a/pkg/localkube/storage_provisioner.go b/pkg/localkube/storage_provisioner.go
@@ -26,12 +26,12 @@ import (
 	"github.com/pkg/errors"
 	"github.com/r2d4/external-storage/lib/controller"
 	"github.com/r2d4/external-storage/lib/leaderelection"
+	"k8s.io/api/core/v1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/uuid"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/kubernetes"
-	"k8s.io/client-go/pkg/api/v1"
 	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/minikube/pkg/util"
 )

diff --git a/pkg/minikube/bootstrapper/kubeadm/util.go b/pkg/minikube/bootstrapper/kubeadm/util.go
@@ -22,14 +22,14 @@ import (
 	"html/template"
 
 	"github.com/pkg/errors"
+	clientv1 "k8s.io/api/core/v1"
+	rbacv1beta1 "k8s.io/api/rbac/v1beta1"
 	apierrs "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/apis/meta/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/strategicpatch"
-	clientv1 "k8s.io/client-go/pkg/api/v1"
-	rbacv1beta1 "k8s.io/client-go/pkg/apis/rbac/v1beta1"
 	"k8s.io/minikube/pkg/minikube/bootstrapper"
 	"k8s.io/minikube/pkg/minikube/service"
 	"k8s.io/minikube/pkg/util"

diff --git a/pkg/minikube/service/service.go b/pkg/minikube/service/service.go
@@ -27,10 +27,10 @@ import (
 	"github.com/docker/machine/libmachine"
 	"github.com/pkg/browser"
 	"github.com/pkg/errors"
+	"k8s.io/api/core/v1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 	corev1 "k8s.io/client-go/kubernetes/typed/core/v1"
-	"k8s.io/client-go/pkg/api/v1"
 	"k8s.io/client-go/tools/clientcmd"
 
 	"text/template"

diff --git a/pkg/minikube/service/service_test.go b/pkg/minikube/service/service_test.go
@@ -25,11 +25,11 @@ import (
 	"github.com/docker/machine/libmachine"
 	"github.com/docker/machine/libmachine/host"
 	"github.com/pkg/errors"
+	"k8s.io/api/core/v1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 	corev1 "k8s.io/client-go/kubernetes/typed/core/v1"
 	"k8s.io/client-go/kubernetes/typed/core/v1/fake"
-	"k8s.io/client-go/pkg/api/v1"
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/tests"
 )

diff --git a/pkg/util/kubernetes.go b/pkg/util/kubernetes.go
@@ -31,9 +31,9 @@ import (
 	"k8s.io/apimachinery/pkg/watch"
 	"k8s.io/kubernetes/cmd/kubeadm/app/constants"
 
+	"k8s.io/api/core/v1"
 	apierrs "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/client-go/kubernetes"
-	"k8s.io/client-go/pkg/api/v1"
 
 	"github.com/golang/glog"
 	"k8s.io/client-go/tools/cache"

diff --git a/vendor/github.com/Azure/go-ansiterm/README.md b/vendor/github.com/Azure/go-ansiterm/README.md
diff --git a/vendor/github.com/Azure/go-ansiterm/constants.go b/vendor/github.com/Azure/go-ansiterm/constants.go
diff --git a/vendor/github.com/Azure/go-ansiterm/context.go b/vendor/github.com/Azure/go-ansiterm/context.go
diff --git a/vendor/github.com/Azure/go-ansiterm/csi_entry_state.go b/vendor/github.com/Azure/go-ansiterm/csi_entry_state.go
diff --git a/vendor/github.com/Azure/go-ansiterm/csi_param_state.go b/vendor/github.com/Azure/go-ansiterm/csi_param_state.go
diff --git a/vendor/github.com/Azure/go-ansiterm/escape_intermediate_state.go b/vendor/github.com/Azure/go-ansiterm/escape_intermediate_state.go
diff --git a/vendor/github.com/Azure/go-ansiterm/escape_state.go b/vendor/github.com/Azure/go-ansiterm/escape_state.go