vendor: Add etcd-operator-vendor patch file.

Patch the vendor during the build.
This is a temporal fix for client-go vendoring conflicts.

Author: Yifan Gu

Makefile

@@ -8,12 +8,25 @@ GOPATH_BIN:=$(shell echo ${GOPATH} | awk 'BEGIN { FS = ":" }; { print $1 }')/bin
 LDFLAGS=-X github.com/kubernetes-incubator/bootkube/pkg/version.Version=$(shell $(CURDIR)/build/git-version.sh)
 
 all: \
+	patch \
 	_output/bin/linux/bootkube \
 	_output/bin/darwin/bootkube \
-	_output/bin/linux/checkpoint
+	_output/bin/linux/checkpoint \
+	unpatch
 
-release: clean check \
-	_output/release/bootkube.tar.gz
+patch:
+	@echo "Patching etcd-operator vendor, this is a temporal fix for client-go vendor conflicts"
+	@git apply etcd-operator-vendor.patch
+
+unpatch:
+	@git apply -R etcd-operator-vendor.patch
+
+release: \
+	clean \
+	patch \
+	check \
+	_output/release/bootkube.tar.gz \
+	unpatch
 
 check:
 	@find . -name vendor -prune -o -name '*.go' -exec gofmt -s -d {} +

etcd-operator-vendor.patch

@@ -0,0 +1,62 @@
+diff --git a/vendor/github.com/coreos/etcd-operator/pkg/spec/cluster.go b/vendor/github.com/coreos/etcd-operator/pkg/spec/cluster.go
+index dbafdff..cbe1fd2 100644
+--- a/vendor/github.com/coreos/etcd-operator/pkg/spec/cluster.go
++++ b/vendor/github.com/coreos/etcd-operator/pkg/spec/cluster.go
+@@ -21,8 +21,7 @@ import (
+ 	"strings"
+ 	"time"
+ 
+-	"k8s.io/client-go/pkg/api/meta/metatypes"
+-	"k8s.io/client-go/pkg/api/unversioned"
++	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ 	"k8s.io/client-go/pkg/api/v1"
+ )
+ 
+@@ -45,17 +44,17 @@ func TPRName() string {
+ }
+ 
+ type Cluster struct {
+-	unversioned.TypeMeta `json:",inline"`
+-	Metadata             v1.ObjectMeta `json:"metadata,omitempty"`
+-	Spec                 ClusterSpec   `json:"spec"`
+-	Status               ClusterStatus `json:"status"`
++	metav1.TypeMeta `json:",inline"`
++	Metadata        v1.ObjectMeta `json:"metadata,omitempty"`
++	Spec            ClusterSpec   `json:"spec"`
++	Status          ClusterStatus `json:"status"`
+ }
+ 
+-func (c *Cluster) AsOwner() metatypes.OwnerReference {
++func (c *Cluster) AsOwner() metav1.OwnerReference {
+ 	trueVar := true
+ 	// TODO: In 1.6 this is gonna be "k8s.io/kubernetes/pkg/apis/meta/v1"
+-	// Both api.OwnerReference and metatypes.OwnerReference are combined into that.
+-	return metatypes.OwnerReference{
++	// Both api.OwnerReference and metav1.OwnerReference are combined into that.
++	return metav1.OwnerReference{
+ 		APIVersion: c.APIVersion,
+ 		Kind:       c.Kind,
+ 		Name:       c.Metadata.Name,
+diff --git a/vendor/github.com/coreos/etcd-operator/pkg/spec/etcd_cluster_list.go b/vendor/github.com/coreos/etcd-operator/pkg/spec/etcd_cluster_list.go
+index 4d8bfd7..c4996bc 100644
+--- a/vendor/github.com/coreos/etcd-operator/pkg/spec/etcd_cluster_list.go
++++ b/vendor/github.com/coreos/etcd-operator/pkg/spec/etcd_cluster_list.go
+@@ -17,15 +17,15 @@ package spec
+ import (
+ 	"encoding/json"
+ 
+-	"k8s.io/client-go/pkg/api/unversioned"
++	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ )
+ 
+ // ClusterList is a list of etcd clusters.
+ type ClusterList struct {
+-	unversioned.TypeMeta `json:",inline"`
++	metav1.TypeMeta `json:",inline"`
+ 	// Standard list metadata
+ 	// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
+-	Metadata unversioned.ListMeta `json:"metadata,omitempty"`
++	Metadata metav1.ListMeta `json:"metadata,omitempty"`
+ 	// Items is a list of third party objects
+ 	Items []Cluster `json:"items"`
+ }