From a0137e9b28add53792171c8d05b8529fc583f163 Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Wed, 25 Jan 2017 16:28:20 +0100 Subject: [PATCH] Update generated files --- cmd/kubeadm/app/master/BUILD | 2 +- .../dnsprovider/providers/aws/route53/BUILD | 2 +- .../providers/google/clouddns/internal/BUILD | 2 +- .../pkg/federation-controller/cluster/BUILD | 2 +- pkg/client/record/BUILD | 4 +- pkg/controller/BUILD | 2 +- pkg/controller/deployment/BUILD | 2 +- pkg/controller/disruption/BUILD | 2 +- pkg/controller/replicaset/BUILD | 2 +- pkg/controller/replication/BUILD | 2 +- .../volume/attachdetach/statusupdater/BUILD | 2 +- pkg/genericapiserver/endpoints/handlers/BUILD | 7 +- .../endpoints/handlers/responsewriters/BUILD | 1 - pkg/genericapiserver/endpoints/openapi/BUILD | 2 +- .../registry/generic/rest/BUILD | 4 +- pkg/genericapiserver/registry/rest/BUILD | 4 +- pkg/genericapiserver/server/filters/BUILD | 1 - pkg/genericapiserver/server/openapi/BUILD | 2 +- pkg/kubectl/BUILD | 2 +- pkg/kubectl/cmd/BUILD | 4 +- pkg/kubectl/cmd/set/BUILD | 2 +- pkg/kubectl/cmd/util/BUILD | 2 +- pkg/kubectl/cmd/util/jsonmerge/BUILD | 2 +- pkg/kubelet/BUILD | 4 +- pkg/kubelet/rkt/BUILD | 2 +- pkg/registry/core/limitrange/BUILD | 2 +- pkg/util/BUILD | 3 - pkg/util/httpstream/spdy/BUILD | 2 +- pkg/util/node/BUILD | 2 +- .../golang/netutil => pkg/util/uuid}/BUILD | 2 +- pkg/volume/host_path/BUILD | 4 +- pkg/volume/rbd/BUILD | 2 +- pkg/volume/testing/BUILD | 2 +- pkg/volume/util/operationexecutor/BUILD | 2 +- .../third_party/forked/golang/json/BUILD | 27 ------- test/e2e/BUILD | 2 +- test/e2e/common/BUILD | 2 +- test/e2e/framework/BUILD | 2 +- test/e2e_node/BUILD | 4 +- test/utils/BUILD | 2 +- third_party/BUILD | 2 - vendor/BUILD | 80 +++++++++++++++++++ 42 files changed, 125 insertions(+), 80 deletions(-) rename {staging/src/k8s.io/apimachinery/third_party/forked/golang/netutil => pkg/util/uuid}/BUILD (94%) delete mode 100644 staging/src/k8s.io/apimachinery/third_party/forked/golang/json/BUILD diff --git a/cmd/kubeadm/app/master/BUILD b/cmd/kubeadm/app/master/BUILD index b3b57075ac3..30363e34cac 100644 --- a/cmd/kubeadm/app/master/BUILD +++ b/cmd/kubeadm/app/master/BUILD @@ -33,10 +33,10 @@ go_library( "//pkg/kubectl/cmd/util:go_default_library", "//pkg/registry/core/service/ipallocator:go_default_library", "//pkg/util/intstr:go_default_library", - "//pkg/util/uuid:go_default_library", "//vendor:github.com/blang/semver", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/util/uuid", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/client-go/tools/clientcmd", "//vendor:k8s.io/client-go/tools/clientcmd/api", diff --git a/federation/pkg/dnsprovider/providers/aws/route53/BUILD b/federation/pkg/dnsprovider/providers/aws/route53/BUILD index a9484d54a42..054c94995c7 100644 --- a/federation/pkg/dnsprovider/providers/aws/route53/BUILD +++ b/federation/pkg/dnsprovider/providers/aws/route53/BUILD @@ -24,10 +24,10 @@ go_library( "//federation/pkg/dnsprovider:go_default_library", "//federation/pkg/dnsprovider/providers/aws/route53/stubs:go_default_library", "//federation/pkg/dnsprovider/rrstype:go_default_library", - "//pkg/util/uuid:go_default_library", "//vendor:github.com/aws/aws-sdk-go/aws", "//vendor:github.com/aws/aws-sdk-go/aws/session", "//vendor:github.com/aws/aws-sdk-go/service/route53", + "//vendor:k8s.io/apimachinery/pkg/util/uuid", ], ) diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/BUILD b/federation/pkg/dnsprovider/providers/google/clouddns/internal/BUILD index 03b2b7e5e05..1a5130f9d61 100644 --- a/federation/pkg/dnsprovider/providers/google/clouddns/internal/BUILD +++ b/federation/pkg/dnsprovider/providers/google/clouddns/internal/BUILD @@ -31,9 +31,9 @@ go_library( deps = [ "//federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces:go_default_library", "//federation/pkg/dnsprovider/rrstype:go_default_library", - "//pkg/util/uuid:go_default_library", "//vendor:google.golang.org/api/dns/v1", "//vendor:google.golang.org/api/googleapi", + "//vendor:k8s.io/apimachinery/pkg/util/uuid", ], ) diff --git a/federation/pkg/federation-controller/cluster/BUILD b/federation/pkg/federation-controller/cluster/BUILD index f50cabc68fb..09f10e23efb 100644 --- a/federation/pkg/federation-controller/cluster/BUILD +++ b/federation/pkg/federation-controller/cluster/BUILD @@ -49,8 +49,8 @@ go_test( "//federation/pkg/federation-controller/util:go_default_library", "//pkg/api/testapi:go_default_library", "//pkg/api/v1:go_default_library", - "//pkg/util/uuid:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/util/uuid", "//vendor:k8s.io/client-go/rest", "//vendor:k8s.io/client-go/tools/clientcmd", "//vendor:k8s.io/client-go/tools/clientcmd/api", diff --git a/pkg/client/record/BUILD b/pkg/client/record/BUILD index 0eeae3ea647..28487e56fbe 100644 --- a/pkg/client/record/BUILD +++ b/pkg/client/record/BUILD @@ -19,7 +19,6 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api/v1:go_default_library", - "//pkg/util/strategicpatch:go_default_library", "//vendor:github.com/golang/glog", "//vendor:github.com/golang/groupcache/lru", "//vendor:k8s.io/apimachinery/pkg/api/errors", @@ -27,6 +26,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/runtime", "//vendor:k8s.io/apimachinery/pkg/util/sets", + "//vendor:k8s.io/apimachinery/pkg/util/strategicpatch", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/rest", "//vendor:k8s.io/client-go/util/clock", @@ -44,11 +44,11 @@ go_test( deps = [ "//pkg/api/install:go_default_library", "//pkg/api/v1:go_default_library", - "//pkg/util/strategicpatch:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/diff", + "//vendor:k8s.io/apimachinery/pkg/util/strategicpatch", "//vendor:k8s.io/client-go/rest", "//vendor:k8s.io/client-go/util/clock", ], diff --git a/pkg/controller/BUILD b/pkg/controller/BUILD index 51fa8574afb..672ca03876d 100644 --- a/pkg/controller/BUILD +++ b/pkg/controller/BUILD @@ -60,10 +60,10 @@ go_test( "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/client/record:go_default_library", "//pkg/securitycontext:go_default_library", - "//pkg/util/uuid:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/sets", + "//vendor:k8s.io/apimachinery/pkg/util/uuid", "//vendor:k8s.io/client-go/rest", "//vendor:k8s.io/client-go/tools/cache", "//vendor:k8s.io/client-go/util/clock", diff --git a/pkg/controller/deployment/BUILD b/pkg/controller/deployment/BUILD index 1e1f39efe25..bd8d2db3249 100644 --- a/pkg/controller/deployment/BUILD +++ b/pkg/controller/deployment/BUILD @@ -67,10 +67,10 @@ go_test( "//pkg/controller/deployment/util:go_default_library", "//pkg/controller/informers:go_default_library", "//pkg/util/intstr:go_default_library", - "//pkg/util/uuid:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apimachinery/pkg/util/uuid", ], ) diff --git a/pkg/controller/disruption/BUILD b/pkg/controller/disruption/BUILD index 4957f7f52ec..a17ad819176 100644 --- a/pkg/controller/disruption/BUILD +++ b/pkg/controller/disruption/BUILD @@ -52,9 +52,9 @@ go_test( "//pkg/client/record:go_default_library", "//pkg/controller:go_default_library", "//pkg/util/intstr:go_default_library", - "//pkg/util/uuid:go_default_library", "//pkg/util/workqueue:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/util/uuid", "//vendor:k8s.io/client-go/tools/cache", ], ) diff --git a/pkg/controller/replicaset/BUILD b/pkg/controller/replicaset/BUILD index 7f7eb4589b9..0944eeba540 100644 --- a/pkg/controller/replicaset/BUILD +++ b/pkg/controller/replicaset/BUILD @@ -58,10 +58,10 @@ go_test( "//pkg/controller:go_default_library", "//pkg/controller/informers:go_default_library", "//pkg/securitycontext:go_default_library", - "//pkg/util/uuid:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/sets", + "//vendor:k8s.io/apimachinery/pkg/util/uuid", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/rest", diff --git a/pkg/controller/replication/BUILD b/pkg/controller/replication/BUILD index 49ee8725bb1..f8dc46ef7d1 100644 --- a/pkg/controller/replication/BUILD +++ b/pkg/controller/replication/BUILD @@ -54,10 +54,10 @@ go_test( "//pkg/controller:go_default_library", "//pkg/controller/informers:go_default_library", "//pkg/securitycontext:go_default_library", - "//pkg/util/uuid:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/sets", + "//vendor:k8s.io/apimachinery/pkg/util/uuid", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/rest", diff --git a/pkg/controller/volume/attachdetach/statusupdater/BUILD b/pkg/controller/volume/attachdetach/statusupdater/BUILD index 6cc5c620bee..446504f2bfb 100644 --- a/pkg/controller/volume/attachdetach/statusupdater/BUILD +++ b/pkg/controller/volume/attachdetach/statusupdater/BUILD @@ -19,8 +19,8 @@ go_library( "//pkg/api/v1:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/controller/volume/attachdetach/cache:go_default_library", - "//pkg/util/strategicpatch:go_default_library", "//vendor:github.com/golang/glog", + "//vendor:k8s.io/apimachinery/pkg/util/strategicpatch", "//vendor:k8s.io/client-go/tools/cache", ], ) diff --git a/pkg/genericapiserver/endpoints/handlers/BUILD b/pkg/genericapiserver/endpoints/handlers/BUILD index 64c17fce687..d161b0c6bae 100644 --- a/pkg/genericapiserver/endpoints/handlers/BUILD +++ b/pkg/genericapiserver/endpoints/handlers/BUILD @@ -18,7 +18,6 @@ go_test( "//pkg/api/testapi:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/genericapiserver/registry/rest:go_default_library", - "//pkg/util/strategicpatch:go_default_library", "//vendor:github.com/emicklei/go-restful", "//vendor:github.com/evanphx/json-patch", "//vendor:k8s.io/apimachinery/pkg/api/errors", @@ -27,6 +26,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/util/diff", + "//vendor:k8s.io/apimachinery/pkg/util/strategicpatch", "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) @@ -43,13 +43,10 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api:go_default_library", "//pkg/genericapiserver/endpoints/handlers/responsewriters:go_default_library", "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/util:go_default_library", "//pkg/util/httpstream:go_default_library", - "//pkg/util/proxy:go_default_library", - "//pkg/util/strategicpatch:go_default_library", "//vendor:github.com/emicklei/go-restful", "//vendor:github.com/evanphx/json-patch", "//vendor:github.com/golang/glog", @@ -65,12 +62,14 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/util/net", "//vendor:k8s.io/apimachinery/pkg/util/runtime", + "//vendor:k8s.io/apimachinery/pkg/util/strategicpatch", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/apiserver/pkg/admission", "//vendor:k8s.io/apiserver/pkg/endpoints/handlers/negotiation", "//vendor:k8s.io/apiserver/pkg/endpoints/metrics", "//vendor:k8s.io/apiserver/pkg/endpoints/request", "//vendor:k8s.io/apiserver/pkg/server/httplog", + "//vendor:k8s.io/apiserver/pkg/util/proxy", "//vendor:k8s.io/apiserver/pkg/util/wsstream", ], ) diff --git a/pkg/genericapiserver/endpoints/handlers/responsewriters/BUILD b/pkg/genericapiserver/endpoints/handlers/responsewriters/BUILD index 52445d47f6a..46958c74bb9 100644 --- a/pkg/genericapiserver/endpoints/handlers/responsewriters/BUILD +++ b/pkg/genericapiserver/endpoints/handlers/responsewriters/BUILD @@ -14,7 +14,6 @@ go_test( library = ":go_default_library", tags = ["automanaged"], deps = [ - "//pkg/api:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", diff --git a/pkg/genericapiserver/endpoints/openapi/BUILD b/pkg/genericapiserver/endpoints/openapi/BUILD index 3be0f008bc5..86a78c79fce 100644 --- a/pkg/genericapiserver/endpoints/openapi/BUILD +++ b/pkg/genericapiserver/endpoints/openapi/BUILD @@ -12,8 +12,8 @@ go_library( srcs = ["openapi.go"], tags = ["automanaged"], deps = [ - "//pkg/util:go_default_library", "//vendor:github.com/emicklei/go-restful", + "//vendor:k8s.io/apiserver/pkg/util/trie", ], ) diff --git a/pkg/genericapiserver/registry/generic/rest/BUILD b/pkg/genericapiserver/registry/generic/rest/BUILD index 9476b5e77e8..c3302159383 100644 --- a/pkg/genericapiserver/registry/generic/rest/BUILD +++ b/pkg/genericapiserver/registry/generic/rest/BUILD @@ -20,7 +20,6 @@ go_library( deps = [ "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/util/httpstream:go_default_library", - "//pkg/util/proxy:go_default_library", "//vendor:github.com/golang/glog", "//vendor:github.com/mxk/go-flowrate/flowrate", "//vendor:k8s.io/apimachinery/pkg/api/errors", @@ -29,6 +28,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/runtime", "//vendor:k8s.io/apiserver/pkg/features", "//vendor:k8s.io/apiserver/pkg/util/feature", + "//vendor:k8s.io/apiserver/pkg/util/proxy", ], ) @@ -44,7 +44,6 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/util/httpstream:go_default_library", - "//pkg/util/proxy:go_default_library", "//vendor:github.com/stretchr/testify/assert", "//vendor:github.com/stretchr/testify/require", "//vendor:golang.org/x/net/websocket", @@ -53,6 +52,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/util/net", "//vendor:k8s.io/apiserver/pkg/features", "//vendor:k8s.io/apiserver/pkg/util/feature", + "//vendor:k8s.io/apiserver/pkg/util/proxy", ], ) diff --git a/pkg/genericapiserver/registry/rest/BUILD b/pkg/genericapiserver/registry/rest/BUILD index 77dc82fda87..4626913c2bb 100644 --- a/pkg/genericapiserver/registry/rest/BUILD +++ b/pkg/genericapiserver/registry/rest/BUILD @@ -24,13 +24,13 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/validation/genericvalidation:go_default_library", "//pkg/api/validation/path:go_default_library", - "//pkg/util/uuid:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/api/meta", "//vendor:k8s.io/apimachinery/pkg/apis/meta/internalversion", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apimachinery/pkg/util/uuid", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/apiserver/pkg/endpoints/request", @@ -61,8 +61,8 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/util/uuid:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/util/uuid", "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/pkg/genericapiserver/server/filters/BUILD b/pkg/genericapiserver/server/filters/BUILD index 803c4ca6a69..1ae6813567b 100644 --- a/pkg/genericapiserver/server/filters/BUILD +++ b/pkg/genericapiserver/server/filters/BUILD @@ -20,7 +20,6 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/util:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", diff --git a/pkg/genericapiserver/server/openapi/BUILD b/pkg/genericapiserver/server/openapi/BUILD index 37d8761b2c3..f26b599df3e 100644 --- a/pkg/genericapiserver/server/openapi/BUILD +++ b/pkg/genericapiserver/server/openapi/BUILD @@ -18,11 +18,11 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/genericapiserver/server/mux:go_default_library", - "//pkg/util:go_default_library", "//vendor:github.com/emicklei/go-restful", "//vendor:github.com/go-openapi/spec", "//vendor:k8s.io/apimachinery/pkg/openapi", "//vendor:k8s.io/apimachinery/pkg/util/json", + "//vendor:k8s.io/apiserver/pkg/util/trie", ], ) diff --git a/pkg/kubectl/BUILD b/pkg/kubectl/BUILD index a92db92a537..bffada69a2d 100644 --- a/pkg/kubectl/BUILD +++ b/pkg/kubectl/BUILD @@ -89,7 +89,6 @@ go_library( "//pkg/util/intstr:go_default_library", "//pkg/util/node:go_default_library", "//pkg/util/slice:go_default_library", - "//pkg/util/uuid:go_default_library", "//vendor:github.com/emicklei/go-restful/swagger", "//vendor:github.com/ghodss/yaml", "//vendor:github.com/golang/glog", @@ -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/sets", + "//vendor:k8s.io/apimachinery/pkg/util/uuid", "//vendor:k8s.io/apimachinery/pkg/util/validation", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apimachinery/pkg/watch", diff --git a/pkg/kubectl/cmd/BUILD b/pkg/kubectl/cmd/BUILD index 39e37c2b5e1..474f400ab3d 100644 --- a/pkg/kubectl/cmd/BUILD +++ b/pkg/kubectl/cmd/BUILD @@ -93,7 +93,6 @@ go_library( "//pkg/util/i18n:go_default_library", "//pkg/util/interrupt:go_default_library", "//pkg/util/intstr:go_default_library", - "//pkg/util/strategicpatch:go_default_library", "//pkg/util/taints:go_default_library", "//pkg/util/term:go_default_library", "//pkg/version:go_default_library", @@ -117,6 +116,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/util/errors", "//vendor:k8s.io/apimachinery/pkg/util/sets", + "//vendor:k8s.io/apimachinery/pkg/util/strategicpatch", "//vendor:k8s.io/apimachinery/pkg/util/validation", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apimachinery/pkg/util/wait", @@ -188,7 +188,6 @@ go_test( "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/resource:go_default_library", "//pkg/util/intstr:go_default_library", - "//pkg/util/strategicpatch:go_default_library", "//pkg/util/strings:go_default_library", "//pkg/util/term:go_default_library", "//vendor:github.com/spf13/cobra", @@ -201,6 +200,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/runtime/serializer/json", "//vendor:k8s.io/apimachinery/pkg/runtime/serializer/streaming", "//vendor:k8s.io/apimachinery/pkg/types", + "//vendor:k8s.io/apimachinery/pkg/util/strategicpatch", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/rest", diff --git a/pkg/kubectl/cmd/set/BUILD b/pkg/kubectl/cmd/set/BUILD index c1ebc781bae..f7d49bfc252 100644 --- a/pkg/kubectl/cmd/set/BUILD +++ b/pkg/kubectl/cmd/set/BUILD @@ -24,7 +24,6 @@ go_library( "//pkg/kubectl/cmd/templates:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/resource:go_default_library", - "//pkg/util/strategicpatch:go_default_library", "//vendor:github.com/spf13/cobra", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/api/meta", @@ -32,6 +31,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/util/errors", + "//vendor:k8s.io/apimachinery/pkg/util/strategicpatch", "//vendor:k8s.io/apimachinery/pkg/util/validation", ], ) diff --git a/pkg/kubectl/cmd/util/BUILD b/pkg/kubectl/cmd/util/BUILD index 74ad91077ce..60c3c35175a 100644 --- a/pkg/kubectl/cmd/util/BUILD +++ b/pkg/kubectl/cmd/util/BUILD @@ -42,7 +42,6 @@ go_library( "//pkg/kubectl/resource:go_default_library", "//pkg/registry/extensions/thirdpartyresourcedata:go_default_library", "//pkg/util/exec:go_default_library", - "//pkg/util/strategicpatch:go_default_library", "//vendor:github.com/emicklei/go-restful/swagger", "//vendor:github.com/evanphx/json-patch", "//vendor:github.com/golang/glog", @@ -58,6 +57,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/runtime/serializer/json", "//vendor:k8s.io/apimachinery/pkg/util/errors", "//vendor:k8s.io/apimachinery/pkg/util/sets", + "//vendor:k8s.io/apimachinery/pkg/util/strategicpatch", "//vendor:k8s.io/apimachinery/pkg/version", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/apiserver/pkg/util/flag", diff --git a/pkg/kubectl/cmd/util/jsonmerge/BUILD b/pkg/kubectl/cmd/util/jsonmerge/BUILD index 7177fdd1451..70ab48cfd35 100644 --- a/pkg/kubectl/cmd/util/jsonmerge/BUILD +++ b/pkg/kubectl/cmd/util/jsonmerge/BUILD @@ -12,9 +12,9 @@ go_library( srcs = ["jsonmerge.go"], tags = ["automanaged"], deps = [ - "//pkg/util/strategicpatch:go_default_library", "//vendor:github.com/evanphx/json-patch", "//vendor:github.com/golang/glog", + "//vendor:k8s.io/apimachinery/pkg/util/strategicpatch", "//vendor:k8s.io/apimachinery/pkg/util/yaml", ], ) diff --git a/pkg/kubelet/BUILD b/pkg/kubelet/BUILD index 36da8779d6a..e8658366a48 100644 --- a/pkg/kubelet/BUILD +++ b/pkg/kubelet/BUILD @@ -186,8 +186,6 @@ go_test( "//pkg/kubelet/volumemanager:go_default_library", "//pkg/util/bandwidth:go_default_library", "//pkg/util/mount:go_default_library", - "//pkg/util/strategicpatch:go_default_library", - "//pkg/util/uuid:go_default_library", "//pkg/version:go_default_library", "//pkg/volume:go_default_library", "//pkg/volume/host_path:go_default_library", @@ -206,6 +204,8 @@ go_test( "//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/strategicpatch", + "//vendor:k8s.io/apimachinery/pkg/util/uuid", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/client-go/util/clock", "//vendor:k8s.io/client-go/util/flowcontrol", diff --git a/pkg/kubelet/rkt/BUILD b/pkg/kubelet/rkt/BUILD index b192bdfbd25..45bfbdb6f2a 100644 --- a/pkg/kubelet/rkt/BUILD +++ b/pkg/kubelet/rkt/BUILD @@ -42,7 +42,6 @@ go_library( "//pkg/util/selinux:go_default_library", "//pkg/util/strings:go_default_library", "//pkg/util/term:go_default_library", - "//pkg/util/uuid:go_default_library", "//pkg/util/version:go_default_library", "//vendor:github.com/appc/spec/schema", "//vendor:github.com/appc/spec/schema/types", @@ -56,6 +55,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/util/errors", + "//vendor:k8s.io/apimachinery/pkg/util/uuid", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/client-go/util/flowcontrol", ], diff --git a/pkg/registry/core/limitrange/BUILD b/pkg/registry/core/limitrange/BUILD index 5a46b38ee51..25aa55db35b 100644 --- a/pkg/registry/core/limitrange/BUILD +++ b/pkg/registry/core/limitrange/BUILD @@ -19,10 +19,10 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/storage:go_default_library", - "//pkg/util/uuid:go_default_library", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/util/uuid", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", "//vendor:k8s.io/apiserver/pkg/endpoints/request", "//vendor:k8s.io/apiserver/pkg/storage/names", diff --git a/pkg/util/BUILD b/pkg/util/BUILD index 8b411952621..3f2f544c954 100644 --- a/pkg/util/BUILD +++ b/pkg/util/BUILD @@ -14,7 +14,6 @@ go_library( "doc.go", "template.go", "trace.go", - "trie.go", "umask.go", "util.go", ], @@ -84,7 +83,6 @@ filegroup( "//pkg/util/oom:all-srcs", "//pkg/util/parsers:all-srcs", "//pkg/util/procfs:all-srcs", - "//pkg/util/proxy:all-srcs", "//pkg/util/rand:all-srcs", "//pkg/util/resourcecontainer:all-srcs", "//pkg/util/rlimit:all-srcs", @@ -92,7 +90,6 @@ filegroup( "//pkg/util/selinux:all-srcs", "//pkg/util/sets:all-srcs", "//pkg/util/slice:all-srcs", - "//pkg/util/strategicpatch:all-srcs", "//pkg/util/strings:all-srcs", "//pkg/util/sysctl:all-srcs", "//pkg/util/system:all-srcs", diff --git a/pkg/util/httpstream/spdy/BUILD b/pkg/util/httpstream/spdy/BUILD index f10357ce422..695033053ae 100644 --- a/pkg/util/httpstream/spdy/BUILD +++ b/pkg/util/httpstream/spdy/BUILD @@ -19,12 +19,12 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/util/httpstream:go_default_library", - "//third_party/forked/golang/netutil:go_default_library", "//vendor:github.com/docker/spdystream", "//vendor:github.com/golang/glog", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/util/runtime", + "//vendor:k8s.io/apimachinery/third_party/forked/golang/netutil", ], ) diff --git a/pkg/util/node/BUILD b/pkg/util/node/BUILD index 0b73050507f..c6f25d03d8b 100644 --- a/pkg/util/node/BUILD +++ b/pkg/util/node/BUILD @@ -16,10 +16,10 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", - "//pkg/util/strategicpatch:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", + "//vendor:k8s.io/apimachinery/pkg/util/strategicpatch", ], ) diff --git a/staging/src/k8s.io/apimachinery/third_party/forked/golang/netutil/BUILD b/pkg/util/uuid/BUILD similarity index 94% rename from staging/src/k8s.io/apimachinery/third_party/forked/golang/netutil/BUILD rename to pkg/util/uuid/BUILD index 484ab572d3b..deefdcef3c1 100644 --- a/staging/src/k8s.io/apimachinery/third_party/forked/golang/netutil/BUILD +++ b/pkg/util/uuid/BUILD @@ -9,7 +9,7 @@ load( go_library( name = "go_default_library", - srcs = ["addr.go"], + srcs = ["doc.go"], tags = ["automanaged"], ) diff --git a/pkg/volume/host_path/BUILD b/pkg/volume/host_path/BUILD index 8429e9f1723..7556cadde25 100644 --- a/pkg/volume/host_path/BUILD +++ b/pkg/volume/host_path/BUILD @@ -18,10 +18,10 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", - "//pkg/util/uuid:go_default_library", "//pkg/volume:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", + "//vendor:k8s.io/apimachinery/pkg/util/uuid", ], ) @@ -35,11 +35,11 @@ go_test( "//pkg/api/v1:go_default_library", "//pkg/client/clientset_generated/clientset/fake:go_default_library", "//pkg/util:go_default_library", - "//pkg/util/uuid:go_default_library", "//pkg/volume:go_default_library", "//pkg/volume/testing:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", + "//vendor:k8s.io/apimachinery/pkg/util/uuid", ], ) diff --git a/pkg/volume/rbd/BUILD b/pkg/volume/rbd/BUILD index 285efc7c1e8..8780ec7b402 100644 --- a/pkg/volume/rbd/BUILD +++ b/pkg/volume/rbd/BUILD @@ -25,11 +25,11 @@ go_library( "//pkg/util/mount:go_default_library", "//pkg/util/node:go_default_library", "//pkg/util/strings:go_default_library", - "//pkg/util/uuid:go_default_library", "//pkg/volume:go_default_library", "//pkg/volume/util:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/apimachinery/pkg/types", + "//vendor:k8s.io/apimachinery/pkg/util/uuid", ], ) diff --git a/pkg/volume/testing/BUILD b/pkg/volume/testing/BUILD index fd3566106bf..afd1a8290b1 100644 --- a/pkg/volume/testing/BUILD +++ b/pkg/volume/testing/BUILD @@ -22,11 +22,11 @@ go_library( "//pkg/util/io:go_default_library", "//pkg/util/mount:go_default_library", "//pkg/util/strings:go_default_library", - "//pkg/util/uuid:go_default_library", "//pkg/volume:go_default_library", "//vendor:github.com/stretchr/testify/mock", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", + "//vendor:k8s.io/apimachinery/pkg/util/uuid", "//vendor:k8s.io/client-go/util/testing", ], ) diff --git a/pkg/volume/util/operationexecutor/BUILD b/pkg/volume/util/operationexecutor/BUILD index af9aa421fa2..5f34087b1d7 100644 --- a/pkg/volume/util/operationexecutor/BUILD +++ b/pkg/volume/util/operationexecutor/BUILD @@ -40,10 +40,10 @@ go_test( deps = [ "//pkg/api/v1:go_default_library", "//pkg/util/mount:go_default_library", - "//pkg/util/uuid:go_default_library", "//pkg/volume/util/types:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", + "//vendor:k8s.io/apimachinery/pkg/util/uuid", ], ) diff --git a/staging/src/k8s.io/apimachinery/third_party/forked/golang/json/BUILD b/staging/src/k8s.io/apimachinery/third_party/forked/golang/json/BUILD deleted file mode 100644 index 8ecee4c4764..00000000000 --- a/staging/src/k8s.io/apimachinery/third_party/forked/golang/json/BUILD +++ /dev/null @@ -1,27 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = ["fields.go"], - tags = ["automanaged"], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/test/e2e/BUILD b/test/e2e/BUILD index 726901e6d2a..c1b91046b3c 100644 --- a/test/e2e/BUILD +++ b/test/e2e/BUILD @@ -143,7 +143,6 @@ go_library( "//pkg/util/intstr:go_default_library", "//pkg/util/logs:go_default_library", "//pkg/util/system:go_default_library", - "//pkg/util/uuid:go_default_library", "//pkg/util/version:go_default_library", "//pkg/util/workqueue:go_default_library", "//pkg/volume/util/volumehelper:go_default_library", @@ -186,6 +185,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/net", "//vendor:k8s.io/apimachinery/pkg/util/runtime", "//vendor:k8s.io/apimachinery/pkg/util/sets", + "//vendor:k8s.io/apimachinery/pkg/util/uuid", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apimachinery/pkg/util/yaml", "//vendor:k8s.io/apimachinery/pkg/watch", diff --git a/test/e2e/common/BUILD b/test/e2e/common/BUILD index 7df825b499a..084a6243012 100644 --- a/test/e2e/common/BUILD +++ b/test/e2e/common/BUILD @@ -40,7 +40,6 @@ go_library( "//pkg/kubelet/events:go_default_library", "//pkg/kubelet/sysctl:go_default_library", "//pkg/util/intstr:go_default_library", - "//pkg/util/uuid:go_default_library", "//test/e2e/framework:go_default_library", "//test/utils:go_default_library", "//vendor:github.com/golang/glog", @@ -51,6 +50,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/util/sets", + "//vendor:k8s.io/apimachinery/pkg/util/uuid", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apimachinery/pkg/watch", ], diff --git a/test/e2e/framework/BUILD b/test/e2e/framework/BUILD index f01f62a482b..f6d74aef8a7 100644 --- a/test/e2e/framework/BUILD +++ b/test/e2e/framework/BUILD @@ -70,7 +70,6 @@ go_library( "//pkg/util/intstr:go_default_library", "//pkg/util/labels:go_default_library", "//pkg/util/system:go_default_library", - "//pkg/util/uuid:go_default_library", "//pkg/util/version:go_default_library", "//plugin/pkg/scheduler/algorithm/predicates:go_default_library", "//plugin/pkg/scheduler/schedulercache:go_default_library", @@ -102,6 +101,7 @@ go_library( "//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/uuid", "//vendor:k8s.io/apimachinery/pkg/util/validation", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apimachinery/pkg/watch", diff --git a/test/e2e_node/BUILD b/test/e2e_node/BUILD index a58287f0b1d..ea0fb8e6000 100644 --- a/test/e2e_node/BUILD +++ b/test/e2e_node/BUILD @@ -27,7 +27,6 @@ go_library( "//pkg/apis/componentconfig/v1alpha1:go_default_library", "//pkg/kubelet/api/v1alpha1/stats:go_default_library", "//pkg/util/procfs:go_default_library", - "//pkg/util/uuid:go_default_library", "//test/e2e/common:go_default_library", "//test/e2e/framework:go_default_library", "//test/e2e/perftype:go_default_library", @@ -42,6 +41,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/util/runtime", "//vendor:k8s.io/apimachinery/pkg/util/sets", + "//vendor:k8s.io/apimachinery/pkg/util/uuid", "//vendor:k8s.io/apimachinery/pkg/util/wait", ], ) @@ -89,7 +89,6 @@ go_test( "//pkg/metrics:go_default_library", "//pkg/security/apparmor:go_default_library", "//pkg/util/intstr:go_default_library", - "//pkg/util/uuid:go_default_library", "//test/e2e/common:go_default_library", "//test/e2e/framework:go_default_library", "//test/e2e_node/services:go_default_library", @@ -112,6 +111,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", + "//vendor:k8s.io/apimachinery/pkg/util/uuid", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/tools/cache", ], diff --git a/test/utils/BUILD b/test/utils/BUILD index 6a071b57ec1..bb4f8482ed9 100644 --- a/test/utils/BUILD +++ b/test/utils/BUILD @@ -27,7 +27,6 @@ go_library( "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", - "//pkg/util/uuid:go_default_library", "//pkg/util/workqueue:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/apimachinery/pkg/api/errors", @@ -38,6 +37,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/util/sets", + "//vendor:k8s.io/apimachinery/pkg/util/uuid", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apimachinery/pkg/watch", "//vendor:k8s.io/client-go/tools/cache", diff --git a/third_party/BUILD b/third_party/BUILD index 40e69849f73..a6b23dbb672 100644 --- a/third_party/BUILD +++ b/third_party/BUILD @@ -16,8 +16,6 @@ filegroup( "//third_party/forked/etcd237/pkg/fileutil:all-srcs", "//third_party/forked/etcd237/wal:all-srcs", "//third_party/forked/golang/expansion:all-srcs", - "//third_party/forked/golang/json:all-srcs", - "//third_party/forked/golang/netutil:all-srcs", "//third_party/forked/golang/reflect:all-srcs", "//third_party/forked/golang/template:all-srcs", "//third_party/htpasswd:all-srcs", diff --git a/vendor/BUILD b/vendor/BUILD index ce2609f64fb..f166d397dd7 100644 --- a/vendor/BUILD +++ b/vendor/BUILD @@ -13965,3 +13965,83 @@ go_test( "//vendor:k8s.io/client-go/util/testing", ], ) + +go_test( + name = "k8s.io/apimachinery/pkg/util/strategicpatch_test", + srcs = ["k8s.io/apimachinery/pkg/util/strategicpatch/patch_test.go"], + library = ":k8s.io/apimachinery/pkg/util/strategicpatch", + tags = ["automanaged"], + deps = [ + "//vendor:github.com/davecgh/go-spew/spew", + "//vendor:github.com/ghodss/yaml", + ], +) + +go_library( + name = "k8s.io/apimachinery/pkg/util/strategicpatch", + srcs = ["k8s.io/apimachinery/pkg/util/strategicpatch/patch.go"], + tags = ["automanaged"], + deps = [ + "//vendor:github.com/davecgh/go-spew/spew", + "//vendor:github.com/ghodss/yaml", + "//vendor:k8s.io/apimachinery/pkg/util/json", + "//vendor:k8s.io/apimachinery/third_party/forked/golang/json", + ], +) + +go_library( + name = "k8s.io/apimachinery/pkg/util/uuid", + srcs = ["k8s.io/apimachinery/pkg/util/uuid/uuid.go"], + tags = ["automanaged"], + deps = [ + "//vendor:github.com/pborman/uuid", + "//vendor:k8s.io/apimachinery/pkg/types", + ], +) + +go_library( + name = "k8s.io/apimachinery/third_party/forked/golang/json", + srcs = ["k8s.io/apimachinery/third_party/forked/golang/json/fields.go"], + tags = ["automanaged"], +) + +go_library( + name = "k8s.io/apimachinery/third_party/forked/golang/netutil", + srcs = ["k8s.io/apimachinery/third_party/forked/golang/netutil/addr.go"], + tags = ["automanaged"], +) + +go_test( + name = "k8s.io/apiserver/pkg/util/proxy_test", + srcs = [ + "k8s.io/apiserver/pkg/util/proxy/dial_test.go", + "k8s.io/apiserver/pkg/util/proxy/transport_test.go", + ], + library = ":k8s.io/apiserver/pkg/util/proxy", + tags = ["automanaged"], + deps = ["//vendor:k8s.io/apimachinery/pkg/util/net"], +) + +go_library( + name = "k8s.io/apiserver/pkg/util/proxy", + srcs = [ + "k8s.io/apiserver/pkg/util/proxy/dial.go", + "k8s.io/apiserver/pkg/util/proxy/doc.go", + "k8s.io/apiserver/pkg/util/proxy/transport.go", + ], + tags = ["automanaged"], + deps = [ + "//vendor:github.com/golang/glog", + "//vendor:golang.org/x/net/html", + "//vendor:golang.org/x/net/html/atom", + "//vendor:k8s.io/apimachinery/pkg/util/net", + "//vendor:k8s.io/apimachinery/pkg/util/sets", + "//vendor:k8s.io/apimachinery/third_party/forked/golang/netutil", + ], +) + +go_library( + name = "k8s.io/apiserver/pkg/util/trie", + srcs = ["k8s.io/apiserver/pkg/util/trie/trie.go"], + tags = ["automanaged"], +)