mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 04:33:26 +00:00
bump device plugin version to v1alpha2 to reflect the change to AllocateResponce API
Signed-off-by: Vishnu kannan <vishnuk@google.com>
This commit is contained in:
parent
18eee1eaa0
commit
e0032af916
@ -209,7 +209,7 @@ pkg/kubelet
|
|||||||
pkg/kubelet/apis
|
pkg/kubelet/apis
|
||||||
pkg/kubelet/apis/cri/testing
|
pkg/kubelet/apis/cri/testing
|
||||||
pkg/kubelet/apis/cri/v1alpha1/runtime
|
pkg/kubelet/apis/cri/v1alpha1/runtime
|
||||||
pkg/kubelet/apis/deviceplugin/v1alpha1
|
pkg/kubelet/apis/deviceplugin/v1alpha
|
||||||
pkg/kubelet/apis/kubeletconfig
|
pkg/kubelet/apis/kubeletconfig
|
||||||
pkg/kubelet/apis/kubeletconfig/v1alpha1
|
pkg/kubelet/apis/kubeletconfig/v1alpha1
|
||||||
pkg/kubelet/cadvisor
|
pkg/kubelet/cadvisor
|
||||||
|
@ -19,8 +19,7 @@ set -o nounset
|
|||||||
set -o pipefail
|
set -o pipefail
|
||||||
|
|
||||||
KUBE_ROOT="$(cd "$(dirname "${BASH_SOURCE}")/../" && pwd -P)"
|
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"
|
source "${KUBE_ROOT}/hack/lib/protoc.sh"
|
||||||
|
|
||||||
kube::protoc::generate_proto ${DEVICE_PLUGIN_ROOT}
|
kube::protoc::generate_proto ${DEVICE_PLUGIN_ROOT}
|
||||||
|
@ -19,8 +19,8 @@ set -o nounset
|
|||||||
set -o pipefail
|
set -o pipefail
|
||||||
|
|
||||||
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
|
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"
|
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"
|
source "${KUBE_ROOT}/hack/lib/protoc.sh"
|
||||||
kube::golang::setup_env
|
kube::golang::setup_env
|
||||||
|
@ -26,7 +26,7 @@ filegroup(
|
|||||||
srcs = [
|
srcs = [
|
||||||
":package-srcs",
|
":package-srcs",
|
||||||
"//pkg/kubelet/apis/cri:all-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/kubeletconfig:all-srcs",
|
||||||
"//pkg/kubelet/apis/stats/v1alpha1:all-srcs",
|
"//pkg/kubelet/apis/stats/v1alpha1:all-srcs",
|
||||||
],
|
],
|
||||||
|
@ -11,7 +11,7 @@ go_library(
|
|||||||
"api.pb.go",
|
"api.pb.go",
|
||||||
"constants.go",
|
"constants.go",
|
||||||
],
|
],
|
||||||
importpath = "k8s.io/kubernetes/pkg/kubelet/apis/deviceplugin/v1alpha1",
|
importpath = "k8s.io/kubernetes/pkg/kubelet/apis/deviceplugin/v1alpha",
|
||||||
deps = [
|
deps = [
|
||||||
"//vendor/github.com/gogo/protobuf/gogoproto:go_default_library",
|
"//vendor/github.com/gogo/protobuf/gogoproto:go_default_library",
|
||||||
"//vendor/github.com/gogo/protobuf/proto:go_default_library",
|
"//vendor/github.com/gogo/protobuf/proto:go_default_library",
|
@ -22,8 +22,8 @@ const (
|
|||||||
// UnHealthy means that the device is unhealty
|
// UnHealthy means that the device is unhealty
|
||||||
Unhealthy = "Unhealthy"
|
Unhealthy = "Unhealthy"
|
||||||
|
|
||||||
// Version is the API version
|
// Current version of the API supported by kubelet
|
||||||
Version = "0.1"
|
Version = "v1alpha2"
|
||||||
// DevicePluginPath is the folder the Device Plugin is expecting sockets to be on
|
// DevicePluginPath is the folder the Device Plugin is expecting sockets to be on
|
||||||
// Only privileged pods have access to this path
|
// Only privileged pods have access to this path
|
||||||
// Note: Placeholder until we find a "standard path"
|
// Note: Placeholder until we find a "standard path"
|
@ -34,7 +34,7 @@ go_library(
|
|||||||
deps = [
|
deps = [
|
||||||
"//pkg/features:go_default_library",
|
"//pkg/features:go_default_library",
|
||||||
"//pkg/kubelet/apis/cri: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/apis/kubeletconfig:go_default_library",
|
||||||
"//pkg/kubelet/cadvisor:go_default_library",
|
"//pkg/kubelet/cadvisor:go_default_library",
|
||||||
"//pkg/kubelet/cm/cpumanager:go_default_library",
|
"//pkg/kubelet/cm/cpumanager:go_default_library",
|
||||||
@ -94,7 +94,7 @@ go_test(
|
|||||||
importpath = "k8s.io/kubernetes/pkg/kubelet/cm",
|
importpath = "k8s.io/kubernetes/pkg/kubelet/cm",
|
||||||
library = ":go_default_library",
|
library = ":go_default_library",
|
||||||
deps = [
|
deps = [
|
||||||
"//pkg/kubelet/apis/deviceplugin/v1alpha1:go_default_library",
|
"//pkg/kubelet/apis/deviceplugin/v1alpha:go_default_library",
|
||||||
"//pkg/util/mount:go_default_library",
|
"//pkg/util/mount:go_default_library",
|
||||||
"//vendor/github.com/stretchr/testify/assert:go_default_library",
|
"//vendor/github.com/stretchr/testify/assert:go_default_library",
|
||||||
"//vendor/k8s.io/api/core/v1:go_default_library",
|
"//vendor/k8s.io/api/core/v1:go_default_library",
|
||||||
|
@ -28,7 +28,7 @@ import (
|
|||||||
"k8s.io/api/core/v1"
|
"k8s.io/api/core/v1"
|
||||||
"k8s.io/apimachinery/pkg/api/resource"
|
"k8s.io/apimachinery/pkg/api/resource"
|
||||||
"k8s.io/apimachinery/pkg/util/sets"
|
"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"
|
"k8s.io/kubernetes/pkg/kubelet/deviceplugin"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@ package cm
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"k8s.io/api/core/v1"
|
"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.
|
// A simple stub implementation for DevicePluginHandler.
|
||||||
|
@ -28,7 +28,7 @@ import (
|
|||||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||||
"k8s.io/apimachinery/pkg/util/sets"
|
"k8s.io/apimachinery/pkg/util/sets"
|
||||||
"k8s.io/apimachinery/pkg/util/uuid"
|
"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) {
|
func TestUpdateCapacity(t *testing.T) {
|
||||||
|
@ -18,7 +18,7 @@ go_library(
|
|||||||
importpath = "k8s.io/kubernetes/pkg/kubelet/deviceplugin",
|
importpath = "k8s.io/kubernetes/pkg/kubelet/deviceplugin",
|
||||||
deps = [
|
deps = [
|
||||||
"//pkg/api/v1/helper:go_default_library",
|
"//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/github.com/golang/glog:go_default_library",
|
||||||
"//vendor/golang.org/x/net/context:go_default_library",
|
"//vendor/golang.org/x/net/context:go_default_library",
|
||||||
"//vendor/google.golang.org/grpc:go_default_library",
|
"//vendor/google.golang.org/grpc:go_default_library",
|
||||||
@ -49,7 +49,7 @@ go_test(
|
|||||||
importpath = "k8s.io/kubernetes/pkg/kubelet/deviceplugin",
|
importpath = "k8s.io/kubernetes/pkg/kubelet/deviceplugin",
|
||||||
library = ":go_default_library",
|
library = ":go_default_library",
|
||||||
deps = [
|
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",
|
"//vendor/github.com/stretchr/testify/require:go_default_library",
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
@ -26,7 +26,7 @@ import (
|
|||||||
"golang.org/x/net/context"
|
"golang.org/x/net/context"
|
||||||
"google.golang.org/grpc"
|
"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.
|
// Stub implementation for DevicePlugin.
|
||||||
|
@ -26,7 +26,7 @@ import (
|
|||||||
"golang.org/x/net/context"
|
"golang.org/x/net/context"
|
||||||
"google.golang.org/grpc"
|
"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
|
// endpoint maps to a single registered device plugin. It is responsible
|
||||||
|
@ -23,7 +23,7 @@ import (
|
|||||||
|
|
||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
|
|
||||||
pluginapi "k8s.io/kubernetes/pkg/kubelet/apis/deviceplugin/v1alpha1"
|
pluginapi "k8s.io/kubernetes/pkg/kubelet/apis/deviceplugin/v1alpha"
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
|
@ -27,7 +27,7 @@ import (
|
|||||||
"golang.org/x/net/context"
|
"golang.org/x/net/context"
|
||||||
"google.golang.org/grpc"
|
"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.
|
// ManagerImpl is the structure in charge of managing Device Plugins.
|
||||||
|
@ -23,7 +23,7 @@ import (
|
|||||||
|
|
||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
|
|
||||||
pluginapi "k8s.io/kubernetes/pkg/kubelet/apis/deviceplugin/v1alpha1"
|
pluginapi "k8s.io/kubernetes/pkg/kubelet/apis/deviceplugin/v1alpha"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
@ -17,7 +17,7 @@ limitations under the License.
|
|||||||
package deviceplugin
|
package deviceplugin
|
||||||
|
|
||||||
import (
|
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,
|
// MonitorCallback is the function called when a device's health state changes,
|
||||||
|
@ -21,7 +21,7 @@ import (
|
|||||||
|
|
||||||
"k8s.io/api/core/v1"
|
"k8s.io/api/core/v1"
|
||||||
v1helper "k8s.io/kubernetes/pkg/api/v1/helper"
|
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 {
|
func cloneDevice(d *pluginapi.Device) *pluginapi.Device {
|
||||||
|
@ -21,7 +21,7 @@ import (
|
|||||||
|
|
||||||
"github.com/stretchr/testify/require"
|
"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) {
|
func TestCloneDevice(t *testing.T) {
|
||||||
|
Loading…
Reference in New Issue
Block a user