From 5a2e6bd0001a96c4e7137c3b65155d600d6e55e2 Mon Sep 17 00:00:00 2001 From: Uzuku Date: Sat, 21 Sep 2019 23:39:36 +0800 Subject: [PATCH] Fix golint failures of pkg/kubelet/status/... --- hack/.golint_failures | 2 -- pkg/kubelet/status/generate.go | 11 ++++++++--- pkg/kubelet/status/status_manager.go | 3 ++- .../status/testing/fake_pod_deletion_safety.go | 3 +++ .../status/testing/mock_pod_status_provider.go | 2 ++ 5 files changed, 15 insertions(+), 6 deletions(-) diff --git a/hack/.golint_failures b/hack/.golint_failures index d30f8c04cf03f..2f297b8b55ac7 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -133,8 +133,6 @@ pkg/kubelet/pod/testing pkg/kubelet/preemption pkg/kubelet/remote pkg/kubelet/stats -pkg/kubelet/status -pkg/kubelet/status/testing pkg/kubelet/sysctl pkg/kubelet/types pkg/kubemark diff --git a/pkg/kubelet/status/generate.go b/pkg/kubelet/status/generate.go index 8d9415d224783..ef87faa993c80 100644 --- a/pkg/kubelet/status/generate.go +++ b/pkg/kubelet/status/generate.go @@ -25,11 +25,16 @@ import ( ) const ( + // UnknownContainerStatuses says that all container statuses are unknown. UnknownContainerStatuses = "UnknownContainerStatuses" - PodCompleted = "PodCompleted" - ContainersNotReady = "ContainersNotReady" + // PodCompleted says that all related containers have succeeded. + PodCompleted = "PodCompleted" + // ContainersNotReady says that one or more containers are not ready. + ContainersNotReady = "ContainersNotReady" + // ContainersNotInitialized says that one or more init containers have not succeeded. ContainersNotInitialized = "ContainersNotInitialized" - ReadinessGatesNotReady = "ReadinessGatesNotReady" + // ReadinessGatesNotReady says that one or more pod readiness gates are not ready. + ReadinessGatesNotReady = "ReadinessGatesNotReady" ) // GenerateContainersReadyCondition returns the status of "ContainersReady" condition. diff --git a/pkg/kubelet/status/status_manager.go b/pkg/kubelet/status/status_manager.go index 92b24ec3f52a1..bc9db8c58f38d 100644 --- a/pkg/kubelet/status/status_manager.go +++ b/pkg/kubelet/status/status_manager.go @@ -79,7 +79,7 @@ type PodStatusProvider interface { GetPodStatus(uid types.UID) (v1.PodStatus, bool) } -// An object which provides guarantees that a pod can be safely deleted. +// PodDeletionSafetyProvider provides guarantees that a pod can be safely deleted. type PodDeletionSafetyProvider interface { // A function which returns true if the pod can safely be deleted PodResourcesAreReclaimed(pod *v1.Pod, status v1.PodStatus) bool @@ -115,6 +115,7 @@ type Manager interface { const syncPeriod = 10 * time.Second +// NewManager returns a functional Manager. func NewManager(kubeClient clientset.Interface, podManager kubepod.Manager, podDeletionSafety PodDeletionSafetyProvider) Manager { return &manager{ kubeClient: kubeClient, diff --git a/pkg/kubelet/status/testing/fake_pod_deletion_safety.go b/pkg/kubelet/status/testing/fake_pod_deletion_safety.go index f9966bf80fdeb..174c6e17515c6 100644 --- a/pkg/kubelet/status/testing/fake_pod_deletion_safety.go +++ b/pkg/kubelet/status/testing/fake_pod_deletion_safety.go @@ -18,8 +18,11 @@ package testing import "k8s.io/api/core/v1" +// FakePodDeletionSafetyProvider is a fake PodDeletionSafetyProvider for test. type FakePodDeletionSafetyProvider struct{} +// PodResourcesAreReclaimed implements PodDeletionSafetyProvider. +// Always reports that all pod resources are reclaimed. func (f *FakePodDeletionSafetyProvider) PodResourcesAreReclaimed(pod *v1.Pod, status v1.PodStatus) bool { return true } diff --git a/pkg/kubelet/status/testing/mock_pod_status_provider.go b/pkg/kubelet/status/testing/mock_pod_status_provider.go index cef85222ada0e..fb07925f7cca3 100644 --- a/pkg/kubelet/status/testing/mock_pod_status_provider.go +++ b/pkg/kubelet/status/testing/mock_pod_status_provider.go @@ -23,10 +23,12 @@ import ( "k8s.io/apimachinery/pkg/types" ) +// MockStatusProvider mocks a PodStatusProvider. type MockStatusProvider struct { mock.Mock } +// GetPodStatus implements PodStatusProvider. func (m *MockStatusProvider) GetPodStatus(uid types.UID) (v1.PodStatus, bool) { args := m.Called(uid) return args.Get(0).(v1.PodStatus), args.Bool(1)