From d30c489c54c5e6d41ae3a1e1fcd96d24dba4fc51 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Sun, 6 Oct 2019 15:24:24 -0400 Subject: [PATCH 1/5] Move pkg/kubelet/pluginregistration and deviceplugin Change-Id: I06adcb43bd278b430ffad2010869e1524c8cc4ff --- hack/.golint_failures | 1 - hack/.import-aliases | 10 +++++----- hack/update-generated-device-plugin-dockerized.sh | 4 ++-- hack/verify-generated-device-plugin.sh | 4 ++-- pkg/kubelet/cm/devicemanager/device_plugin_stub.go | 4 ++-- pkg/kubelet/cm/devicemanager/endpoint.go | 2 +- pkg/kubelet/cm/devicemanager/endpoint_test.go | 2 +- pkg/kubelet/cm/devicemanager/manager.go | 2 +- pkg/kubelet/cm/devicemanager/manager_test.go | 4 ++-- pkg/kubelet/cm/devicemanager/pod_devices.go | 2 +- pkg/kubelet/cm/devicemanager/topology_hints_test.go | 2 +- pkg/kubelet/kubelet.go | 2 +- .../operationexecutor/operation_generator.go | 2 +- pkg/kubelet/pluginmanager/plugin_manager_test.go | 2 +- .../pluginmanager/pluginwatcher/example_handler.go | 2 +- .../pluginmanager/pluginwatcher/example_plugin.go | 2 +- .../pluginmanager/pluginwatcher/plugin_watcher_test.go | 2 +- .../pluginmanager/reconciler/reconciler_test.go | 2 +- .../src/k8s.io/kubelet/pkg}/apis/deviceplugin/OWNERS | 0 .../kubelet/pkg}/apis/deviceplugin/v1alpha/BUILD | 2 +- .../kubelet/pkg}/apis/deviceplugin/v1alpha/api.pb.go | 0 .../kubelet/pkg}/apis/deviceplugin/v1alpha/api.proto | 0 .../pkg}/apis/deviceplugin/v1alpha/constants.go | 0 .../kubelet/pkg}/apis/deviceplugin/v1beta1/BUILD | 2 +- .../kubelet/pkg}/apis/deviceplugin/v1beta1/api.pb.go | 0 .../kubelet/pkg}/apis/deviceplugin/v1beta1/api.proto | 0 .../pkg}/apis/deviceplugin/v1beta1/constants.go | 0 .../kubelet/pkg}/apis/pluginregistration/v1/BUILD | 2 +- .../kubelet/pkg}/apis/pluginregistration/v1/api.pb.go | 0 .../kubelet/pkg}/apis/pluginregistration/v1/api.proto | 0 .../pkg}/apis/pluginregistration/v1/constants.go | 0 .../pkg/apis/pluginregistration/v1alpha1}/BUILD | 2 +- .../pkg}/apis/pluginregistration/v1alpha1/api.pb.go | 0 .../pkg}/apis/pluginregistration/v1alpha1/api.proto | 0 .../pkg}/apis/pluginregistration/v1alpha1/constants.go | 0 .../kubelet/pkg/apis/pluginregistration/v1beta1}/BUILD | 2 +- .../pkg}/apis/pluginregistration/v1beta1/api.pb.go | 0 .../pkg}/apis/pluginregistration/v1beta1/api.proto | 0 .../pkg}/apis/pluginregistration/v1beta1/constants.go | 0 test/images/sample-device-plugin/sampledeviceplugin.go | 2 +- 40 files changed, 31 insertions(+), 32 deletions(-) rename {pkg/kubelet => staging/src/k8s.io/kubelet/pkg}/apis/deviceplugin/OWNERS (100%) rename {pkg/kubelet => staging/src/k8s.io/kubelet/pkg}/apis/deviceplugin/v1alpha/BUILD (92%) rename {pkg/kubelet => staging/src/k8s.io/kubelet/pkg}/apis/deviceplugin/v1alpha/api.pb.go (100%) rename {pkg/kubelet => staging/src/k8s.io/kubelet/pkg}/apis/deviceplugin/v1alpha/api.proto (100%) rename {pkg/kubelet => staging/src/k8s.io/kubelet/pkg}/apis/deviceplugin/v1alpha/constants.go (100%) rename {pkg/kubelet => staging/src/k8s.io/kubelet/pkg}/apis/deviceplugin/v1beta1/BUILD (92%) rename {pkg/kubelet => staging/src/k8s.io/kubelet/pkg}/apis/deviceplugin/v1beta1/api.pb.go (100%) rename {pkg/kubelet => staging/src/k8s.io/kubelet/pkg}/apis/deviceplugin/v1beta1/api.proto (100%) rename {pkg/kubelet => staging/src/k8s.io/kubelet/pkg}/apis/deviceplugin/v1beta1/constants.go (100%) rename {pkg/kubelet => staging/src/k8s.io/kubelet/pkg}/apis/pluginregistration/v1/BUILD (90%) rename {pkg/kubelet => staging/src/k8s.io/kubelet/pkg}/apis/pluginregistration/v1/api.pb.go (100%) rename {pkg/kubelet => staging/src/k8s.io/kubelet/pkg}/apis/pluginregistration/v1/api.proto (100%) rename {pkg/kubelet => staging/src/k8s.io/kubelet/pkg}/apis/pluginregistration/v1/constants.go (100%) rename {pkg/kubelet/apis/pluginregistration/v1beta1 => staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1alpha1}/BUILD (90%) rename {pkg/kubelet => staging/src/k8s.io/kubelet/pkg}/apis/pluginregistration/v1alpha1/api.pb.go (100%) rename {pkg/kubelet => staging/src/k8s.io/kubelet/pkg}/apis/pluginregistration/v1alpha1/api.proto (100%) rename {pkg/kubelet => staging/src/k8s.io/kubelet/pkg}/apis/pluginregistration/v1alpha1/constants.go (100%) rename {pkg/kubelet/apis/pluginregistration/v1alpha1 => staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1beta1}/BUILD (90%) rename {pkg/kubelet => staging/src/k8s.io/kubelet/pkg}/apis/pluginregistration/v1beta1/api.pb.go (100%) rename {pkg/kubelet => staging/src/k8s.io/kubelet/pkg}/apis/pluginregistration/v1beta1/api.proto (100%) rename {pkg/kubelet => staging/src/k8s.io/kubelet/pkg}/apis/pluginregistration/v1beta1/constants.go (100%) 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" ) From 6ecc0f83af9ea74d1a6fbc3f04c3b2c984bfc4f4 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Sun, 6 Oct 2019 15:29:23 -0400 Subject: [PATCH 2/5] update bazel BUILD files Change-Id: Ia3917cec1453c0b22a958faf8c22bccd79242d14 --- pkg/kubelet/BUILD | 2 +- pkg/kubelet/apis/BUILD | 5 ----- pkg/kubelet/cm/devicemanager/BUILD | 8 ++++---- pkg/kubelet/pluginmanager/BUILD | 2 +- pkg/kubelet/pluginmanager/operationexecutor/BUILD | 2 +- pkg/kubelet/pluginmanager/pluginwatcher/BUILD | 4 ++-- pkg/kubelet/pluginmanager/reconciler/BUILD | 2 +- staging/src/k8s.io/kubelet/BUILD | 5 +++++ .../k8s.io/kubelet/pkg/apis/deviceplugin/v1alpha/BUILD | 1 + .../k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1/BUILD | 1 + .../k8s.io/kubelet/pkg/apis/pluginregistration/v1/BUILD | 1 + .../kubelet/pkg/apis/pluginregistration/v1alpha1/BUILD | 1 + .../kubelet/pkg/apis/pluginregistration/v1beta1/BUILD | 1 + test/images/sample-device-plugin/BUILD | 2 +- 14 files changed, 21 insertions(+), 16 deletions(-) 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", ], ) From 5d6190c65aed1bed45991bb2864894ab5b0de70e Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Sun, 6 Oct 2019 16:05:40 -0400 Subject: [PATCH 3/5] run hack/update-vendor.sh Change-Id: Ib5a0d3b3e9bd1505a263064f35bea3514c992e4a --- staging/src/k8s.io/kubelet/go.mod | 6 ++++++ staging/src/k8s.io/kubelet/go.sum | 33 +++++++++++++++++++++++++++++++ vendor/modules.txt | 2 ++ 3 files changed, 41 insertions(+) diff --git a/staging/src/k8s.io/kubelet/go.mod b/staging/src/k8s.io/kubelet/go.mod index 582b4046e7d..dfbbeda813b 100644 --- a/staging/src/k8s.io/kubelet/go.mod +++ b/staging/src/k8s.io/kubelet/go.mod @@ -5,11 +5,17 @@ module k8s.io/kubelet go 1.12 require ( + github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d + golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc + google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873 // indirect + google.golang.org/grpc v1.23.0 k8s.io/api v0.0.0 k8s.io/apimachinery v0.0.0 ) replace ( + golang.org/x/lint => golang.org/x/lint v0.0.0-20181217174547-8f45f776aaf1 + golang.org/x/oauth2 => golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a golang.org/x/sync => golang.org/x/sync v0.0.0-20181108010431-42b317875d0f golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503 golang.org/x/text => golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db diff --git a/staging/src/k8s.io/kubelet/go.sum b/staging/src/k8s.io/kubelet/go.sum index a247456cca9..babf7deeedf 100644 --- a/staging/src/k8s.io/kubelet/go.sum +++ b/staging/src/k8s.io/kubelet/go.sum @@ -1,6 +1,10 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= @@ -18,10 +22,15 @@ github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nA github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I= github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d h1:3PaI8p3seN09VjbTYC/QWlUZdZ1qS1zGjy7LH2Wt07I= github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= @@ -66,17 +75,39 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +golang.org/x/crypto v0.0.0-20181025213731-e84da0312774/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/lint v0.0.0-20181217174547-8f45f776aaf1/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc h1:gkKoSkUmnU6bpS/VhkuO27bzQeSA51uaEfbOW5dNb68= golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20190209173611-3b5209105503 h1:5SvYFrOM3W8Mexn9/oA44Ji7vhXAZQ9hiP+1Q/DMrWg= golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db h1:6/JqlYfC1CCaLnGceQTI+sDGhC9UBSPAsBqI0Gun6kU= golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873 h1:nfPFGzJkUDX6uBmpN/pSw7MbOAWegH5QDQuoXFHedLg= +google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.23.0 h1:AzbTB6ux+okLTzP8Ru1Xs41C303zdcfEht7MQnYJt5A= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= @@ -89,6 +120,8 @@ gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8= diff --git a/vendor/modules.txt b/vendor/modules.txt index a45fb5fd73d..0121e826c2b 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1824,6 +1824,8 @@ k8s.io/kubectl/pkg/util/term k8s.io/kubectl/pkg/validation # k8s.io/kubelet v0.0.0 => ./staging/src/k8s.io/kubelet k8s.io/kubelet/config/v1beta1 +k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1 +k8s.io/kubelet/pkg/apis/pluginregistration/v1 # k8s.io/legacy-cloud-providers v0.0.0 => ./staging/src/k8s.io/legacy-cloud-providers k8s.io/legacy-cloud-providers/aws k8s.io/legacy-cloud-providers/azure From f29d2272c847c4553e363e833e819868663365f5 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Sun, 6 Oct 2019 18:43:17 -0400 Subject: [PATCH 4/5] fix gofmt and golint failures Change-Id: I6535b506f50558b31663a13cd270b15023afa2c6 --- hack/.golint_failures | 1 + pkg/kubelet/cm/devicemanager/manager.go | 2 +- pkg/kubelet/kubelet.go | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hack/.golint_failures b/hack/.golint_failures index a33c6405c17..b51d169448c 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -528,6 +528,7 @@ staging/src/k8s.io/kubectl/pkg/polymorphichelpers staging/src/k8s.io/kubectl/pkg/scale staging/src/k8s.io/kubectl/pkg/util/templates staging/src/k8s.io/kubelet/config/v1beta1 +staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1 staging/src/k8s.io/legacy-cloud-providers/vsphere staging/src/k8s.io/metrics/pkg/apis/custom_metrics staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1beta1 diff --git a/pkg/kubelet/cm/devicemanager/manager.go b/pkg/kubelet/cm/devicemanager/manager.go index 440fd6b6a53..987a901a1ee 100644 --- a/pkg/kubelet/cm/devicemanager/manager.go +++ b/pkg/kubelet/cm/devicemanager/manager.go @@ -33,9 +33,9 @@ import ( "k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/util/sets" utilfeature "k8s.io/apiserver/pkg/util/feature" + pluginapi "k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1" v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper" "k8s.io/kubernetes/pkg/features" - 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/kubelet.go b/pkg/kubelet/kubelet.go index 3c08454b2de..74b8e1a0930 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -54,10 +54,10 @@ import ( cloudprovider "k8s.io/cloud-provider" internalapi "k8s.io/cri-api/pkg/apis" "k8s.io/klog" + pluginwatcherapi "k8s.io/kubelet/pkg/apis/pluginregistration/v1" api "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/features" kubeletconfiginternal "k8s.io/kubernetes/pkg/kubelet/apis/config" - 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" From 1bc8ec2508aeb94049b647fc2725f32599e356ca Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Sun, 6 Oct 2019 18:46:53 -0400 Subject: [PATCH 5/5] fix generated-kubelet-plugin-registration Change-Id: I8c5b024a416293d01611d63a4a141bd90be52d9f --- ...update-generated-kubelet-plugin-registration-dockerized.sh | 4 ++-- hack/verify-generated-kubelet-plugin-registration.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hack/update-generated-kubelet-plugin-registration-dockerized.sh b/hack/update-generated-kubelet-plugin-registration-dockerized.sh index 3709163f158..720b235134b 100755 --- a/hack/update-generated-kubelet-plugin-registration-dockerized.sh +++ b/hack/update-generated-kubelet-plugin-registration-dockerized.sh @@ -19,8 +19,8 @@ set -o nounset set -o pipefail KUBE_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../" && pwd -P)" -KUBELET_PLUGIN_REGISTRATION_V1ALPHA="${KUBE_ROOT}/pkg/kubelet/apis/pluginregistration/v1alpha1/" -KUBELET_PLUGIN_REGISTRATION_V1BETA="${KUBE_ROOT}/pkg/kubelet/apis/pluginregistration/v1beta1/" +KUBELET_PLUGIN_REGISTRATION_V1ALPHA="${KUBE_ROOT}/staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1alpha1/" +KUBELET_PLUGIN_REGISTRATION_V1BETA="${KUBE_ROOT}/staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1beta1/" KUBELET_EXAMPLE_PLUGIN_V1BETA1="${KUBE_ROOT}/pkg/kubelet/pluginmanager/pluginwatcher/example_plugin_apis/v1beta1/" KUBELET_EXAMPLE_PLUGIN_V1BETA2="${KUBE_ROOT}/pkg/kubelet/pluginmanager/pluginwatcher/example_plugin_apis/v1beta2/" diff --git a/hack/verify-generated-kubelet-plugin-registration.sh b/hack/verify-generated-kubelet-plugin-registration.sh index 864db552afc..b02bb48a7aa 100755 --- a/hack/verify-generated-kubelet-plugin-registration.sh +++ b/hack/verify-generated-kubelet-plugin-registration.sh @@ -20,8 +20,8 @@ set -o pipefail KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. ERROR="Kubelet Plugin Registration api is out of date. Please run hack/update-generated-kubelet-plugin-registration.sh" -KUBELET_PLUGIN_REGISTRATION_V1ALPHA="${KUBE_ROOT}/pkg/kubelet/apis/pluginregistration/v1alpha1/" -KUBELET_PLUGIN_REGISTRATION_V1BETA="${KUBE_ROOT}/pkg/kubelet/apis/pluginregistration/v1beta1/" +KUBELET_PLUGIN_REGISTRATION_V1ALPHA="${KUBE_ROOT}/staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1alpha1/" +KUBELET_PLUGIN_REGISTRATION_V1BETA="${KUBE_ROOT}/staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1beta1/" source "${KUBE_ROOT}/hack/lib/protoc.sh" kube::golang::setup_env