github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #77023 from obitech/fix_golint_issues_in_kubelet_packages_oom

Browse Source 
Fix golint issues in pkg/kubelet/oom
This commit is contained in:
Kubernetes Prow Robot
2019-05-15 22:56:21 -07:00
committed by GitHub
parent 37281a400d ccfb6379f3
commit ce3ce9a57a
6 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
hack/.golint_failures
View File

@@ -171,7 +171,6 @@ pkg/kubelet/dockershim/network/testing
pkg/kubelet/events pkg/kubelet/events
pkg/kubelet/lifecycle pkg/kubelet/lifecycle
pkg/kubelet/metrics pkg/kubelet/metrics
pkg/kubelet/oom
pkg/kubelet/pod/testing pkg/kubelet/pod/testing
pkg/kubelet/preemption pkg/kubelet/preemption
pkg/kubelet/prober pkg/kubelet/prober

6
pkg/kubelet/kubelet.go
View File

@@ -32,7 +32,7 @@ import (
"time" "time"
cadvisorapi "github.com/google/cadvisor/info/v1" cadvisorapi "github.com/google/cadvisor/info/v1"
"k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/fields"
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
@@ -465,7 +465,7 @@ func NewMainKubelet(kubeCfg *kubeletconfiginternal.KubeletConfiguration,
containerRefManager := kubecontainer.NewRefManager() containerRefManager := kubecontainer.NewRefManager()
oomWatcher := oomwatcher.NewOOMWatcher(kubeDeps.Recorder) oomWatcher := oomwatcher.NewWatcher(kubeDeps.Recorder)
clusterDNS := make([]net.IP, 0, len(kubeCfg.ClusterDNS)) clusterDNS := make([]net.IP, 0, len(kubeCfg.ClusterDNS))
for _, ipEntry := range kubeCfg.ClusterDNS { for _, ipEntry := range kubeCfg.ClusterDNS {
@@ -1079,7 +1079,7 @@ type Kubelet struct {
os kubecontainer.OSInterface os kubecontainer.OSInterface
// Watcher of out of memory events. // Watcher of out of memory events.
oomWatcher oomwatcher.OOMWatcher oomWatcher oomwatcher.Watcher
// Monitor resource usage // Monitor resource usage
resourceAnalyzer serverstats.ResourceAnalyzer resourceAnalyzer serverstats.ResourceAnalyzer

16
pkg/kubelet/oom/oom_watcher_linux.go
View File

@@ -19,7 +19,7 @@ limitations under the License.
package oom package oom
import ( import (
"k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/client-go/tools/record" "k8s.io/client-go/tools/record"
@@ -28,23 +28,23 @@ import (
"github.com/google/cadvisor/utils/oomparser" "github.com/google/cadvisor/utils/oomparser"
) )
type realOOMWatcher struct { type realWatcher struct {
recorder record.EventRecorder recorder record.EventRecorder
} }
var _ OOMWatcher = &realOOMWatcher{} var _ Watcher = &realWatcher{}
// NewOOMWatcher creates and initializes a OOMWatcher based on parameters. // NewWatcher creates and initializes a OOMWatcher based on parameters.
func NewOOMWatcher(recorder record.EventRecorder) OOMWatcher { func NewWatcher(recorder record.EventRecorder) Watcher {
return &realOOMWatcher{ return &realWatcher{
recorder: recorder, recorder: recorder,
} }
} }
const systemOOMEvent = "SystemOOM" const systemOOMEvent = "SystemOOM"
// Watches for system oom's and records an event for every system oom encountered. // Start watches for system oom's and records an event for every system oom encountered.
func (ow *realOOMWatcher) Start(ref *v1.ObjectReference) error { func (ow *realWatcher) Start(ref *v1.ObjectReference) error {
oomLog, err := oomparser.New() oomLog, err := oomparser.New()
if err != nil { if err != nil {
return err return err

5
pkg/kubelet/oom/oom_watcher_linux_test.go
View File

@@ -21,14 +21,15 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
"k8s.io/client-go/tools/record" "k8s.io/client-go/tools/record"
) )
// TestBasic verifies that the OOMWatch works without error.
func TestBasic(t *testing.T) { func TestBasic(t *testing.T) {
fakeRecorder := &record.FakeRecorder{} fakeRecorder := &record.FakeRecorder{}
node := &v1.ObjectReference{} node := &v1.ObjectReference{}
oomWatcher := NewOOMWatcher(fakeRecorder) oomWatcher := NewWatcher(fakeRecorder)
assert.NoError(t, oomWatcher.Start(node)) assert.NoError(t, oomWatcher.Start(node))
// TODO: Improve this test once cadvisor exports events.EventChannel as an interface // TODO: Improve this test once cadvisor exports events.EventChannel as an interface

8
pkg/kubelet/oom/oom_watcher_unsupported.go
View File

@@ -19,16 +19,16 @@ limitations under the License.
package oom package oom
import ( import (
"k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
"k8s.io/client-go/tools/record" "k8s.io/client-go/tools/record"
) )
type oomWatcherUnsupported struct{} type oomWatcherUnsupported struct{}
var _ OOMWatcher = new(oomWatcherUnsupported) var _ Watcher = new(oomWatcherUnsupported)
// NewOOMWatcher creates a fake one here // NewWatcher creates a fake one here
func NewOOMWatcher(_ record.EventRecorder) OOMWatcher { func NewWatcher(_ record.EventRecorder) Watcher {
return &oomWatcherUnsupported{} return &oomWatcherUnsupported{}
} }

8
pkg/kubelet/oom/types.go
View File

@@ -16,11 +16,9 @@ limitations under the License.
package oom package oom
import ( import v1 "k8s.io/api/core/v1"
"k8s.io/api/core/v1"
)
// OOMWatcher defines the interface of OOM watchers. // Watcher defines the interface of OOM watchers.
type OOMWatcher interface { type Watcher interface {
Start(ref *v1.ObjectReference) error Start(ref *v1.ObjectReference) error
} }