From e5667cf42682501e704aab32dae3f3ac9f695ea7 Mon Sep 17 00:00:00 2001 From: Connor Doyle Date: Tue, 5 Dec 2017 12:28:23 -0600 Subject: [PATCH] Rename package deviceplugin => devicemanager. --- pkg/kubelet/cm/BUILD | 4 +- pkg/kubelet/cm/container_manager_linux.go | 18 ++++----- .../cm/{deviceplugin => devicemanager}/BUILD | 40 +++++++++---------- .../cm/{deviceplugin => devicemanager}/OWNERS | 0 .../device_plugin_stub.go | 2 +- .../endpoint.go | 2 +- .../endpoint_test.go | 2 +- .../manager.go | 20 +++++----- .../manager_stub.go | 2 +- .../manager_test.go | 2 +- .../pod_devices.go | 2 +- .../{deviceplugin => devicemanager}/types.go | 2 +- test/e2e_node/BUILD | 10 ++--- test/e2e_node/device_plugin.go | 6 +-- 14 files changed, 53 insertions(+), 59 deletions(-) rename pkg/kubelet/cm/{deviceplugin => devicemanager}/BUILD (89%) rename pkg/kubelet/cm/{deviceplugin => devicemanager}/OWNERS (100%) rename pkg/kubelet/cm/{deviceplugin => devicemanager}/device_plugin_stub.go (99%) rename pkg/kubelet/cm/{deviceplugin => devicemanager}/endpoint.go (99%) rename pkg/kubelet/cm/{deviceplugin => devicemanager}/endpoint_test.go (99%) rename pkg/kubelet/cm/{deviceplugin => devicemanager}/manager.go (97%) rename pkg/kubelet/cm/{deviceplugin => devicemanager}/manager_stub.go (98%) rename pkg/kubelet/cm/{deviceplugin => devicemanager}/manager_test.go (99%) rename pkg/kubelet/cm/{deviceplugin => devicemanager}/pod_devices.go (99%) rename pkg/kubelet/cm/{deviceplugin => devicemanager}/types.go (99%) diff --git a/pkg/kubelet/cm/BUILD b/pkg/kubelet/cm/BUILD index 32a8175063..7cf3c76aaa 100644 --- a/pkg/kubelet/cm/BUILD +++ b/pkg/kubelet/cm/BUILD @@ -123,7 +123,7 @@ go_library( "//pkg/apis/core/v1/helper:go_default_library", "//pkg/apis/core/v1/helper/qos:go_default_library", "//pkg/kubelet/cadvisor:go_default_library", - "//pkg/kubelet/cm/deviceplugin:go_default_library", + "//pkg/kubelet/cm/devicemanager:go_default_library", "//pkg/kubelet/cm/util:go_default_library", "//pkg/kubelet/events:go_default_library", "//pkg/kubelet/metrics:go_default_library", @@ -219,7 +219,7 @@ filegroup( ":package-srcs", "//pkg/kubelet/cm/cpumanager:all-srcs", "//pkg/kubelet/cm/cpuset:all-srcs", - "//pkg/kubelet/cm/deviceplugin:all-srcs", + "//pkg/kubelet/cm/devicemanager:all-srcs", "//pkg/kubelet/cm/util:all-srcs", ], tags = ["automanaged"], diff --git a/pkg/kubelet/cm/container_manager_linux.go b/pkg/kubelet/cm/container_manager_linux.go index 51d8a4493b..2a55f3c843 100644 --- a/pkg/kubelet/cm/container_manager_linux.go +++ b/pkg/kubelet/cm/container_manager_linux.go @@ -45,7 +45,7 @@ import ( internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri" "k8s.io/kubernetes/pkg/kubelet/cadvisor" "k8s.io/kubernetes/pkg/kubelet/cm/cpumanager" - "k8s.io/kubernetes/pkg/kubelet/cm/deviceplugin" + "k8s.io/kubernetes/pkg/kubelet/cm/devicemanager" cmutil "k8s.io/kubernetes/pkg/kubelet/cm/util" "k8s.io/kubernetes/pkg/kubelet/config" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" @@ -129,7 +129,7 @@ type containerManagerImpl struct { // Interface for QoS cgroup management qosContainerManager QOSContainerManager // Interface for exporting and allocating devices reported by device plugins. - devicePluginManager deviceplugin.Manager + deviceManager devicemanager.Manager // Interface for CPU affinity management. cpuManager cpumanager.Manager } @@ -265,9 +265,9 @@ func NewContainerManager(mountUtil mount.Interface, cadvisorInterface cadvisor.I glog.Infof("Creating device plugin manager: %t", devicePluginEnabled) if devicePluginEnabled { - cm.devicePluginManager, err = deviceplugin.NewManagerImpl() + cm.deviceManager, err = devicemanager.NewManagerImpl() } else { - cm.devicePluginManager, err = deviceplugin.NewManagerStub() + cm.deviceManager, err = devicemanager.NewManagerStub() } if err != nil { return nil, err @@ -586,8 +586,8 @@ func (cm *containerManagerImpl) Start(node *v1.Node, close(stopChan) }, time.Second, stopChan) - // Starts device plugin manager. - if err := cm.devicePluginManager.Start(deviceplugin.ActivePodsFunc(activePods), sourcesReady); err != nil { + // Starts device manager. + if err := cm.deviceManager.Start(devicemanager.ActivePodsFunc(activePods), sourcesReady); err != nil { return err } return nil @@ -612,7 +612,7 @@ func (cm *containerManagerImpl) GetResources(pod *v1.Pod, container *v1.Containe opts := &kubecontainer.RunContainerOptions{} // Allocate should already be called during predicateAdmitHandler.Admit(), // just try to fetch device runtime information from cached state here - devOpts := cm.devicePluginManager.GetDeviceRunContainerOptions(pod, container) + devOpts := cm.deviceManager.GetDeviceRunContainerOptions(pod, container) if devOpts == nil { return opts, nil } @@ -623,7 +623,7 @@ func (cm *containerManagerImpl) GetResources(pod *v1.Pod, container *v1.Containe } func (cm *containerManagerImpl) UpdatePluginResources(node *schedulercache.NodeInfo, attrs *lifecycle.PodAdmitAttributes) error { - return cm.devicePluginManager.Allocate(node, attrs) + return cm.deviceManager.Allocate(node, attrs) } func (cm *containerManagerImpl) SystemCgroupsLimit() v1.ResourceList { @@ -888,5 +888,5 @@ func (cm *containerManagerImpl) GetCapacity() v1.ResourceList { } func (cm *containerManagerImpl) GetDevicePluginResourceCapacity() (v1.ResourceList, v1.ResourceList, []string) { - return cm.devicePluginManager.GetCapacity() + return cm.deviceManager.GetCapacity() } diff --git a/pkg/kubelet/cm/deviceplugin/BUILD b/pkg/kubelet/cm/devicemanager/BUILD similarity index 89% rename from pkg/kubelet/cm/deviceplugin/BUILD rename to pkg/kubelet/cm/devicemanager/BUILD index 11df63bea1..7b6077bc55 100644 --- a/pkg/kubelet/cm/deviceplugin/BUILD +++ b/pkg/kubelet/cm/devicemanager/BUILD @@ -1,10 +1,4 @@ -package(default_visibility = ["//visibility:public"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", - "go_test", -) +load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", @@ -16,7 +10,8 @@ go_library( "pod_devices.go", "types.go", ], - importpath = "k8s.io/kubernetes/pkg/kubelet/cm/deviceplugin", + importpath = "k8s.io/kubernetes/pkg/kubelet/cm/devicemanager", + visibility = ["//visibility:public"], deps = [ "//pkg/apis/core/v1/helper:go_default_library", "//pkg/kubelet/apis/deviceplugin/v1alpha:go_default_library", @@ -36,19 +31,6 @@ go_library( ], ) -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) - go_test( name = "go_default_test", srcs = [ @@ -56,7 +38,7 @@ go_test( "manager_test.go", ], embed = [":go_default_library"], - importpath = "k8s.io/kubernetes/pkg/kubelet/cm/deviceplugin", + importpath = "k8s.io/kubernetes/pkg/kubelet/cm/devicemanager", deps = [ "//pkg/kubelet/apis/deviceplugin/v1alpha:go_default_library", "//pkg/kubelet/lifecycle:go_default_library", @@ -72,3 +54,17 @@ go_test( "//vendor/k8s.io/apimachinery/pkg/util/uuid:go_default_library", ], ) + +filegroup( + name = "package-srcs", + srcs = glob(["**"]), + tags = ["automanaged"], + visibility = ["//visibility:private"], +) + +filegroup( + name = "all-srcs", + srcs = [":package-srcs"], + tags = ["automanaged"], + visibility = ["//visibility:public"], +) diff --git a/pkg/kubelet/cm/deviceplugin/OWNERS b/pkg/kubelet/cm/devicemanager/OWNERS similarity index 100% rename from pkg/kubelet/cm/deviceplugin/OWNERS rename to pkg/kubelet/cm/devicemanager/OWNERS diff --git a/pkg/kubelet/cm/deviceplugin/device_plugin_stub.go b/pkg/kubelet/cm/devicemanager/device_plugin_stub.go similarity index 99% rename from pkg/kubelet/cm/deviceplugin/device_plugin_stub.go rename to pkg/kubelet/cm/devicemanager/device_plugin_stub.go index a80f16b9d1..66e8042a94 100644 --- a/pkg/kubelet/cm/deviceplugin/device_plugin_stub.go +++ b/pkg/kubelet/cm/devicemanager/device_plugin_stub.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package deviceplugin +package devicemanager import ( "log" diff --git a/pkg/kubelet/cm/deviceplugin/endpoint.go b/pkg/kubelet/cm/devicemanager/endpoint.go similarity index 99% rename from pkg/kubelet/cm/deviceplugin/endpoint.go rename to pkg/kubelet/cm/devicemanager/endpoint.go index f2fd8be989..cd1e662c30 100644 --- a/pkg/kubelet/cm/deviceplugin/endpoint.go +++ b/pkg/kubelet/cm/devicemanager/endpoint.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package deviceplugin +package devicemanager import ( "fmt" diff --git a/pkg/kubelet/cm/deviceplugin/endpoint_test.go b/pkg/kubelet/cm/devicemanager/endpoint_test.go similarity index 99% rename from pkg/kubelet/cm/deviceplugin/endpoint_test.go rename to pkg/kubelet/cm/devicemanager/endpoint_test.go index 6005310181..bdad421360 100644 --- a/pkg/kubelet/cm/deviceplugin/endpoint_test.go +++ b/pkg/kubelet/cm/devicemanager/endpoint_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package deviceplugin +package devicemanager import ( "path" diff --git a/pkg/kubelet/cm/deviceplugin/manager.go b/pkg/kubelet/cm/devicemanager/manager.go similarity index 97% rename from pkg/kubelet/cm/deviceplugin/manager.go rename to pkg/kubelet/cm/devicemanager/manager.go index 0f6cb56f3e..049e7df78f 100644 --- a/pkg/kubelet/cm/deviceplugin/manager.go +++ b/pkg/kubelet/cm/devicemanager/manager.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package deviceplugin +package devicemanager import ( "encoding/json" @@ -187,13 +187,13 @@ func (m *ManagerImpl) removeContents(dir string) error { } const ( - // kubeletDevicePluginCheckpoint is the file name of device plugin checkpoint - kubeletDevicePluginCheckpoint = "kubelet_internal_checkpoint" + // kubeletDeviceManagerCheckpoint is the file name of device plugin checkpoint + kubeletDeviceManagerCheckpoint = "kubelet_internal_checkpoint" ) // checkpointFile returns device plugin checkpoint file path. func (m *ManagerImpl) checkpointFile() string { - return filepath.Join(m.socketdir, kubeletDevicePluginCheckpoint) + return filepath.Join(m.socketdir, kubeletDeviceManagerCheckpoint) } // Start starts the Device Plugin Manager amd start initialization of @@ -456,9 +456,9 @@ func (m *ManagerImpl) writeCheckpoint() error { if err != nil { return err } - err = m.store.Write(kubeletDevicePluginCheckpoint, dataJSON) + err = m.store.Write(kubeletDeviceManagerCheckpoint, dataJSON) if err != nil { - return fmt.Errorf("failed to write deviceplugin checkpoint file %q: %v", kubeletDevicePluginCheckpoint, err) + return fmt.Errorf("failed to write deviceplugin checkpoint file %q: %v", kubeletDeviceManagerCheckpoint, err) } return nil } @@ -466,14 +466,14 @@ func (m *ManagerImpl) writeCheckpoint() error { // Reads device to container allocation information from disk, and populates // m.allocatedDevices accordingly. func (m *ManagerImpl) readCheckpoint() error { - content, err := m.store.Read(kubeletDevicePluginCheckpoint) + content, err := m.store.Read(kubeletDeviceManagerCheckpoint) if err != nil { if err == utilstore.ErrKeyNotFound { return nil } - return fmt.Errorf("failed to read checkpoint file %q: %v", kubeletDevicePluginCheckpoint, err) + return fmt.Errorf("failed to read checkpoint file %q: %v", kubeletDeviceManagerCheckpoint, err) } - glog.V(4).Infof("Read checkpoint file %s\n", kubeletDevicePluginCheckpoint) + glog.V(4).Infof("Read checkpoint file %s\n", kubeletDeviceManagerCheckpoint) var data checkpointData if err := json.Unmarshal(content, &data); err != nil { return fmt.Errorf("failed to unmarshal deviceplugin checkpoint data: %v", err) @@ -611,7 +611,7 @@ func (m *ManagerImpl) allocateContainerResources(pod *v1.Pod, container *v1.Cont continue } startRPCTime := time.Now() - // devicePluginManager.Allocate involves RPC calls to device plugin, which + // Manager.Allocate involves RPC calls to device plugin, which // could be heavy-weight. Therefore we want to perform this operation outside // mutex lock. Note if Allocate call fails, we may leave container resources // partially allocated for the failed container. We rely on updateAllocatedDevices() diff --git a/pkg/kubelet/cm/deviceplugin/manager_stub.go b/pkg/kubelet/cm/devicemanager/manager_stub.go similarity index 98% rename from pkg/kubelet/cm/deviceplugin/manager_stub.go rename to pkg/kubelet/cm/devicemanager/manager_stub.go index 9fc77d1b13..fc88b4fef0 100644 --- a/pkg/kubelet/cm/deviceplugin/manager_stub.go +++ b/pkg/kubelet/cm/devicemanager/manager_stub.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package deviceplugin +package devicemanager import ( "k8s.io/api/core/v1" diff --git a/pkg/kubelet/cm/deviceplugin/manager_test.go b/pkg/kubelet/cm/devicemanager/manager_test.go similarity index 99% rename from pkg/kubelet/cm/deviceplugin/manager_test.go rename to pkg/kubelet/cm/devicemanager/manager_test.go index ed0c437b3c..28cb53e2d0 100644 --- a/pkg/kubelet/cm/deviceplugin/manager_test.go +++ b/pkg/kubelet/cm/devicemanager/manager_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package deviceplugin +package devicemanager import ( "flag" diff --git a/pkg/kubelet/cm/deviceplugin/pod_devices.go b/pkg/kubelet/cm/devicemanager/pod_devices.go similarity index 99% rename from pkg/kubelet/cm/deviceplugin/pod_devices.go rename to pkg/kubelet/cm/devicemanager/pod_devices.go index 311c8d0c60..a5f7469803 100644 --- a/pkg/kubelet/cm/deviceplugin/pod_devices.go +++ b/pkg/kubelet/cm/devicemanager/pod_devices.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package deviceplugin +package devicemanager import ( "github.com/golang/glog" diff --git a/pkg/kubelet/cm/deviceplugin/types.go b/pkg/kubelet/cm/devicemanager/types.go similarity index 99% rename from pkg/kubelet/cm/deviceplugin/types.go rename to pkg/kubelet/cm/devicemanager/types.go index 77982ac9e1..1f8f0909a8 100644 --- a/pkg/kubelet/cm/deviceplugin/types.go +++ b/pkg/kubelet/cm/devicemanager/types.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package deviceplugin +package devicemanager import ( "k8s.io/api/core/v1" diff --git a/test/e2e_node/BUILD b/test/e2e_node/BUILD index d6d49105c1..bf2bca253f 100644 --- a/test/e2e_node/BUILD +++ b/test/e2e_node/BUILD @@ -1,10 +1,6 @@ package(default_visibility = ["//visibility:public"]) -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", - "go_test", -) +load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", @@ -28,6 +24,7 @@ go_library( "//conditions:default": [], }), importpath = "k8s.io/kubernetes/test/e2e_node", + visibility = ["//visibility:public"], deps = [ "//pkg/api/v1/pod:go_default_library", "//pkg/features:go_default_library", @@ -38,7 +35,7 @@ go_library( "//pkg/kubelet/apis/kubeletconfig/scheme:go_default_library", "//pkg/kubelet/apis/kubeletconfig/v1alpha1:go_default_library", "//pkg/kubelet/apis/stats/v1alpha1:go_default_library", - "//pkg/kubelet/cm/deviceplugin:go_default_library", + "//pkg/kubelet/cm/devicemanager:go_default_library", "//pkg/kubelet/metrics:go_default_library", "//pkg/kubelet/remote:go_default_library", "//test/e2e/common:go_default_library", @@ -210,4 +207,5 @@ filegroup( "//test/e2e_node/system:all-srcs", ], tags = ["automanaged"], + visibility = ["//visibility:public"], ) diff --git a/test/e2e_node/device_plugin.go b/test/e2e_node/device_plugin.go index 826d3b6698..5a5790755f 100644 --- a/test/e2e_node/device_plugin.go +++ b/test/e2e_node/device_plugin.go @@ -34,7 +34,7 @@ import ( "k8s.io/kubernetes/test/e2e/framework" pluginapi "k8s.io/kubernetes/pkg/kubelet/apis/deviceplugin/v1alpha" - dp "k8s.io/kubernetes/pkg/kubelet/cm/deviceplugin" + dm "k8s.io/kubernetes/pkg/kubelet/cm/devicemanager" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" @@ -69,7 +69,7 @@ var _ = framework.KubeDescribe("Device Plugin [Feature:DevicePlugin] [Serial] [D socketPath := pluginapi.DevicePluginPath + "dp." + fmt.Sprintf("%d", time.Now().Unix()) - dp1 := dp.NewDevicePluginStub(devs, socketPath) + dp1 := dm.NewDevicePluginStub(devs, socketPath) dp1.SetAllocFunc(stubAllocFunc) err := dp1.Start() framework.ExpectNoError(err) @@ -107,7 +107,7 @@ var _ = framework.KubeDescribe("Device Plugin [Feature:DevicePlugin] [Serial] [D framework.WaitForAllNodesSchedulable(f.ClientSet, framework.TestContext.NodeSchedulableTimeout) By("Re-Register resources") - dp1 = dp.NewDevicePluginStub(devs, socketPath) + dp1 = dm.NewDevicePluginStub(devs, socketPath) dp1.SetAllocFunc(stubAllocFunc) err = dp1.Start() framework.ExpectNoError(err)