From 423e8f0292fec33f2e10ed442b0397c22e5e0201 Mon Sep 17 00:00:00 2001 From: SataQiu Date: Tue, 23 Apr 2019 12:59:13 +0800 Subject: [PATCH] fix golint failures of pkg/kubelet/dockershim/cm --- hack/.golint_failures | 1 - pkg/kubelet/dockershim/cm/container_manager.go | 2 ++ pkg/kubelet/dockershim/cm/container_manager_linux.go | 1 + pkg/kubelet/dockershim/cm/container_manager_unsupported.go | 1 + pkg/kubelet/dockershim/cm/container_manager_windows.go | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/hack/.golint_failures b/hack/.golint_failures index adac8ddc34b..a9cddba068e 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -178,7 +178,6 @@ pkg/kubelet/container pkg/kubelet/container/testing pkg/kubelet/custommetrics pkg/kubelet/dockershim -pkg/kubelet/dockershim/cm pkg/kubelet/dockershim/libdocker pkg/kubelet/dockershim/network pkg/kubelet/dockershim/network/cni diff --git a/pkg/kubelet/dockershim/cm/container_manager.go b/pkg/kubelet/dockershim/cm/container_manager.go index 91f2ace4d96..45abfcedb15 100644 --- a/pkg/kubelet/dockershim/cm/container_manager.go +++ b/pkg/kubelet/dockershim/cm/container_manager.go @@ -16,6 +16,8 @@ limitations under the License. package cm +// ContainerManager is an interface that abstracts the basic operations of a +// container manager. type ContainerManager interface { Start() error } diff --git a/pkg/kubelet/dockershim/cm/container_manager_linux.go b/pkg/kubelet/dockershim/cm/container_manager_linux.go index b59c6a08364..2abedfa0bc9 100644 --- a/pkg/kubelet/dockershim/cm/container_manager_linux.go +++ b/pkg/kubelet/dockershim/cm/container_manager_linux.go @@ -51,6 +51,7 @@ var ( memoryCapacityRegexp = regexp.MustCompile(`MemTotal:\s*([0-9]+) kB`) ) +// NewContainerManager creates a new instance of ContainerManager func NewContainerManager(cgroupsName string, client libdocker.Interface) ContainerManager { return &containerManager{ cgroupsName: cgroupsName, diff --git a/pkg/kubelet/dockershim/cm/container_manager_unsupported.go b/pkg/kubelet/dockershim/cm/container_manager_unsupported.go index 7b35c5fa9a1..736c6ebd16d 100644 --- a/pkg/kubelet/dockershim/cm/container_manager_unsupported.go +++ b/pkg/kubelet/dockershim/cm/container_manager_unsupported.go @@ -27,6 +27,7 @@ import ( type unsupportedContainerManager struct { } +// NewContainerManager creates a new instance of ContainerManager func NewContainerManager(_ string, _ libdocker.Interface) ContainerManager { return &unsupportedContainerManager{} } diff --git a/pkg/kubelet/dockershim/cm/container_manager_windows.go b/pkg/kubelet/dockershim/cm/container_manager_windows.go index 500630e1abc..0c2ad462099 100644 --- a/pkg/kubelet/dockershim/cm/container_manager_windows.go +++ b/pkg/kubelet/dockershim/cm/container_manager_windows.go @@ -26,6 +26,7 @@ import ( type containerManager struct { } +// NewContainerManager creates a new instance of ContainerManager func NewContainerManager(_ string, _ libdocker.Interface) ContainerManager { return &containerManager{} }