From e0032af91628a2eb38c3cd04d39611df4232cecd Mon Sep 17 00:00:00 2001 From: Vishnu kannan Date: Mon, 16 Oct 2017 12:48:28 -0700 Subject: [PATCH] bump device plugin version to v1alpha2 to reflect the change to AllocateResponce API Signed-off-by: Vishnu kannan --- hack/.golint_failures | 2 +- hack/update-generated-device-plugin-dockerized.sh | 3 +-- hack/verify-generated-device-plugin.sh | 2 +- pkg/kubelet/apis/BUILD | 2 +- pkg/kubelet/apis/deviceplugin/{v1alpha1 => v1alpha}/BUILD | 2 +- pkg/kubelet/apis/deviceplugin/{v1alpha1 => v1alpha}/api.pb.go | 0 pkg/kubelet/apis/deviceplugin/{v1alpha1 => v1alpha}/api.proto | 0 .../apis/deviceplugin/{v1alpha1 => v1alpha}/constants.go | 4 ++-- pkg/kubelet/cm/BUILD | 4 ++-- pkg/kubelet/cm/device_plugin_handler.go | 2 +- pkg/kubelet/cm/device_plugin_handler_stub.go | 2 +- pkg/kubelet/cm/device_plugin_handler_test.go | 2 +- pkg/kubelet/deviceplugin/BUILD | 4 ++-- pkg/kubelet/deviceplugin/device_plugin_stub.go | 2 +- pkg/kubelet/deviceplugin/endpoint.go | 2 +- pkg/kubelet/deviceplugin/endpoint_test.go | 2 +- pkg/kubelet/deviceplugin/manager.go | 2 +- pkg/kubelet/deviceplugin/manager_test.go | 2 +- pkg/kubelet/deviceplugin/types.go | 2 +- pkg/kubelet/deviceplugin/utils.go | 2 +- pkg/kubelet/deviceplugin/utils_test.go | 2 +- 21 files changed, 22 insertions(+), 23 deletions(-) rename pkg/kubelet/apis/deviceplugin/{v1alpha1 => v1alpha}/BUILD (98%) rename pkg/kubelet/apis/deviceplugin/{v1alpha1 => v1alpha}/api.pb.go (100%) rename pkg/kubelet/apis/deviceplugin/{v1alpha1 => v1alpha}/api.proto (100%) rename pkg/kubelet/apis/deviceplugin/{v1alpha1 => v1alpha}/constants.go (93%) diff --git a/hack/.golint_failures b/hack/.golint_failures index dd074d20ef6..e8daf5b3f6a 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -209,7 +209,7 @@ pkg/kubelet pkg/kubelet/apis pkg/kubelet/apis/cri/testing pkg/kubelet/apis/cri/v1alpha1/runtime -pkg/kubelet/apis/deviceplugin/v1alpha1 +pkg/kubelet/apis/deviceplugin/v1alpha pkg/kubelet/apis/kubeletconfig pkg/kubelet/apis/kubeletconfig/v1alpha1 pkg/kubelet/cadvisor diff --git a/hack/update-generated-device-plugin-dockerized.sh b/hack/update-generated-device-plugin-dockerized.sh index 15003fd0ce0..0398058b03f 100755 --- a/hack/update-generated-device-plugin-dockerized.sh +++ b/hack/update-generated-device-plugin-dockerized.sh @@ -19,8 +19,7 @@ set -o nounset set -o pipefail KUBE_ROOT="$(cd "$(dirname "${BASH_SOURCE}")/../" && pwd -P)" -DEVICE_PLUGIN_ROOT="${KUBE_ROOT}/pkg/kubelet/apis/deviceplugin/v1alpha1/" +DEVICE_PLUGIN_ROOT="${KUBE_ROOT}/pkg/kubelet/apis/deviceplugin/v1alpha/" source "${KUBE_ROOT}/hack/lib/protoc.sh" - kube::protoc::generate_proto ${DEVICE_PLUGIN_ROOT} diff --git a/hack/verify-generated-device-plugin.sh b/hack/verify-generated-device-plugin.sh index 10797f3a5ca..c98cebae968 100755 --- a/hack/verify-generated-device-plugin.sh +++ b/hack/verify-generated-device-plugin.sh @@ -19,8 +19,8 @@ set -o nounset set -o pipefail KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. -DEVICE_PLUGIN_ROOT="${KUBE_ROOT}/pkg/kubelet/apis/deviceplugin/v1alpha1/" ERROR="Device plugin api is out of date. Please run hack/update-generated-device-plugin.sh" +DEVICE_PLUGIN_ROOT="${KUBE_ROOT}/pkg/kubelet/apis/deviceplugin/v1alpha/" source "${KUBE_ROOT}/hack/lib/protoc.sh" kube::golang::setup_env diff --git a/pkg/kubelet/apis/BUILD b/pkg/kubelet/apis/BUILD index 00352f578d7..490bbd581f9 100644 --- a/pkg/kubelet/apis/BUILD +++ b/pkg/kubelet/apis/BUILD @@ -26,7 +26,7 @@ filegroup( srcs = [ ":package-srcs", "//pkg/kubelet/apis/cri:all-srcs", - "//pkg/kubelet/apis/deviceplugin/v1alpha1:all-srcs", + "//pkg/kubelet/apis/deviceplugin/v1alpha:all-srcs", "//pkg/kubelet/apis/kubeletconfig:all-srcs", "//pkg/kubelet/apis/stats/v1alpha1:all-srcs", ], diff --git a/pkg/kubelet/apis/deviceplugin/v1alpha1/BUILD b/pkg/kubelet/apis/deviceplugin/v1alpha/BUILD similarity index 98% rename from pkg/kubelet/apis/deviceplugin/v1alpha1/BUILD rename to pkg/kubelet/apis/deviceplugin/v1alpha/BUILD index f9677feacf2..b60d55569c9 100644 --- a/pkg/kubelet/apis/deviceplugin/v1alpha1/BUILD +++ b/pkg/kubelet/apis/deviceplugin/v1alpha/BUILD @@ -11,7 +11,7 @@ go_library( "api.pb.go", "constants.go", ], - importpath = "k8s.io/kubernetes/pkg/kubelet/apis/deviceplugin/v1alpha1", + importpath = "k8s.io/kubernetes/pkg/kubelet/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/v1alpha1/api.pb.go b/pkg/kubelet/apis/deviceplugin/v1alpha/api.pb.go similarity index 100% rename from pkg/kubelet/apis/deviceplugin/v1alpha1/api.pb.go rename to pkg/kubelet/apis/deviceplugin/v1alpha/api.pb.go diff --git a/pkg/kubelet/apis/deviceplugin/v1alpha1/api.proto b/pkg/kubelet/apis/deviceplugin/v1alpha/api.proto similarity index 100% rename from pkg/kubelet/apis/deviceplugin/v1alpha1/api.proto rename to pkg/kubelet/apis/deviceplugin/v1alpha/api.proto diff --git a/pkg/kubelet/apis/deviceplugin/v1alpha1/constants.go b/pkg/kubelet/apis/deviceplugin/v1alpha/constants.go similarity index 93% rename from pkg/kubelet/apis/deviceplugin/v1alpha1/constants.go rename to pkg/kubelet/apis/deviceplugin/v1alpha/constants.go index fb0440cce59..896354ab901 100644 --- a/pkg/kubelet/apis/deviceplugin/v1alpha1/constants.go +++ b/pkg/kubelet/apis/deviceplugin/v1alpha/constants.go @@ -22,8 +22,8 @@ const ( // UnHealthy means that the device is unhealty Unhealthy = "Unhealthy" - // Version is the API version - Version = "0.1" + // Current version of the API supported by kubelet + Version = "v1alpha2" // DevicePluginPath is the folder the Device Plugin is expecting sockets to be on // Only privileged pods have access to this path // Note: Placeholder until we find a "standard path" diff --git a/pkg/kubelet/cm/BUILD b/pkg/kubelet/cm/BUILD index d046325f2b9..b107c893320 100644 --- a/pkg/kubelet/cm/BUILD +++ b/pkg/kubelet/cm/BUILD @@ -34,7 +34,7 @@ go_library( deps = [ "//pkg/features:go_default_library", "//pkg/kubelet/apis/cri:go_default_library", - "//pkg/kubelet/apis/deviceplugin/v1alpha1:go_default_library", + "//pkg/kubelet/apis/deviceplugin/v1alpha:go_default_library", "//pkg/kubelet/apis/kubeletconfig:go_default_library", "//pkg/kubelet/cadvisor:go_default_library", "//pkg/kubelet/cm/cpumanager:go_default_library", @@ -94,7 +94,7 @@ go_test( importpath = "k8s.io/kubernetes/pkg/kubelet/cm", library = ":go_default_library", deps = [ - "//pkg/kubelet/apis/deviceplugin/v1alpha1:go_default_library", + "//pkg/kubelet/apis/deviceplugin/v1alpha:go_default_library", "//pkg/util/mount:go_default_library", "//vendor/github.com/stretchr/testify/assert:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", diff --git a/pkg/kubelet/cm/device_plugin_handler.go b/pkg/kubelet/cm/device_plugin_handler.go index 790f720eeca..8217e107d2a 100644 --- a/pkg/kubelet/cm/device_plugin_handler.go +++ b/pkg/kubelet/cm/device_plugin_handler.go @@ -28,7 +28,7 @@ import ( "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/v1alpha1" + pluginapi "k8s.io/kubernetes/pkg/kubelet/apis/deviceplugin/v1alpha" "k8s.io/kubernetes/pkg/kubelet/deviceplugin" ) diff --git a/pkg/kubelet/cm/device_plugin_handler_stub.go b/pkg/kubelet/cm/device_plugin_handler_stub.go index a70c281086c..879997f5504 100644 --- a/pkg/kubelet/cm/device_plugin_handler_stub.go +++ b/pkg/kubelet/cm/device_plugin_handler_stub.go @@ -18,7 +18,7 @@ package cm import ( "k8s.io/api/core/v1" - pluginapi "k8s.io/kubernetes/pkg/kubelet/apis/deviceplugin/v1alpha1" + pluginapi "k8s.io/kubernetes/pkg/kubelet/apis/deviceplugin/v1alpha" ) // A simple stub implementation for DevicePluginHandler. diff --git a/pkg/kubelet/cm/device_plugin_handler_test.go b/pkg/kubelet/cm/device_plugin_handler_test.go index 5bf55e64976..34536b88a72 100644 --- a/pkg/kubelet/cm/device_plugin_handler_test.go +++ b/pkg/kubelet/cm/device_plugin_handler_test.go @@ -28,7 +28,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/uuid" - pluginapi "k8s.io/kubernetes/pkg/kubelet/apis/deviceplugin/v1alpha1" + pluginapi "k8s.io/kubernetes/pkg/kubelet/apis/deviceplugin/v1alpha" ) func TestUpdateCapacity(t *testing.T) { diff --git a/pkg/kubelet/deviceplugin/BUILD b/pkg/kubelet/deviceplugin/BUILD index beaaaaebd82..c6cb50c6258 100644 --- a/pkg/kubelet/deviceplugin/BUILD +++ b/pkg/kubelet/deviceplugin/BUILD @@ -18,7 +18,7 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubelet/deviceplugin", deps = [ "//pkg/api/v1/helper:go_default_library", - "//pkg/kubelet/apis/deviceplugin/v1alpha1:go_default_library", + "//pkg/kubelet/apis/deviceplugin/v1alpha:go_default_library", "//vendor/github.com/golang/glog:go_default_library", "//vendor/golang.org/x/net/context:go_default_library", "//vendor/google.golang.org/grpc:go_default_library", @@ -49,7 +49,7 @@ go_test( importpath = "k8s.io/kubernetes/pkg/kubelet/deviceplugin", library = ":go_default_library", deps = [ - "//pkg/kubelet/apis/deviceplugin/v1alpha1:go_default_library", + "//pkg/kubelet/apis/deviceplugin/v1alpha:go_default_library", "//vendor/github.com/stretchr/testify/require:go_default_library", ], ) diff --git a/pkg/kubelet/deviceplugin/device_plugin_stub.go b/pkg/kubelet/deviceplugin/device_plugin_stub.go index a0f103d03a9..01f08c15987 100644 --- a/pkg/kubelet/deviceplugin/device_plugin_stub.go +++ b/pkg/kubelet/deviceplugin/device_plugin_stub.go @@ -26,7 +26,7 @@ import ( "golang.org/x/net/context" "google.golang.org/grpc" - pluginapi "k8s.io/kubernetes/pkg/kubelet/apis/deviceplugin/v1alpha1" + pluginapi "k8s.io/kubernetes/pkg/kubelet/apis/deviceplugin/v1alpha" ) // Stub implementation for DevicePlugin. diff --git a/pkg/kubelet/deviceplugin/endpoint.go b/pkg/kubelet/deviceplugin/endpoint.go index f0523471a38..fc55006a60d 100644 --- a/pkg/kubelet/deviceplugin/endpoint.go +++ b/pkg/kubelet/deviceplugin/endpoint.go @@ -26,7 +26,7 @@ import ( "golang.org/x/net/context" "google.golang.org/grpc" - pluginapi "k8s.io/kubernetes/pkg/kubelet/apis/deviceplugin/v1alpha1" + pluginapi "k8s.io/kubernetes/pkg/kubelet/apis/deviceplugin/v1alpha" ) // endpoint maps to a single registered device plugin. It is responsible diff --git a/pkg/kubelet/deviceplugin/endpoint_test.go b/pkg/kubelet/deviceplugin/endpoint_test.go index a1786711de9..362856c69a5 100644 --- a/pkg/kubelet/deviceplugin/endpoint_test.go +++ b/pkg/kubelet/deviceplugin/endpoint_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/require" - pluginapi "k8s.io/kubernetes/pkg/kubelet/apis/deviceplugin/v1alpha1" + pluginapi "k8s.io/kubernetes/pkg/kubelet/apis/deviceplugin/v1alpha" ) var ( diff --git a/pkg/kubelet/deviceplugin/manager.go b/pkg/kubelet/deviceplugin/manager.go index 5c05a972894..6701dc63228 100644 --- a/pkg/kubelet/deviceplugin/manager.go +++ b/pkg/kubelet/deviceplugin/manager.go @@ -27,7 +27,7 @@ import ( "golang.org/x/net/context" "google.golang.org/grpc" - pluginapi "k8s.io/kubernetes/pkg/kubelet/apis/deviceplugin/v1alpha1" + pluginapi "k8s.io/kubernetes/pkg/kubelet/apis/deviceplugin/v1alpha" ) // ManagerImpl is the structure in charge of managing Device Plugins. diff --git a/pkg/kubelet/deviceplugin/manager_test.go b/pkg/kubelet/deviceplugin/manager_test.go index cdc43a0b255..835ce09a949 100644 --- a/pkg/kubelet/deviceplugin/manager_test.go +++ b/pkg/kubelet/deviceplugin/manager_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/require" - pluginapi "k8s.io/kubernetes/pkg/kubelet/apis/deviceplugin/v1alpha1" + pluginapi "k8s.io/kubernetes/pkg/kubelet/apis/deviceplugin/v1alpha" ) const ( diff --git a/pkg/kubelet/deviceplugin/types.go b/pkg/kubelet/deviceplugin/types.go index 3a2eae6fee1..6ef8046687f 100644 --- a/pkg/kubelet/deviceplugin/types.go +++ b/pkg/kubelet/deviceplugin/types.go @@ -17,7 +17,7 @@ limitations under the License. package deviceplugin import ( - pluginapi "k8s.io/kubernetes/pkg/kubelet/apis/deviceplugin/v1alpha1" + pluginapi "k8s.io/kubernetes/pkg/kubelet/apis/deviceplugin/v1alpha" ) // MonitorCallback is the function called when a device's health state changes, diff --git a/pkg/kubelet/deviceplugin/utils.go b/pkg/kubelet/deviceplugin/utils.go index b30ac2f640e..ce7f19665cb 100644 --- a/pkg/kubelet/deviceplugin/utils.go +++ b/pkg/kubelet/deviceplugin/utils.go @@ -21,7 +21,7 @@ import ( "k8s.io/api/core/v1" v1helper "k8s.io/kubernetes/pkg/api/v1/helper" - pluginapi "k8s.io/kubernetes/pkg/kubelet/apis/deviceplugin/v1alpha1" + pluginapi "k8s.io/kubernetes/pkg/kubelet/apis/deviceplugin/v1alpha" ) func cloneDevice(d *pluginapi.Device) *pluginapi.Device { diff --git a/pkg/kubelet/deviceplugin/utils_test.go b/pkg/kubelet/deviceplugin/utils_test.go index 33924605c5c..99156d6475d 100644 --- a/pkg/kubelet/deviceplugin/utils_test.go +++ b/pkg/kubelet/deviceplugin/utils_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/require" - pluginapi "k8s.io/kubernetes/pkg/kubelet/apis/deviceplugin/v1alpha1" + pluginapi "k8s.io/kubernetes/pkg/kubelet/apis/deviceplugin/v1alpha" ) func TestCloneDevice(t *testing.T) {