Merge pull request kubernetes#76925 from SataQiu/fix-golint-kubelet-2019042302

k8s-ci-robot · web-flow · commit ea38af74a916 · 2019-04-23T23:50:50.000-07:00
Fix golint failures of pkg/kubelet/dockershim/cm
diff --git a/hack/.golint_failures b/hack/.golint_failures
@@ -176,7 +176,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
@@ -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
@@ -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
@@ -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
@@ -26,6 +26,7 @@ import (
 type containerManager struct {
 }
 
+// NewContainerManager creates a new instance of ContainerManager
 func NewContainerManager(_ string, _ libdocker.Interface) ContainerManager {
 	return &containerManager{}
 }

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@ limitations under the License.`
`16`	`16`
`17`	`17`	`package cm`
`18`	`18`
	`19`	`+// ContainerManager is an interface that abstracts the basic operations of a`
	`20`	`+// container manager.`
`19`	`21`	`type ContainerManager interface {`
`20`	`22`	`Start() error`
`21`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ var (`
`51`	`51`	memoryCapacityRegexp = regexp.MustCompile(`MemTotal:\s*([0-9]+) kB`)
`52`	`52`	`)`
`53`	`53`
	`54`	`+// NewContainerManager creates a new instance of ContainerManager`
`54`	`55`	`func NewContainerManager(cgroupsName string, client libdocker.Interface) ContainerManager {`
`55`	`56`	`return &containerManager{`
`56`	`57`	`cgroupsName: cgroupsName,`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ import (`
`27`	`27`	`type unsupportedContainerManager struct {`
`28`	`28`	`}`
`29`	`29`
	`30`	`+// NewContainerManager creates a new instance of ContainerManager`
`30`	`31`	`func NewContainerManager(_ string, _ libdocker.Interface) ContainerManager {`
`31`	`32`	`return &unsupportedContainerManager{}`
`32`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ import (`
`26`	`26`	`type containerManager struct {`
`27`	`27`	`}`
`28`	`28`
	`29`	`+// NewContainerManager creates a new instance of ContainerManager`
`29`	`30`	`func NewContainerManager(_ string, _ libdocker.Interface) ContainerManager {`
`30`	`31`	`return &containerManager{}`
`31`	`32`	`}`