From 736f35ec29aedbc34095605179c6301fe50bc1d8 Mon Sep 17 00:00:00 2001 From: Bernhard Altendorfer Date: Thu, 24 Jan 2019 00:11:03 +0100 Subject: [PATCH] Fix golint failures --- hack/.golint_failures | 2 -- pkg/kubelet/cm/devicemanager/checkpoint/checkpoint.go | 4 ++++ pkg/kubelet/cm/util/cgroups_linux.go | 1 + pkg/kubelet/cm/util/cgroups_unsupported.go | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/hack/.golint_failures b/hack/.golint_failures index 2614b3fcb19..e39f05b5f0b 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -194,8 +194,6 @@ pkg/kubelet/checkpointmanager/checksum pkg/kubelet/checkpointmanager/testing/example_checkpoint_formats/v1 pkg/kubelet/client pkg/kubelet/cm -pkg/kubelet/cm/devicemanager/checkpoint -pkg/kubelet/cm/util pkg/kubelet/config pkg/kubelet/configmap pkg/kubelet/container diff --git a/pkg/kubelet/cm/devicemanager/checkpoint/checkpoint.go b/pkg/kubelet/cm/devicemanager/checkpoint/checkpoint.go index 272a3bbe2ef..441eebd6684 100644 --- a/pkg/kubelet/cm/devicemanager/checkpoint/checkpoint.go +++ b/pkg/kubelet/cm/devicemanager/checkpoint/checkpoint.go @@ -23,11 +23,13 @@ import ( "k8s.io/kubernetes/pkg/kubelet/checkpointmanager/checksum" ) +// DeviceManagerCheckpoint defines the operations to retrieve pod devices type DeviceManagerCheckpoint interface { checkpointmanager.Checkpoint GetData() ([]PodDevicesEntry, map[string][]string) } +// PodDevicesEntry connects pod information to devices type PodDevicesEntry struct { PodUID string ContainerName string @@ -44,6 +46,7 @@ type checkpointData struct { RegisteredDevices map[string][]string } +// Data holds checkpoint data and its checksum type Data struct { Data checkpointData Checksum checksum.Checksum @@ -76,6 +79,7 @@ func (cp *Data) VerifyChecksum() error { return cp.Checksum.Verify(cp.Data) } +// GetData returns device entries and registered devices func (cp *Data) GetData() ([]PodDevicesEntry, map[string][]string) { return cp.Data.PodDeviceEntries, cp.Data.RegisteredDevices } diff --git a/pkg/kubelet/cm/util/cgroups_linux.go b/pkg/kubelet/cm/util/cgroups_linux.go index 3dbb5b0e1eb..170f39770c4 100644 --- a/pkg/kubelet/cm/util/cgroups_linux.go +++ b/pkg/kubelet/cm/util/cgroups_linux.go @@ -23,6 +23,7 @@ import ( libcontainerutils "github.com/opencontainers/runc/libcontainer/utils" ) +// GetPids gets pids of the desired cgroup // Forked from opencontainers/runc/libcontainer/cgroup/fs.Manager.GetPids() func GetPids(cgroupPath string) ([]int, error) { dir, err := getCgroupPath(cgroupPath) diff --git a/pkg/kubelet/cm/util/cgroups_unsupported.go b/pkg/kubelet/cm/util/cgroups_unsupported.go index 371b597932c..870299d8b4b 100644 --- a/pkg/kubelet/cm/util/cgroups_unsupported.go +++ b/pkg/kubelet/cm/util/cgroups_unsupported.go @@ -18,6 +18,7 @@ limitations under the License. package util +// GetPids gets pids of the desired cgroup func GetPids(cgroupPath string) ([]int, error) { return nil, nil }