diff --git a/hack/.golint_failures b/hack/.golint_failures index 3fff57a95c7..a33c6405c17 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -111,7 +111,6 @@ pkg/kubectl/cmd/convert pkg/kubectl/cmd/get pkg/kubelet/apis/config pkg/kubelet/apis/config/v1beta1 -pkg/kubelet/apis/deviceplugin/v1beta1 pkg/kubelet/checkpointmanager/testing/example_checkpoint_formats/v1 pkg/kubelet/cm pkg/kubelet/config diff --git a/hack/.import-aliases b/hack/.import-aliases index c504b06ee66..87cc94be1f2 100644 --- a/hack/.import-aliases +++ b/hack/.import-aliases @@ -39,11 +39,11 @@ "k8s.io/api/storage/v1beta1": "storagev1beta1", "k8s.io/kubernetes/pkg/controller/apis/config/v1alpha1": "controllerconfigv1alpha1", "k8s.io/kubernetes/pkg/kubelet/apis/config/v1beta1": "kubeletconfigv1beta1", - "k8s.io/kubernetes/pkg/kubelet/apis/deviceplugin/v1alpha": "kubeletdevicepluginv1alpha", - "k8s.io/kubernetes/pkg/kubelet/apis/deviceplugin/v1beta1": "kubeletdevicepluginv1beta1", - "k8s.io/kubernetes/pkg/kubelet/apis/pluginregistration/v1": "kubeletpluginregistrationv1", - "k8s.io/kubernetes/pkg/kubelet/apis/pluginregistration/v1alpha1": "kubeletpluginregistrationv1alpha1", - "k8s.io/kubernetes/pkg/kubelet/apis/pluginregistration/v1beta1": "kubeletpluginregistrationv1beta1", + "k8s.io/kubelet/pkg/apis/deviceplugin/v1alpha": "kubeletdevicepluginv1alpha", + "k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1": "kubeletdevicepluginv1beta1", + "k8s.io/kubelet/pkg/apis/pluginregistration/v1": "kubeletpluginregistrationv1", + "k8s.io/kubelet/pkg/apis/pluginregistration/v1alpha1": "kubeletpluginregistrationv1alpha1", + "k8s.io/kubelet/pkg/apis/pluginregistration/v1beta1": "kubeletpluginregistrationv1beta1", "k8s.io/kubernetes/pkg/kubelet/apis/podresources/v1alpha1": "kubeletpodresourcesv1alpha1", "k8s.io/kubernetes/pkg/kubelet/apis/resourcemetrics/v1alpha1": "kubeletresourcemetricsv1alpha1", "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1": "kubeletstatsv1alpha1", diff --git a/hack/update-generated-device-plugin-dockerized.sh b/hack/update-generated-device-plugin-dockerized.sh index 4812baeebd6..868d8007467 100755 --- a/hack/update-generated-device-plugin-dockerized.sh +++ b/hack/update-generated-device-plugin-dockerized.sh @@ -19,8 +19,8 @@ set -o nounset set -o pipefail KUBE_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../" && pwd -P)" -DEVICE_PLUGIN_ALPHA="${KUBE_ROOT}/pkg/kubelet/apis/deviceplugin/v1alpha/" -DEVICE_PLUGIN_V1BETA1="${KUBE_ROOT}/pkg/kubelet/apis/deviceplugin/v1beta1/" +DEVICE_PLUGIN_ALPHA="${KUBE_ROOT}/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1alpha/" +DEVICE_PLUGIN_V1BETA1="${KUBE_ROOT}/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1/" source "${KUBE_ROOT}/hack/lib/protoc.sh" kube::protoc::generate_proto "${DEVICE_PLUGIN_ALPHA}" diff --git a/hack/verify-generated-device-plugin.sh b/hack/verify-generated-device-plugin.sh index d748a039fc2..720b4a1d821 100755 --- a/hack/verify-generated-device-plugin.sh +++ b/hack/verify-generated-device-plugin.sh @@ -20,8 +20,8 @@ set -o pipefail KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. ERROR="Device plugin api is out of date. Please run hack/update-generated-device-plugin.sh" -DEVICE_PLUGIN_ALPHA="${KUBE_ROOT}/pkg/kubelet/apis/deviceplugin/v1alpha/" -DEVICE_PLUGIN_V1BETA1="${KUBE_ROOT}/pkg/kubelet/apis/deviceplugin/v1beta1/" +DEVICE_PLUGIN_ALPHA="${KUBE_ROOT}/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1alpha/" +DEVICE_PLUGIN_V1BETA1="${KUBE_ROOT}/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1/" source "${KUBE_ROOT}/hack/lib/protoc.sh" kube::golang::setup_env diff --git a/pkg/kubelet/cm/devicemanager/device_plugin_stub.go b/pkg/kubelet/cm/devicemanager/device_plugin_stub.go index f0c7bc2641c..7faaba04cdc 100644 --- a/pkg/kubelet/cm/devicemanager/device_plugin_stub.go +++ b/pkg/kubelet/cm/devicemanager/device_plugin_stub.go @@ -27,8 +27,8 @@ import ( "google.golang.org/grpc" - pluginapi "k8s.io/kubernetes/pkg/kubelet/apis/deviceplugin/v1beta1" - watcherapi "k8s.io/kubernetes/pkg/kubelet/apis/pluginregistration/v1" + pluginapi "k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1" + watcherapi "k8s.io/kubelet/pkg/apis/pluginregistration/v1" ) // Stub implementation for DevicePlugin. diff --git a/pkg/kubelet/cm/devicemanager/endpoint.go b/pkg/kubelet/cm/devicemanager/endpoint.go index ff8ba061d5d..7a5994d8836 100644 --- a/pkg/kubelet/cm/devicemanager/endpoint.go +++ b/pkg/kubelet/cm/devicemanager/endpoint.go @@ -26,7 +26,7 @@ import ( "google.golang.org/grpc" "k8s.io/klog" - pluginapi "k8s.io/kubernetes/pkg/kubelet/apis/deviceplugin/v1beta1" + pluginapi "k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1" ) // endpoint maps to a single registered device plugin. It is responsible diff --git a/pkg/kubelet/cm/devicemanager/endpoint_test.go b/pkg/kubelet/cm/devicemanager/endpoint_test.go index 86756aac8a0..27050cbf6e6 100644 --- a/pkg/kubelet/cm/devicemanager/endpoint_test.go +++ b/pkg/kubelet/cm/devicemanager/endpoint_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/require" - pluginapi "k8s.io/kubernetes/pkg/kubelet/apis/deviceplugin/v1beta1" + pluginapi "k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1" ) var ( diff --git a/pkg/kubelet/cm/devicemanager/manager.go b/pkg/kubelet/cm/devicemanager/manager.go index 12a5c6da900..440fd6b6a53 100644 --- a/pkg/kubelet/cm/devicemanager/manager.go +++ b/pkg/kubelet/cm/devicemanager/manager.go @@ -35,7 +35,7 @@ import ( utilfeature "k8s.io/apiserver/pkg/util/feature" v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper" "k8s.io/kubernetes/pkg/features" - pluginapi "k8s.io/kubernetes/pkg/kubelet/apis/deviceplugin/v1beta1" + pluginapi "k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1" podresourcesapi "k8s.io/kubernetes/pkg/kubelet/apis/podresources/v1alpha1" "k8s.io/kubernetes/pkg/kubelet/checkpointmanager" "k8s.io/kubernetes/pkg/kubelet/checkpointmanager/errors" diff --git a/pkg/kubelet/cm/devicemanager/manager_test.go b/pkg/kubelet/cm/devicemanager/manager_test.go index b41e3a95d32..f810c33511e 100644 --- a/pkg/kubelet/cm/devicemanager/manager_test.go +++ b/pkg/kubelet/cm/devicemanager/manager_test.go @@ -34,8 +34,8 @@ import ( "k8s.io/apimachinery/pkg/util/uuid" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/tools/record" - pluginapi "k8s.io/kubernetes/pkg/kubelet/apis/deviceplugin/v1beta1" - watcherapi "k8s.io/kubernetes/pkg/kubelet/apis/pluginregistration/v1" + pluginapi "k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1" + watcherapi "k8s.io/kubelet/pkg/apis/pluginregistration/v1" "k8s.io/kubernetes/pkg/kubelet/checkpointmanager" "k8s.io/kubernetes/pkg/kubelet/cm/topologymanager" "k8s.io/kubernetes/pkg/kubelet/config" diff --git a/pkg/kubelet/cm/devicemanager/pod_devices.go b/pkg/kubelet/cm/devicemanager/pod_devices.go index 4fd4b196c4e..4e45facf434 100644 --- a/pkg/kubelet/cm/devicemanager/pod_devices.go +++ b/pkg/kubelet/cm/devicemanager/pod_devices.go @@ -20,7 +20,7 @@ import ( "k8s.io/klog" "k8s.io/apimachinery/pkg/util/sets" - pluginapi "k8s.io/kubernetes/pkg/kubelet/apis/deviceplugin/v1beta1" + pluginapi "k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1" podresourcesapi "k8s.io/kubernetes/pkg/kubelet/apis/podresources/v1alpha1" "k8s.io/kubernetes/pkg/kubelet/cm/devicemanager/checkpoint" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" diff --git a/pkg/kubelet/cm/devicemanager/topology_hints_test.go b/pkg/kubelet/cm/devicemanager/topology_hints_test.go index 55179dab967..1222e042e45 100644 --- a/pkg/kubelet/cm/devicemanager/topology_hints_test.go +++ b/pkg/kubelet/cm/devicemanager/topology_hints_test.go @@ -24,7 +24,7 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/util/sets" - pluginapi "k8s.io/kubernetes/pkg/kubelet/apis/deviceplugin/v1beta1" + pluginapi "k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1" "k8s.io/kubernetes/pkg/kubelet/cm/topologymanager" "k8s.io/kubernetes/pkg/kubelet/cm/topologymanager/bitmask" ) diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index 994e502b794..3c08454b2de 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -57,7 +57,7 @@ import ( api "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/features" kubeletconfiginternal "k8s.io/kubernetes/pkg/kubelet/apis/config" - pluginwatcherapi "k8s.io/kubernetes/pkg/kubelet/apis/pluginregistration/v1" + pluginwatcherapi "k8s.io/kubelet/pkg/apis/pluginregistration/v1" "k8s.io/kubernetes/pkg/kubelet/apis/podresources" "k8s.io/kubernetes/pkg/kubelet/cadvisor" kubeletcertificate "k8s.io/kubernetes/pkg/kubelet/certificate" diff --git a/pkg/kubelet/pluginmanager/operationexecutor/operation_generator.go b/pkg/kubelet/pluginmanager/operationexecutor/operation_generator.go index ef9de12a138..54e503ec3e0 100644 --- a/pkg/kubelet/pluginmanager/operationexecutor/operation_generator.go +++ b/pkg/kubelet/pluginmanager/operationexecutor/operation_generator.go @@ -31,7 +31,7 @@ import ( "github.com/pkg/errors" "google.golang.org/grpc" "k8s.io/client-go/tools/record" - registerapi "k8s.io/kubernetes/pkg/kubelet/apis/pluginregistration/v1" + registerapi "k8s.io/kubelet/pkg/apis/pluginregistration/v1" "k8s.io/kubernetes/pkg/kubelet/pluginmanager/cache" ) diff --git a/pkg/kubelet/pluginmanager/plugin_manager_test.go b/pkg/kubelet/pluginmanager/plugin_manager_test.go index 0bb703a01f2..1b58b392174 100644 --- a/pkg/kubelet/pluginmanager/plugin_manager_test.go +++ b/pkg/kubelet/pluginmanager/plugin_manager_test.go @@ -28,7 +28,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/tools/record" - registerapi "k8s.io/kubernetes/pkg/kubelet/apis/pluginregistration/v1" + registerapi "k8s.io/kubelet/pkg/apis/pluginregistration/v1" "k8s.io/kubernetes/pkg/kubelet/config" "k8s.io/kubernetes/pkg/kubelet/pluginmanager/pluginwatcher" ) diff --git a/pkg/kubelet/pluginmanager/pluginwatcher/example_handler.go b/pkg/kubelet/pluginmanager/pluginwatcher/example_handler.go index a428ec24c06..02d6b83215a 100644 --- a/pkg/kubelet/pluginmanager/pluginwatcher/example_handler.go +++ b/pkg/kubelet/pluginmanager/pluginwatcher/example_handler.go @@ -28,7 +28,7 @@ import ( "google.golang.org/grpc" "k8s.io/klog" - registerapi "k8s.io/kubernetes/pkg/kubelet/apis/pluginregistration/v1" + registerapi "k8s.io/kubelet/pkg/apis/pluginregistration/v1" v1beta1 "k8s.io/kubernetes/pkg/kubelet/pluginmanager/pluginwatcher/example_plugin_apis/v1beta1" v1beta2 "k8s.io/kubernetes/pkg/kubelet/pluginmanager/pluginwatcher/example_plugin_apis/v1beta2" ) diff --git a/pkg/kubelet/pluginmanager/pluginwatcher/example_plugin.go b/pkg/kubelet/pluginmanager/pluginwatcher/example_plugin.go index be127d77b60..f098274127d 100644 --- a/pkg/kubelet/pluginmanager/pluginwatcher/example_plugin.go +++ b/pkg/kubelet/pluginmanager/pluginwatcher/example_plugin.go @@ -28,7 +28,7 @@ import ( "google.golang.org/grpc" "k8s.io/klog" - registerapi "k8s.io/kubernetes/pkg/kubelet/apis/pluginregistration/v1" + registerapi "k8s.io/kubelet/pkg/apis/pluginregistration/v1" "k8s.io/kubernetes/pkg/kubelet/pluginmanager/cache" v1beta1 "k8s.io/kubernetes/pkg/kubelet/pluginmanager/pluginwatcher/example_plugin_apis/v1beta1" v1beta2 "k8s.io/kubernetes/pkg/kubelet/pluginmanager/pluginwatcher/example_plugin_apis/v1beta2" diff --git a/pkg/kubelet/pluginmanager/pluginwatcher/plugin_watcher_test.go b/pkg/kubelet/pluginmanager/pluginwatcher/plugin_watcher_test.go index 778c0db0bf4..90f84e57498 100644 --- a/pkg/kubelet/pluginmanager/pluginwatcher/plugin_watcher_test.go +++ b/pkg/kubelet/pluginmanager/pluginwatcher/plugin_watcher_test.go @@ -28,7 +28,7 @@ import ( "github.com/stretchr/testify/require" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/klog" - registerapi "k8s.io/kubernetes/pkg/kubelet/apis/pluginregistration/v1" + registerapi "k8s.io/kubelet/pkg/apis/pluginregistration/v1" "k8s.io/kubernetes/pkg/kubelet/pluginmanager/cache" ) diff --git a/pkg/kubelet/pluginmanager/reconciler/reconciler_test.go b/pkg/kubelet/pluginmanager/reconciler/reconciler_test.go index 0a6adb5ae09..563853fce01 100644 --- a/pkg/kubelet/pluginmanager/reconciler/reconciler_test.go +++ b/pkg/kubelet/pluginmanager/reconciler/reconciler_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/require" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/tools/record" - registerapi "k8s.io/kubernetes/pkg/kubelet/apis/pluginregistration/v1" + registerapi "k8s.io/kubelet/pkg/apis/pluginregistration/v1" "k8s.io/kubernetes/pkg/kubelet/pluginmanager/cache" "k8s.io/kubernetes/pkg/kubelet/pluginmanager/operationexecutor" "k8s.io/kubernetes/pkg/kubelet/pluginmanager/pluginwatcher" diff --git a/pkg/kubelet/apis/deviceplugin/OWNERS b/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/OWNERS similarity index 100% rename from pkg/kubelet/apis/deviceplugin/OWNERS rename to staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/OWNERS diff --git a/pkg/kubelet/apis/deviceplugin/v1alpha/BUILD b/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1alpha/BUILD similarity index 92% rename from pkg/kubelet/apis/deviceplugin/v1alpha/BUILD rename to staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1alpha/BUILD index 1cd205c7e98..f797521748d 100644 --- a/pkg/kubelet/apis/deviceplugin/v1alpha/BUILD +++ b/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1alpha/BUILD @@ -11,7 +11,7 @@ go_library( "api.pb.go", "constants.go", ], - importpath = "k8s.io/kubernetes/pkg/kubelet/apis/deviceplugin/v1alpha", + importpath = "k8s.io/kubelet/pkg/apis/deviceplugin/v1alpha", deps = [ "//vendor/github.com/gogo/protobuf/gogoproto:go_default_library", "//vendor/github.com/gogo/protobuf/proto:go_default_library", diff --git a/pkg/kubelet/apis/deviceplugin/v1alpha/api.pb.go b/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1alpha/api.pb.go similarity index 100% rename from pkg/kubelet/apis/deviceplugin/v1alpha/api.pb.go rename to staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1alpha/api.pb.go diff --git a/pkg/kubelet/apis/deviceplugin/v1alpha/api.proto b/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1alpha/api.proto similarity index 100% rename from pkg/kubelet/apis/deviceplugin/v1alpha/api.proto rename to staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1alpha/api.proto diff --git a/pkg/kubelet/apis/deviceplugin/v1alpha/constants.go b/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1alpha/constants.go similarity index 100% rename from pkg/kubelet/apis/deviceplugin/v1alpha/constants.go rename to staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1alpha/constants.go diff --git a/pkg/kubelet/apis/deviceplugin/v1beta1/BUILD b/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1/BUILD similarity index 92% rename from pkg/kubelet/apis/deviceplugin/v1beta1/BUILD rename to staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1/BUILD index a6c83daeef5..7cf64908d16 100644 --- a/pkg/kubelet/apis/deviceplugin/v1beta1/BUILD +++ b/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1/BUILD @@ -11,7 +11,7 @@ go_library( "api.pb.go", "constants.go", ], - importpath = "k8s.io/kubernetes/pkg/kubelet/apis/deviceplugin/v1beta1", + importpath = "k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1", deps = [ "//vendor/github.com/gogo/protobuf/gogoproto:go_default_library", "//vendor/github.com/gogo/protobuf/proto:go_default_library", diff --git a/pkg/kubelet/apis/deviceplugin/v1beta1/api.pb.go b/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1/api.pb.go similarity index 100% rename from pkg/kubelet/apis/deviceplugin/v1beta1/api.pb.go rename to staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1/api.pb.go diff --git a/pkg/kubelet/apis/deviceplugin/v1beta1/api.proto b/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1/api.proto similarity index 100% rename from pkg/kubelet/apis/deviceplugin/v1beta1/api.proto rename to staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1/api.proto diff --git a/pkg/kubelet/apis/deviceplugin/v1beta1/constants.go b/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1/constants.go similarity index 100% rename from pkg/kubelet/apis/deviceplugin/v1beta1/constants.go rename to staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1/constants.go diff --git a/pkg/kubelet/apis/pluginregistration/v1/BUILD b/staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1/BUILD similarity index 90% rename from pkg/kubelet/apis/pluginregistration/v1/BUILD rename to staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1/BUILD index 644c05e1be2..6cef4de641d 100644 --- a/pkg/kubelet/apis/pluginregistration/v1/BUILD +++ b/staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1/BUILD @@ -11,7 +11,7 @@ go_library( "api.pb.go", "constants.go", ], - importpath = "k8s.io/kubernetes/pkg/kubelet/apis/pluginregistration/v1", + importpath = "k8s.io/kubelet/pkg/apis/pluginregistration/v1", deps = [ "//vendor/github.com/gogo/protobuf/gogoproto:go_default_library", "//vendor/github.com/gogo/protobuf/proto:go_default_library", diff --git a/pkg/kubelet/apis/pluginregistration/v1/api.pb.go b/staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1/api.pb.go similarity index 100% rename from pkg/kubelet/apis/pluginregistration/v1/api.pb.go rename to staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1/api.pb.go diff --git a/pkg/kubelet/apis/pluginregistration/v1/api.proto b/staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1/api.proto similarity index 100% rename from pkg/kubelet/apis/pluginregistration/v1/api.proto rename to staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1/api.proto diff --git a/pkg/kubelet/apis/pluginregistration/v1/constants.go b/staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1/constants.go similarity index 100% rename from pkg/kubelet/apis/pluginregistration/v1/constants.go rename to staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1/constants.go diff --git a/pkg/kubelet/apis/pluginregistration/v1beta1/BUILD b/staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1alpha1/BUILD similarity index 90% rename from pkg/kubelet/apis/pluginregistration/v1beta1/BUILD rename to staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1alpha1/BUILD index 71b0625f4e5..8c3a84ea152 100644 --- a/pkg/kubelet/apis/pluginregistration/v1beta1/BUILD +++ b/staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1alpha1/BUILD @@ -11,7 +11,7 @@ go_library( "api.pb.go", "constants.go", ], - importpath = "k8s.io/kubernetes/pkg/kubelet/apis/pluginregistration/v1beta1", + importpath = "k8s.io/kubelet/pkg/apis/pluginregistration/v1alpha1", deps = [ "//vendor/github.com/gogo/protobuf/gogoproto:go_default_library", "//vendor/github.com/gogo/protobuf/proto:go_default_library", diff --git a/pkg/kubelet/apis/pluginregistration/v1alpha1/api.pb.go b/staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1alpha1/api.pb.go similarity index 100% rename from pkg/kubelet/apis/pluginregistration/v1alpha1/api.pb.go rename to staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1alpha1/api.pb.go diff --git a/pkg/kubelet/apis/pluginregistration/v1alpha1/api.proto b/staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1alpha1/api.proto similarity index 100% rename from pkg/kubelet/apis/pluginregistration/v1alpha1/api.proto rename to staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1alpha1/api.proto diff --git a/pkg/kubelet/apis/pluginregistration/v1alpha1/constants.go b/staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1alpha1/constants.go similarity index 100% rename from pkg/kubelet/apis/pluginregistration/v1alpha1/constants.go rename to staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1alpha1/constants.go diff --git a/pkg/kubelet/apis/pluginregistration/v1alpha1/BUILD b/staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1beta1/BUILD similarity index 90% rename from pkg/kubelet/apis/pluginregistration/v1alpha1/BUILD rename to staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1beta1/BUILD index 164a8cb3a11..962a44c95b5 100644 --- a/pkg/kubelet/apis/pluginregistration/v1alpha1/BUILD +++ b/staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1beta1/BUILD @@ -11,7 +11,7 @@ go_library( "api.pb.go", "constants.go", ], - importpath = "k8s.io/kubernetes/pkg/kubelet/apis/pluginregistration/v1alpha1", + importpath = "k8s.io/kubelet/pkg/apis/pluginregistration/v1beta1", deps = [ "//vendor/github.com/gogo/protobuf/gogoproto:go_default_library", "//vendor/github.com/gogo/protobuf/proto:go_default_library", diff --git a/pkg/kubelet/apis/pluginregistration/v1beta1/api.pb.go b/staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1beta1/api.pb.go similarity index 100% rename from pkg/kubelet/apis/pluginregistration/v1beta1/api.pb.go rename to staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1beta1/api.pb.go diff --git a/pkg/kubelet/apis/pluginregistration/v1beta1/api.proto b/staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1beta1/api.proto similarity index 100% rename from pkg/kubelet/apis/pluginregistration/v1beta1/api.proto rename to staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1beta1/api.proto diff --git a/pkg/kubelet/apis/pluginregistration/v1beta1/constants.go b/staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1beta1/constants.go similarity index 100% rename from pkg/kubelet/apis/pluginregistration/v1beta1/constants.go rename to staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1beta1/constants.go diff --git a/test/images/sample-device-plugin/sampledeviceplugin.go b/test/images/sample-device-plugin/sampledeviceplugin.go index 1c8003db592..89de2033c43 100644 --- a/test/images/sample-device-plugin/sampledeviceplugin.go +++ b/test/images/sample-device-plugin/sampledeviceplugin.go @@ -23,7 +23,7 @@ import ( "time" "k8s.io/klog" - pluginapi "k8s.io/kubernetes/pkg/kubelet/apis/deviceplugin/v1beta1" + pluginapi "k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1" dm "k8s.io/kubernetes/pkg/kubelet/cm/devicemanager" )