Migrate from glide to golang/dep and also bump vendor

Gopkg.toml

@@ -0,0 +1,82 @@
+
+required = [
+  # Needed for build
+  "k8s.io/kubernetes/hack/cmd/teststale",
+
+  # Needed for server testing
+  "github.com/onsi/ginkgo/ginkgo",
+
+  # Needed for apimachinery generation
+  "k8s.io/code-generator/cmd/client-gen",
+  "k8s.io/code-generator/cmd/conversion-gen",
+  "k8s.io/code-generator/cmd/deepcopy-gen",
+  "k8s.io/code-generator/cmd/defaulter-gen",
+  "k8s.io/code-generator/cmd/openapi-gen",
+]
+
+[prune]
+  go-tests = true
+  unused-packages = true
+
+# Note that the older version specified in k8s.io/kubernetes Godeps breaks go dep
+[[override]]
+  name = "github.com/chai2010/gettext-go"
+  revision = "bf70f2a70fb1b1f36d90d671a72795984eab0fcb"
+
+# These come from godeps.json in kubernetes
+[[override]]
+  name = "github.com/Azure/go-autorest"
+  revision = "e14a70c556c8e0db173358d1a903dca345a8e75e"
+
+[[override]]
+  name = "github.com/jmespath/go-jmespath"
+  revision = "0b12d6b521d83fc7f755e7cfc1b1fbdd35a01a74"
+
+[[override]]
+  name = "github.com/onsi/gomega"
+  revision = "d59fa0ac68bb5dd932ee8d24eed631cdd519efc3"
+
+# Needed for apimachinery generation
+[[override]]
+  name = "k8s.io/code-generator"
+  version = "kubernetes-1.10.0-alpha.3"
+
+[[override]]
+  name = "k8s.io/gengo"
+  revision = "b6c426f7730e6d66e6e476a85d1c3eb7633880e0"
+
+[[constraint]]
+  name = "k8s.io/kubernetes"
+  version = "1.10.0-alpha.3"
+
+[[constraint]]
+  name = "k8s.io/api"
+  version = "kubernetes-1.10.0-alpha.3"
+
+[[constraint]]
+  name = "k8s.io/apimachinery"
+  version = "kubernetes-1.10.0-alpha.3"
+
+[[constraint]]
+  name = "k8s.io/apiserver"
+  version = "kubernetes-1.10.0-alpha.3"
+
+[[constraint]]
+  name = "k8s.io/client-go"
+  version = "kubernetes-1.10.0-alpha.3"
+
+[[constraint]]
+  name = "github.com/aws/aws-sdk-go"
+  version = "1.12.7"
+
+[[constraint]]
+  name = "github.com/coredns/coredns"
+  version = "v1.0.5"
+
+[[constraint]]
+  name = "github.com/coreos/etcd"
+  version = "3.2.13"
+
+[[constraint]]
+  name = "gopkg.in/gcfg.v1"
+  version = "1.2.0"

apis/core/BUILD

@@ -16,7 +16,7 @@ go_library(
         "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library",
-        "//vendor/k8s.io/kubernetes/pkg/api:go_default_library",
+        "//vendor/k8s.io/kubernetes/pkg/apis/core:go_default_library",
     ],
 )
 

apis/core/register.go

@@ -25,7 +25,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/runtime/serializer"
-	"k8s.io/kubernetes/pkg/api"
+	api "k8s.io/kubernetes/pkg/apis/core"
 )
 
 // NOTE: the registry, scheme and codecs are created here to allow to install a federation core group

apis/core/v1/BUILD

@@ -20,7 +20,7 @@ go_library(
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
-        "//vendor/k8s.io/kubernetes/pkg/api/v1:go_default_library",
+        "//vendor/k8s.io/kubernetes/pkg/apis/core/v1:go_default_library",
     ],
 )
 

apis/core/v1/conversion.go

@@ -18,40 +18,40 @@ package v1
 
 import (
 	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/kubernetes/pkg/api/v1"
+	"k8s.io/kubernetes/pkg/apis/core/v1"
 )
 
 func addConversionFuncs(scheme *runtime.Scheme) error {
 	// Add non-generated conversion functions
 	err := scheme.AddConversionFuncs(
-		v1.Convert_v1_DeleteOptions_To_api_DeleteOptions,
-		v1.Convert_api_DeleteOptions_To_v1_DeleteOptions,
-		v1.Convert_v1_List_To_api_List,
-		v1.Convert_api_List_To_v1_List,
-		v1.Convert_v1_ListOptions_To_api_ListOptions,
-		v1.Convert_api_ListOptions_To_v1_ListOptions,
-		v1.Convert_v1_ObjectFieldSelector_To_api_ObjectFieldSelector,
-		v1.Convert_api_ObjectFieldSelector_To_v1_ObjectFieldSelector,
-		v1.Convert_v1_ObjectMeta_To_api_ObjectMeta,
-		v1.Convert_api_ObjectMeta_To_v1_ObjectMeta,
-		v1.Convert_v1_ObjectReference_To_api_ObjectReference,
-		v1.Convert_api_ObjectReference_To_v1_ObjectReference,
-		v1.Convert_v1_Secret_To_api_Secret,
-		v1.Convert_api_Secret_To_v1_Secret,
-		v1.Convert_v1_SecretList_To_api_SecretList,
-		v1.Convert_api_SecretList_To_v1_SecretList,
-		v1.Convert_v1_Service_To_api_Service,
-		v1.Convert_api_Service_To_v1_Service,
-		v1.Convert_v1_ServiceList_To_api_ServiceList,
-		v1.Convert_api_ServiceList_To_v1_ServiceList,
-		v1.Convert_v1_ServicePort_To_api_ServicePort,
-		v1.Convert_api_ServicePort_To_v1_ServicePort,
-		v1.Convert_v1_ServiceProxyOptions_To_api_ServiceProxyOptions,
-		v1.Convert_api_ServiceProxyOptions_To_v1_ServiceProxyOptions,
-		v1.Convert_v1_ServiceSpec_To_api_ServiceSpec,
-		v1.Convert_api_ServiceSpec_To_v1_ServiceSpec,
-		v1.Convert_v1_ServiceStatus_To_api_ServiceStatus,
-		v1.Convert_api_ServiceStatus_To_v1_ServiceStatus,
+		v1.Convert_v1_DeleteOptions_To_core_DeleteOptions,
+		v1.Convert_core_DeleteOptions_To_v1_DeleteOptions,
+		v1.Convert_v1_List_To_core_List,
+		v1.Convert_core_List_To_v1_List,
+		v1.Convert_v1_ListOptions_To_core_ListOptions,
+		v1.Convert_core_ListOptions_To_v1_ListOptions,
+		v1.Convert_v1_ObjectFieldSelector_To_core_ObjectFieldSelector,
+		v1.Convert_core_ObjectFieldSelector_To_v1_ObjectFieldSelector,
+		v1.Convert_v1_ObjectMeta_To_core_ObjectMeta,
+		v1.Convert_core_ObjectMeta_To_v1_ObjectMeta,
+		v1.Convert_v1_ObjectReference_To_core_ObjectReference,
+		v1.Convert_core_ObjectReference_To_v1_ObjectReference,
+		v1.Convert_v1_Secret_To_core_Secret,
+		v1.Convert_core_Secret_To_v1_Secret,
+		v1.Convert_v1_SecretList_To_core_SecretList,
+		v1.Convert_core_SecretList_To_v1_SecretList,
+		v1.Convert_v1_Service_To_core_Service,
+		v1.Convert_core_Service_To_v1_Service,
+		v1.Convert_v1_ServiceList_To_core_ServiceList,
+		v1.Convert_core_ServiceList_To_v1_ServiceList,
+		v1.Convert_v1_ServicePort_To_core_ServicePort,
+		v1.Convert_core_ServicePort_To_v1_ServicePort,
+		v1.Convert_v1_ServiceProxyOptions_To_core_ServiceProxyOptions,
+		v1.Convert_core_ServiceProxyOptions_To_v1_ServiceProxyOptions,
+		v1.Convert_v1_ServiceSpec_To_core_ServiceSpec,
+		v1.Convert_core_ServiceSpec_To_v1_ServiceSpec,
+		v1.Convert_v1_ServiceStatus_To_core_ServiceStatus,
+		v1.Convert_core_ServiceStatus_To_v1_ServiceStatus,
 	)
 	if err != nil {
 		return err

apis/core/v1/defaults.go

@@ -18,7 +18,7 @@ package v1
 
 import (
 	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/kubernetes/pkg/api/v1"
+	"k8s.io/kubernetes/pkg/apis/core/v1"
 )
 
 func addDefaultingFuncs(scheme *runtime.Scheme) error {

apis/federation/BUILD

@@ -18,10 +18,9 @@ go_library(
     deps = [
         "//vendor/k8s.io/api/core/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/conversion:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
-        "//vendor/k8s.io/kubernetes/pkg/api:go_default_library",
+        "//vendor/k8s.io/kubernetes/pkg/apis/core:go_default_library",
     ],
 )
 

apis/federation/install/BUILD

@@ -24,8 +24,7 @@ go_library(
 go_test(
     name = "go_default_test",
     srcs = ["install_test.go"],
-    importpath = "k8s.io/federation/apis/federation/install",
-    library = ":go_default_library",
+    embed = [":go_default_library"],
     deps = [
         "//apis/federation:go_default_library",
         "//apis/federation/v1beta1:go_default_library",

apis/federation/types.go

@@ -19,7 +19,7 @@ package federation
 import (
 	"k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/kubernetes/pkg/api"
+	api "k8s.io/kubernetes/pkg/apis/core"
 )
 
 // ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match.

apis/federation/v1beta1/BUILD

@@ -27,7 +27,7 @@ go_library(
         "//vendor/k8s.io/apimachinery/pkg/conversion:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
-        "//vendor/k8s.io/kubernetes/pkg/api:go_default_library",
+        "//vendor/k8s.io/kubernetes/pkg/apis/core:go_default_library",
     ],
 )
 

apis/federation/v1beta1/types.go

@@ -63,7 +63,7 @@ type ClusterCondition struct {
 	// Type of cluster condition, Complete or Failed.
 	Type ClusterConditionType `json:"type" protobuf:"bytes,1,opt,name=type,casttype=ClusterConditionType"`
 	// Status of the condition, one of True, False, Unknown.
-	Status v1.ConditionStatus `json:"status" protobuf:"bytes,2,opt,name=status,casttype=k8s.io/kubernetes/pkg/api/v1.ConditionStatus"`
+	Status v1.ConditionStatus `json:"status" protobuf:"bytes,2,opt,name=status,casttype=k8s.io/kubernetes/pkg/apis/core/v1.ConditionStatus"`
 	// Last time the condition was checked.
 	// +optional
 	LastProbeTime metav1.Time `json:"lastProbeTime,omitempty" protobuf:"bytes,3,opt,name=lastProbeTime"`

apis/federation/v1beta1/zz_generated.conversion.go

@@ -21,12 +21,13 @@ limitations under the License.
 package v1beta1
 
 import (
+	unsafe "unsafe"
+
 	v1 "k8s.io/api/core/v1"
 	conversion "k8s.io/apimachinery/pkg/conversion"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	federation "k8s.io/federation/apis/federation"
-	api "k8s.io/kubernetes/pkg/api"
-	unsafe "unsafe"
+	core "k8s.io/kubernetes/pkg/apis/core"
 )
 
 func init() {
@@ -86,7 +87,7 @@ func Convert_federation_Cluster_To_v1beta1_Cluster(in *federation.Cluster, out *
 
 func autoConvert_v1beta1_ClusterCondition_To_federation_ClusterCondition(in *ClusterCondition, out *federation.ClusterCondition, s conversion.Scope) error {
 	out.Type = federation.ClusterConditionType(in.Type)
-	out.Status = api.ConditionStatus(in.Status)
+	out.Status = core.ConditionStatus(in.Status)
 	out.LastProbeTime = in.LastProbeTime
 	out.LastTransitionTime = in.LastTransitionTime
 	out.Reason = in.Reason
@@ -138,7 +139,7 @@ func Convert_federation_ClusterList_To_v1beta1_ClusterList(in *federation.Cluste
 
 func autoConvert_v1beta1_ClusterSpec_To_federation_ClusterSpec(in *ClusterSpec, out *federation.ClusterSpec, s conversion.Scope) error {
 	out.ServerAddressByClientCIDRs = *(*[]federation.ServerAddressByClientCIDR)(unsafe.Pointer(&in.ServerAddressByClientCIDRs))
-	out.SecretRef = (*api.LocalObjectReference)(unsafe.Pointer(in.SecretRef))
+	out.SecretRef = (*core.LocalObjectReference)(unsafe.Pointer(in.SecretRef))
 	return nil
 }
 

apis/federation/v1beta1/zz_generated.deepcopy.go

@@ -22,52 +22,9 @@ package v1beta1
 
 import (
 	v1 "k8s.io/api/core/v1"
-	conversion "k8s.io/apimachinery/pkg/conversion"
 	runtime "k8s.io/apimachinery/pkg/runtime"
-	reflect "reflect"
 )
 
-func init() {
-	SchemeBuilder.Register(RegisterDeepCopies)
-}
-
-// RegisterDeepCopies adds deep-copy functions to the given scheme. Public
-// to allow building arbitrary schemes.
-//
-// Deprecated: deepcopy registration will go away when static deepcopy is fully implemented.
-func RegisterDeepCopies(scheme *runtime.Scheme) error {
-	return scheme.AddGeneratedDeepCopyFuncs(
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*Cluster).DeepCopyInto(out.(*Cluster))
-			return nil
-		}, InType: reflect.TypeOf(&Cluster{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*ClusterCondition).DeepCopyInto(out.(*ClusterCondition))
-			return nil
-		}, InType: reflect.TypeOf(&ClusterCondition{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*ClusterList).DeepCopyInto(out.(*ClusterList))
-			return nil
-		}, InType: reflect.TypeOf(&ClusterList{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*ClusterSelectorRequirement).DeepCopyInto(out.(*ClusterSelectorRequirement))
-			return nil
-		}, InType: reflect.TypeOf(&ClusterSelectorRequirement{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*ClusterSpec).DeepCopyInto(out.(*ClusterSpec))
-			return nil
-		}, InType: reflect.TypeOf(&ClusterSpec{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*ClusterStatus).DeepCopyInto(out.(*ClusterStatus))
-			return nil
-		}, InType: reflect.TypeOf(&ClusterStatus{})},
-		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
-			in.(*ServerAddressByClientCIDR).DeepCopyInto(out.(*ServerAddressByClientCIDR))
-			return nil
-		}, InType: reflect.TypeOf(&ServerAddressByClientCIDR{})},
-	)
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Cluster) DeepCopyInto(out *Cluster) {
 	*out = *in

apis/federation/validation/BUILD

@@ -13,20 +13,19 @@ go_library(
     deps = [
         "//apis/federation:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/validation/field:go_default_library",
-        "//vendor/k8s.io/kubernetes/pkg/api/validation:go_default_library",
+        "//vendor/k8s.io/kubernetes/pkg/apis/core/validation:go_default_library",
     ],
 )
 
 go_test(
     name = "go_default_test",
     srcs = ["validation_test.go"],
-    importpath = "k8s.io/federation/apis/federation/validation",
-    library = ":go_default_library",
+    embed = [":go_default_library"],
     deps = [
         "//apis/federation:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/validation/field:go_default_library",
-        "//vendor/k8s.io/kubernetes/pkg/api:go_default_library",
+        "//vendor/k8s.io/kubernetes/pkg/apis/core:go_default_library",
     ],
 )
 

apis/federation/validation/validation.go

@@ -22,7 +22,7 @@ import (
 
 	"k8s.io/apimachinery/pkg/util/validation/field"
 	"k8s.io/federation/apis/federation"
-	"k8s.io/kubernetes/pkg/api/validation"
+	"k8s.io/kubernetes/pkg/apis/core/validation"
 )
 
 func ValidateClusterSpec(spec *federation.ClusterSpec, fieldPath *field.Path) field.ErrorList {

apis/federation/validation/validation_test.go

@@ -22,7 +22,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 	"k8s.io/federation/apis/federation"
-	"k8s.io/kubernetes/pkg/api"
+	api "k8s.io/kubernetes/pkg/apis/core"
 )
 
 func TestValidateClusterSpec(t *testing.T) {