diff --git a/pkg/api/BUILD b/pkg/api/BUILD index 3c05143f3ce..7dc1873285a 100644 --- a/pkg/api/BUILD +++ b/pkg/api/BUILD @@ -31,7 +31,6 @@ go_library( "//pkg/fields:go_default_library", "//pkg/util/intstr:go_default_library", "//pkg/util/labels:go_default_library", - "//pkg/util/rand:go_default_library", "//vendor:github.com/davecgh/go-spew/spew", "//vendor:k8s.io/apimachinery/pkg/api/meta", "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", @@ -43,6 +42,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", "//vendor:k8s.io/apimachinery/pkg/selection", "//vendor:k8s.io/apimachinery/pkg/types", + "//vendor:k8s.io/apimachinery/pkg/util/rand", "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", ], diff --git a/pkg/api/generate.go b/pkg/api/generate.go index 19379d301e2..f8e2ab150e4 100644 --- a/pkg/api/generate.go +++ b/pkg/api/generate.go @@ -19,7 +19,7 @@ package api import ( "fmt" - utilrand "k8s.io/kubernetes/pkg/util/rand" + utilrand "k8s.io/apimachinery/pkg/util/rand" ) // NameGenerator generates names for objects. Some backends may have more information diff --git a/pkg/api/v1/BUILD b/pkg/api/v1/BUILD index f12c8477b66..a902eb4bbeb 100644 --- a/pkg/api/v1/BUILD +++ b/pkg/api/v1/BUILD @@ -37,7 +37,6 @@ go_library( "//pkg/util:go_default_library", "//pkg/util/intstr:go_default_library", "//pkg/util/parsers:go_default_library", - "//pkg/util/rand:go_default_library", "//vendor:github.com/gogo/protobuf/proto", "//vendor:github.com/gogo/protobuf/sortkeys", "//vendor:github.com/ugorji/go/codec", @@ -49,6 +48,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/selection", "//vendor:k8s.io/apimachinery/pkg/types", + "//vendor:k8s.io/apimachinery/pkg/util/rand", "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", ], diff --git a/pkg/api/v1/generate.go b/pkg/api/v1/generate.go index b6d1b347eba..b8c44e4c7f0 100644 --- a/pkg/api/v1/generate.go +++ b/pkg/api/v1/generate.go @@ -19,7 +19,7 @@ package v1 import ( "fmt" - utilrand "k8s.io/kubernetes/pkg/util/rand" + utilrand "k8s.io/apimachinery/pkg/util/rand" ) // NameGenerator generates names for objects. Some backends may have more information diff --git a/pkg/cloudprovider/providers/openstack/BUILD b/pkg/cloudprovider/providers/openstack/BUILD index 265ab96cf4c..0ca9db5ce92 100644 --- a/pkg/cloudprovider/providers/openstack/BUILD +++ b/pkg/cloudprovider/providers/openstack/BUILD @@ -69,10 +69,10 @@ go_test( deps = [ "//pkg/api/v1:go_default_library", "//pkg/cloudprovider:go_default_library", - "//pkg/util/rand:go_default_library", "//vendor:github.com/rackspace/gophercloud", "//vendor:github.com/rackspace/gophercloud/openstack/compute/v2/servers", "//vendor:k8s.io/apimachinery/pkg/types", + "//vendor:k8s.io/apimachinery/pkg/util/rand", ], ) diff --git a/pkg/cloudprovider/providers/openstack/openstack_test.go b/pkg/cloudprovider/providers/openstack/openstack_test.go index 10d8214c07a..66580076deb 100644 --- a/pkg/cloudprovider/providers/openstack/openstack_test.go +++ b/pkg/cloudprovider/providers/openstack/openstack_test.go @@ -27,8 +27,8 @@ import ( "github.com/rackspace/gophercloud" "github.com/rackspace/gophercloud/openstack/compute/v2/servers" + "k8s.io/apimachinery/pkg/util/rand" "k8s.io/kubernetes/pkg/api/v1" - "k8s.io/kubernetes/pkg/util/rand" ) const volumeAvailableStatus = "available" diff --git a/pkg/cloudprovider/providers/photon/BUILD b/pkg/cloudprovider/providers/photon/BUILD index 00a9552d59d..a718a5848bb 100644 --- a/pkg/cloudprovider/providers/photon/BUILD +++ b/pkg/cloudprovider/providers/photon/BUILD @@ -29,8 +29,8 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/cloudprovider:go_default_library", - "//pkg/util/rand:go_default_library", "//vendor:k8s.io/apimachinery/pkg/types", + "//vendor:k8s.io/apimachinery/pkg/util/rand", ], ) diff --git a/pkg/cloudprovider/providers/photon/photon_test.go b/pkg/cloudprovider/providers/photon/photon_test.go index e3ec563afa1..87b025d24ae 100644 --- a/pkg/cloudprovider/providers/photon/photon_test.go +++ b/pkg/cloudprovider/providers/photon/photon_test.go @@ -24,8 +24,8 @@ import ( "testing" "k8s.io/apimachinery/pkg/types" + "k8s.io/apimachinery/pkg/util/rand" "k8s.io/kubernetes/pkg/cloudprovider" - "k8s.io/kubernetes/pkg/util/rand" ) func configFromEnv() (TestVM string, TestFlavor string, cfg PCConfig, ok bool) { diff --git a/pkg/cloudprovider/providers/vsphere/BUILD b/pkg/cloudprovider/providers/vsphere/BUILD index e8fda0e4375..a752b42442f 100644 --- a/pkg/cloudprovider/providers/vsphere/BUILD +++ b/pkg/cloudprovider/providers/vsphere/BUILD @@ -39,9 +39,9 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/cloudprovider:go_default_library", - "//pkg/util/rand:go_default_library", "//vendor:golang.org/x/net/context", "//vendor:k8s.io/apimachinery/pkg/types", + "//vendor:k8s.io/apimachinery/pkg/util/rand", ], ) diff --git a/pkg/cloudprovider/providers/vsphere/vsphere_test.go b/pkg/cloudprovider/providers/vsphere/vsphere_test.go index 65419a895e9..b7bbdd7cc57 100644 --- a/pkg/cloudprovider/providers/vsphere/vsphere_test.go +++ b/pkg/cloudprovider/providers/vsphere/vsphere_test.go @@ -25,8 +25,8 @@ import ( "golang.org/x/net/context" "k8s.io/apimachinery/pkg/types" + "k8s.io/apimachinery/pkg/util/rand" "k8s.io/kubernetes/pkg/cloudprovider" - "k8s.io/kubernetes/pkg/util/rand" ) func configFromEnv() (cfg VSphereConfig, ok bool) { diff --git a/pkg/controller/job/BUILD b/pkg/controller/job/BUILD index d6bc46accf2..b613f51d7c8 100644 --- a/pkg/controller/job/BUILD +++ b/pkg/controller/job/BUILD @@ -55,8 +55,8 @@ go_test( "//pkg/client/testing/core:go_default_library", "//pkg/controller:go_default_library", "//pkg/controller/informers:go_default_library", - "//pkg/util/rand:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/util/rand", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apimachinery/pkg/watch", ], diff --git a/pkg/controller/job/jobcontroller_test.go b/pkg/controller/job/jobcontroller_test.go index 95507dbf6ab..5a75046bf86 100644 --- a/pkg/controller/job/jobcontroller_test.go +++ b/pkg/controller/job/jobcontroller_test.go @@ -22,6 +22,7 @@ import ( "time" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/util/rand" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" "k8s.io/kubernetes/pkg/api" @@ -34,7 +35,6 @@ import ( "k8s.io/kubernetes/pkg/client/testing/core" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller/informers" - "k8s.io/kubernetes/pkg/util/rand" ) var alwaysReady = func() bool { return true } diff --git a/pkg/controller/serviceaccount/BUILD b/pkg/controller/serviceaccount/BUILD index 0e1f9d124ba..03e0a287ad4 100644 --- a/pkg/controller/serviceaccount/BUILD +++ b/pkg/controller/serviceaccount/BUILD @@ -65,12 +65,12 @@ go_test( "//pkg/client/testing/core:go_default_library", "//pkg/controller:go_default_library", "//pkg/controller/informers:go_default_library", - "//pkg/util/rand:go_default_library", "//vendor:github.com/davecgh/go-spew/spew", "//vendor:github.com/golang/glog", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apimachinery/pkg/util/rand", "//vendor:k8s.io/apimachinery/pkg/util/sets", ], ) diff --git a/pkg/controller/serviceaccount/tokens_controller_test.go b/pkg/controller/serviceaccount/tokens_controller_test.go index e171483c4d5..2e065673962 100644 --- a/pkg/controller/serviceaccount/tokens_controller_test.go +++ b/pkg/controller/serviceaccount/tokens_controller_test.go @@ -28,11 +28,11 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + utilrand "k8s.io/apimachinery/pkg/util/rand" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" "k8s.io/kubernetes/pkg/client/testing/core" - utilrand "k8s.io/kubernetes/pkg/util/rand" ) type testGenerator struct { diff --git a/pkg/kubelet/BUILD b/pkg/kubelet/BUILD index f49638f5f1f..ca82778561b 100644 --- a/pkg/kubelet/BUILD +++ b/pkg/kubelet/BUILD @@ -184,7 +184,6 @@ go_test( "//pkg/util/clock:go_default_library", "//pkg/util/flowcontrol:go_default_library", "//pkg/util/mount:go_default_library", - "//pkg/util/rand:go_default_library", "//pkg/util/strategicpatch:go_default_library", "//pkg/util/testing:go_default_library", "//pkg/util/uuid:go_default_library", @@ -203,6 +202,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/util/diff", + "//vendor:k8s.io/apimachinery/pkg/util/rand", "//vendor:k8s.io/apimachinery/pkg/util/runtime", "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/util/wait", diff --git a/pkg/kubelet/kubelet_node_status_test.go b/pkg/kubelet/kubelet_node_status_test.go index 4c4bc43078f..2dd38405418 100644 --- a/pkg/kubelet/kubelet_node_status_test.go +++ b/pkg/kubelet/kubelet_node_status_test.go @@ -32,6 +32,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/diff" + "k8s.io/apimachinery/pkg/util/rand" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" @@ -40,7 +41,6 @@ import ( "k8s.io/kubernetes/pkg/client/testing/core" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/util/sliceutils" - "k8s.io/kubernetes/pkg/util/rand" "k8s.io/kubernetes/pkg/util/strategicpatch" "k8s.io/kubernetes/pkg/util/uuid" "k8s.io/kubernetes/pkg/version" diff --git a/pkg/util/rand/BUILD b/pkg/util/rand/BUILD index ff1048c49bf..deefdcef3c1 100644 --- a/pkg/util/rand/BUILD +++ b/pkg/util/rand/BUILD @@ -5,19 +5,11 @@ licenses(["notice"]) load( "@io_bazel_rules_go//go:def.bzl", "go_library", - "go_test", ) go_library( name = "go_default_library", - srcs = ["rand.go"], - tags = ["automanaged"], -) - -go_test( - name = "go_default_test", - srcs = ["rand_test.go"], - library = ":go_default_library", + srcs = ["doc.go"], tags = ["automanaged"], ) diff --git a/pkg/util/rand/doc.go b/pkg/util/rand/doc.go new file mode 100644 index 00000000000..7ba225434da --- /dev/null +++ b/pkg/util/rand/doc.go @@ -0,0 +1,21 @@ +/* +Copyright 2017 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Package rand needed for godep. +// TODO genericapiserver remove this empty package. Godep fails without this because heapster relies +// on this package. This will allow us to start splitting packages, but will force +// heapster to update on their next kube rebase. +package rand diff --git a/pkg/util/slice/BUILD b/pkg/util/slice/BUILD index 1963daaee3e..d947e1d71ea 100644 --- a/pkg/util/slice/BUILD +++ b/pkg/util/slice/BUILD @@ -12,7 +12,7 @@ go_library( name = "go_default_library", srcs = ["slice.go"], tags = ["automanaged"], - deps = ["//pkg/util/rand:go_default_library"], + deps = ["//vendor:k8s.io/apimachinery/pkg/util/rand"], ) go_test( diff --git a/pkg/util/slice/slice.go b/pkg/util/slice/slice.go index 2e1d7ccb53c..9520bc32aed 100644 --- a/pkg/util/slice/slice.go +++ b/pkg/util/slice/slice.go @@ -20,7 +20,7 @@ package slice import ( "sort" - utilrand "k8s.io/kubernetes/pkg/util/rand" + utilrand "k8s.io/apimachinery/pkg/util/rand" ) // CopyStrings copies the contents of the specified string slice diff --git a/pkg/volume/flocker/BUILD b/pkg/volume/flocker/BUILD index 9c8a6ef5294..f3cfe1c68f6 100644 --- a/pkg/volume/flocker/BUILD +++ b/pkg/volume/flocker/BUILD @@ -22,13 +22,13 @@ go_library( "//pkg/api/v1:go_default_library", "//pkg/util/env:go_default_library", "//pkg/util/mount:go_default_library", - "//pkg/util/rand:go_default_library", "//pkg/util/strings:go_default_library", "//pkg/volume:go_default_library", "//pkg/volume/util:go_default_library", "//vendor:github.com/clusterhq/flocker-go", "//vendor:github.com/golang/glog", "//vendor:k8s.io/apimachinery/pkg/types", + "//vendor:k8s.io/apimachinery/pkg/util/rand", ], ) diff --git a/pkg/volume/flocker/flocker_util.go b/pkg/volume/flocker/flocker_util.go index 15cd986affe..ae68af9e98e 100644 --- a/pkg/volume/flocker/flocker_util.go +++ b/pkg/volume/flocker/flocker_util.go @@ -20,8 +20,8 @@ import ( "fmt" "time" + "k8s.io/apimachinery/pkg/util/rand" "k8s.io/kubernetes/pkg/api/v1" - "k8s.io/kubernetes/pkg/util/rand" "k8s.io/kubernetes/pkg/volume" flockerapi "github.com/clusterhq/flocker-go" diff --git a/pkg/util/rand/rand.go b/staging/src/k8s.io/apimachinery/pkg/util/rand/rand.go similarity index 100% rename from pkg/util/rand/rand.go rename to staging/src/k8s.io/apimachinery/pkg/util/rand/rand.go diff --git a/pkg/util/rand/rand_test.go b/staging/src/k8s.io/apimachinery/pkg/util/rand/rand_test.go similarity index 100% rename from pkg/util/rand/rand_test.go rename to staging/src/k8s.io/apimachinery/pkg/util/rand/rand_test.go diff --git a/test/e2e/framework/BUILD b/test/e2e/framework/BUILD index 2455847005e..1affc515a86 100644 --- a/test/e2e/framework/BUILD +++ b/test/e2e/framework/BUILD @@ -75,7 +75,6 @@ go_library( "//pkg/util/exec:go_default_library", "//pkg/util/intstr:go_default_library", "//pkg/util/labels:go_default_library", - "//pkg/util/rand:go_default_library", "//pkg/util/system:go_default_library", "//pkg/util/uuid:go_default_library", "//pkg/util/version:go_default_library", @@ -106,6 +105,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/util/errors", "//vendor:k8s.io/apimachinery/pkg/util/net", + "//vendor:k8s.io/apimachinery/pkg/util/rand", "//vendor:k8s.io/apimachinery/pkg/util/runtime", "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/util/validation", diff --git a/test/e2e/framework/networking_utils.go b/test/e2e/framework/networking_utils.go index 891ed04b2bb..997de0153aa 100644 --- a/test/e2e/framework/networking_utils.go +++ b/test/e2e/framework/networking_utils.go @@ -32,13 +32,13 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" utilnet "k8s.io/apimachinery/pkg/util/net" + "k8s.io/apimachinery/pkg/util/rand" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" coreclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/core/v1" "k8s.io/kubernetes/pkg/util/intstr" - "k8s.io/kubernetes/pkg/util/rand" "k8s.io/kubernetes/pkg/util/uuid" ) diff --git a/test/images/logs-generator/BUILD b/test/images/logs-generator/BUILD index ff86c7d704a..b4ef7feae38 100644 --- a/test/images/logs-generator/BUILD +++ b/test/images/logs-generator/BUILD @@ -19,8 +19,8 @@ go_library( srcs = ["logs_generator.go"], tags = ["automanaged"], deps = [ - "//pkg/util/rand:go_default_library", "//vendor:github.com/golang/glog", + "//vendor:k8s.io/apimachinery/pkg/util/rand", ], ) diff --git a/test/images/logs-generator/logs_generator.go b/test/images/logs-generator/logs_generator.go index 4da580e0c58..87189172f16 100644 --- a/test/images/logs-generator/logs_generator.go +++ b/test/images/logs-generator/logs_generator.go @@ -22,7 +22,7 @@ import ( "time" "github.com/golang/glog" - "k8s.io/kubernetes/pkg/util/rand" + "k8s.io/apimachinery/pkg/util/rand" ) var ( diff --git a/vendor/BUILD b/vendor/BUILD index 3d433867336..7f4f2d0f9f1 100644 --- a/vendor/BUILD +++ b/vendor/BUILD @@ -13341,3 +13341,16 @@ go_library( "//vendor:github.com/go-openapi/spec", ], ) + +go_test( + name = "k8s.io/apimachinery/pkg/util/rand_test", + srcs = ["k8s.io/apimachinery/pkg/util/rand/rand_test.go"], + library = ":k8s.io/apimachinery/pkg/util/rand", + tags = ["automanaged"], +) + +go_library( + name = "k8s.io/apimachinery/pkg/util/rand", + srcs = ["k8s.io/apimachinery/pkg/util/rand/rand.go"], + tags = ["automanaged"], +)