diff --git a/pkg/kubelet/BUILD b/pkg/kubelet/BUILD index e8264c3f32b..f2a52599ef1 100644 --- a/pkg/kubelet/BUILD +++ b/pkg/kubelet/BUILD @@ -42,7 +42,6 @@ go_library( "//pkg/fieldpath:go_default_library", "//pkg/kubelet/apis:go_default_library", "//pkg/kubelet/apis/config:go_default_library", - "//pkg/kubelet/apis/pluginregistration/v1:go_default_library", "//pkg/kubelet/apis/podresources:go_default_library", "//pkg/kubelet/cadvisor:go_default_library", "//pkg/kubelet/certificate:go_default_library", @@ -144,6 +143,7 @@ go_library( "//staging/src/k8s.io/cloud-provider:go_default_library", "//staging/src/k8s.io/cri-api/pkg/apis:go_default_library", "//staging/src/k8s.io/cri-api/pkg/apis/runtime/v1alpha2:go_default_library", + "//staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1:go_default_library", "//third_party/forked/golang/expansion:go_default_library", "//vendor/github.com/golang/groupcache/lru:go_default_library", "//vendor/github.com/google/cadvisor/info/v1:go_default_library", diff --git a/pkg/kubelet/apis/BUILD b/pkg/kubelet/apis/BUILD index 686b93bc7b6..38505ce069e 100644 --- a/pkg/kubelet/apis/BUILD +++ b/pkg/kubelet/apis/BUILD @@ -37,11 +37,6 @@ filegroup( srcs = [ ":package-srcs", "//pkg/kubelet/apis/config:all-srcs", - "//pkg/kubelet/apis/deviceplugin/v1alpha:all-srcs", - "//pkg/kubelet/apis/deviceplugin/v1beta1:all-srcs", - "//pkg/kubelet/apis/pluginregistration/v1:all-srcs", - "//pkg/kubelet/apis/pluginregistration/v1alpha1:all-srcs", - "//pkg/kubelet/apis/pluginregistration/v1beta1:all-srcs", "//pkg/kubelet/apis/podresources:all-srcs", "//pkg/kubelet/apis/resourcemetrics/v1alpha1:all-srcs", "//pkg/kubelet/apis/stats/v1alpha1:all-srcs", diff --git a/pkg/kubelet/cm/devicemanager/BUILD b/pkg/kubelet/cm/devicemanager/BUILD index 4bbdbc2068f..909309cd520 100644 --- a/pkg/kubelet/cm/devicemanager/BUILD +++ b/pkg/kubelet/cm/devicemanager/BUILD @@ -16,8 +16,6 @@ go_library( deps = [ "//pkg/apis/core/v1/helper:go_default_library", "//pkg/features:go_default_library", - "//pkg/kubelet/apis/deviceplugin/v1beta1:go_default_library", - "//pkg/kubelet/apis/pluginregistration/v1:go_default_library", "//pkg/kubelet/apis/podresources/v1alpha1:go_default_library", "//pkg/kubelet/checkpointmanager:go_default_library", "//pkg/kubelet/checkpointmanager/errors:go_default_library", @@ -36,6 +34,8 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library", + "//staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1:go_default_library", + "//staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1:go_default_library", "//vendor/google.golang.org/grpc:go_default_library", "//vendor/k8s.io/klog:go_default_library", ], @@ -50,8 +50,6 @@ go_test( ], embed = [":go_default_library"], deps = [ - "//pkg/kubelet/apis/deviceplugin/v1beta1:go_default_library", - "//pkg/kubelet/apis/pluginregistration/v1:go_default_library", "//pkg/kubelet/checkpointmanager:go_default_library", "//pkg/kubelet/cm/topologymanager:go_default_library", "//pkg/kubelet/cm/topologymanager/bitmask:go_default_library", @@ -66,6 +64,8 @@ go_test( "//staging/src/k8s.io/apimachinery/pkg/util/uuid:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library", "//staging/src/k8s.io/client-go/tools/record:go_default_library", + "//staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1:go_default_library", + "//staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1:go_default_library", "//vendor/github.com/stretchr/testify/assert:go_default_library", "//vendor/github.com/stretchr/testify/require:go_default_library", ], diff --git a/pkg/kubelet/pluginmanager/BUILD b/pkg/kubelet/pluginmanager/BUILD index e4bab30cc03..cc7187c871d 100644 --- a/pkg/kubelet/pluginmanager/BUILD +++ b/pkg/kubelet/pluginmanager/BUILD @@ -44,12 +44,12 @@ go_test( srcs = ["plugin_manager_test.go"], embed = [":go_default_library"], deps = [ - "//pkg/kubelet/apis/pluginregistration/v1:go_default_library", "//pkg/kubelet/config:go_default_library", "//pkg/kubelet/pluginmanager/pluginwatcher:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library", "//staging/src/k8s.io/client-go/tools/record:go_default_library", + "//staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1:go_default_library", "//vendor/github.com/stretchr/testify/require:go_default_library", ], ) diff --git a/pkg/kubelet/pluginmanager/operationexecutor/BUILD b/pkg/kubelet/pluginmanager/operationexecutor/BUILD index e6ade14c7fc..859bde70415 100644 --- a/pkg/kubelet/pluginmanager/operationexecutor/BUILD +++ b/pkg/kubelet/pluginmanager/operationexecutor/BUILD @@ -9,10 +9,10 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubelet/pluginmanager/operationexecutor", visibility = ["//visibility:public"], deps = [ - "//pkg/kubelet/apis/pluginregistration/v1:go_default_library", "//pkg/kubelet/pluginmanager/cache:go_default_library", "//pkg/util/goroutinemap:go_default_library", "//staging/src/k8s.io/client-go/tools/record:go_default_library", + "//staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1:go_default_library", "//vendor/github.com/pkg/errors:go_default_library", "//vendor/google.golang.org/grpc:go_default_library", "//vendor/k8s.io/klog:go_default_library", diff --git a/pkg/kubelet/pluginmanager/pluginwatcher/BUILD b/pkg/kubelet/pluginmanager/pluginwatcher/BUILD index ace8b3702c1..06f911a5bc7 100644 --- a/pkg/kubelet/pluginmanager/pluginwatcher/BUILD +++ b/pkg/kubelet/pluginmanager/pluginwatcher/BUILD @@ -10,12 +10,12 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubelet/pluginmanager/pluginwatcher", visibility = ["//visibility:public"], deps = [ - "//pkg/kubelet/apis/pluginregistration/v1:go_default_library", "//pkg/kubelet/pluginmanager/cache:go_default_library", "//pkg/kubelet/pluginmanager/pluginwatcher/example_plugin_apis/v1beta1:go_default_library", "//pkg/kubelet/pluginmanager/pluginwatcher/example_plugin_apis/v1beta2:go_default_library", "//pkg/kubelet/util:go_default_library", "//pkg/util/filesystem:go_default_library", + "//staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1:go_default_library", "//vendor/github.com/fsnotify/fsnotify:go_default_library", "//vendor/golang.org/x/net/context:go_default_library", "//vendor/google.golang.org/grpc:go_default_library", @@ -28,9 +28,9 @@ go_test( srcs = ["plugin_watcher_test.go"], embed = [":go_default_library"], deps = [ - "//pkg/kubelet/apis/pluginregistration/v1:go_default_library", "//pkg/kubelet/pluginmanager/cache:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library", + "//staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1:go_default_library", "//vendor/github.com/stretchr/testify/require:go_default_library", "//vendor/k8s.io/klog:go_default_library", ], diff --git a/pkg/kubelet/pluginmanager/reconciler/BUILD b/pkg/kubelet/pluginmanager/reconciler/BUILD index 8d28162555a..969fe326640 100644 --- a/pkg/kubelet/pluginmanager/reconciler/BUILD +++ b/pkg/kubelet/pluginmanager/reconciler/BUILD @@ -20,12 +20,12 @@ go_test( srcs = ["reconciler_test.go"], embed = [":go_default_library"], deps = [ - "//pkg/kubelet/apis/pluginregistration/v1:go_default_library", "//pkg/kubelet/pluginmanager/cache:go_default_library", "//pkg/kubelet/pluginmanager/operationexecutor:go_default_library", "//pkg/kubelet/pluginmanager/pluginwatcher:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library", "//staging/src/k8s.io/client-go/tools/record:go_default_library", + "//staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1:go_default_library", "//vendor/github.com/stretchr/testify/require:go_default_library", ], ) diff --git a/staging/src/k8s.io/kubelet/BUILD b/staging/src/k8s.io/kubelet/BUILD index 261787b5e62..a53827c1f86 100644 --- a/staging/src/k8s.io/kubelet/BUILD +++ b/staging/src/k8s.io/kubelet/BUILD @@ -10,6 +10,11 @@ filegroup( srcs = [ ":package-srcs", "//staging/src/k8s.io/kubelet/config/v1beta1:all-srcs", + "//staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1alpha:all-srcs", + "//staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1:all-srcs", + "//staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1:all-srcs", + "//staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1alpha1:all-srcs", + "//staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1beta1:all-srcs", ], tags = ["automanaged"], visibility = ["//visibility:public"], diff --git a/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1alpha/BUILD b/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1alpha/BUILD index f797521748d..2969404799a 100644 --- a/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1alpha/BUILD +++ b/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1alpha/BUILD @@ -11,6 +11,7 @@ go_library( "api.pb.go", "constants.go", ], + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubelet/pkg/apis/deviceplugin/v1alpha", importpath = "k8s.io/kubelet/pkg/apis/deviceplugin/v1alpha", deps = [ "//vendor/github.com/gogo/protobuf/gogoproto:go_default_library", diff --git a/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1/BUILD b/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1/BUILD index 7cf64908d16..85b6411943e 100644 --- a/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1/BUILD +++ b/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1/BUILD @@ -11,6 +11,7 @@ go_library( "api.pb.go", "constants.go", ], + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1", importpath = "k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1", deps = [ "//vendor/github.com/gogo/protobuf/gogoproto:go_default_library", diff --git a/staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1/BUILD b/staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1/BUILD index 6cef4de641d..0ea7e6ec74b 100644 --- a/staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1/BUILD +++ b/staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1/BUILD @@ -11,6 +11,7 @@ go_library( "api.pb.go", "constants.go", ], + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubelet/pkg/apis/pluginregistration/v1", importpath = "k8s.io/kubelet/pkg/apis/pluginregistration/v1", deps = [ "//vendor/github.com/gogo/protobuf/gogoproto:go_default_library", diff --git a/staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1alpha1/BUILD b/staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1alpha1/BUILD index 8c3a84ea152..9df69de5123 100644 --- a/staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1alpha1/BUILD +++ b/staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1alpha1/BUILD @@ -11,6 +11,7 @@ go_library( "api.pb.go", "constants.go", ], + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubelet/pkg/apis/pluginregistration/v1alpha1", importpath = "k8s.io/kubelet/pkg/apis/pluginregistration/v1alpha1", deps = [ "//vendor/github.com/gogo/protobuf/gogoproto:go_default_library", diff --git a/staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1beta1/BUILD b/staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1beta1/BUILD index 962a44c95b5..ed3100eb13d 100644 --- a/staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1beta1/BUILD +++ b/staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1beta1/BUILD @@ -11,6 +11,7 @@ go_library( "api.pb.go", "constants.go", ], + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubelet/pkg/apis/pluginregistration/v1beta1", importpath = "k8s.io/kubelet/pkg/apis/pluginregistration/v1beta1", deps = [ "//vendor/github.com/gogo/protobuf/gogoproto:go_default_library", diff --git a/test/images/sample-device-plugin/BUILD b/test/images/sample-device-plugin/BUILD index 15e7fc6b2c2..1a8ba9f0527 100644 --- a/test/images/sample-device-plugin/BUILD +++ b/test/images/sample-device-plugin/BUILD @@ -8,8 +8,8 @@ go_library( importpath = "k8s.io/kubernetes/test/images/sample-device-plugin", visibility = ["//visibility:private"], deps = [ - "//pkg/kubelet/apis/deviceplugin/v1beta1:go_default_library", "//pkg/kubelet/cm/devicemanager:go_default_library", + "//staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1:go_default_library", "//vendor/k8s.io/klog:go_default_library", ], )