From 897e8c0de6db6a9d13db56de3c2afc322423aa3a Mon Sep 17 00:00:00 2001 From: obitech Date: Sat, 25 May 2019 21:54:17 +0200 Subject: [PATCH 1/3] Fix golint issues in pkg/kubelet/prober --- pkg/kubelet/prober/prober.go | 2 +- pkg/kubelet/prober/prober_manager.go | 4 ++-- pkg/kubelet/prober/prober_manager_test.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/kubelet/prober/prober.go b/pkg/kubelet/prober/prober.go index d2e01d80c5b..cf22e6278b2 100644 --- a/pkg/kubelet/prober/prober.go +++ b/pkg/kubelet/prober/prober.go @@ -26,7 +26,7 @@ import ( "strings" "time" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/client-go/tools/record" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" diff --git a/pkg/kubelet/prober/prober_manager.go b/pkg/kubelet/prober/prober_manager.go index 6f4fabd0af5..9ee312eb63e 100644 --- a/pkg/kubelet/prober/prober_manager.go +++ b/pkg/kubelet/prober/prober_manager.go @@ -20,7 +20,7 @@ import ( "sync" "github.com/prometheus/client_golang/prometheus" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" @@ -92,7 +92,7 @@ type manager struct { prober *prober } -// NewManager creates a new prober manager instance. +// NewManager creates a Manager for pod probing. func NewManager( statusManager status.Manager, livenessManager results.Manager, diff --git a/pkg/kubelet/prober/prober_manager_test.go b/pkg/kubelet/prober/prober_manager_test.go index 2ea5d63fbc9..72593c85d5c 100644 --- a/pkg/kubelet/prober/prober_manager_test.go +++ b/pkg/kubelet/prober/prober_manager_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/runtime" @@ -37,7 +37,7 @@ func init() { runtime.ReallyCrash = true } -var defaultProbe *v1.Probe = &v1.Probe{ +var defaultProbe = &v1.Probe{ Handler: v1.Handler{ Exec: &v1.ExecAction{}, }, From b767b1b2506946a265c071deae43fa77b9cc9738 Mon Sep 17 00:00:00 2001 From: obitech Date: Sat, 25 May 2019 21:57:22 +0200 Subject: [PATCH 2/3] Fix golint issues in pkg/kubelet/prober/results --- hack/.golint_failures | 1 - pkg/kubelet/prober/results/results_manager.go | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hack/.golint_failures b/hack/.golint_failures index a7c7158af5e..28b2b7b1350 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -170,7 +170,6 @@ pkg/kubelet/metrics pkg/kubelet/pluginmanager/pluginwatcher pkg/kubelet/pod/testing pkg/kubelet/preemption -pkg/kubelet/prober/results pkg/kubelet/prober/testing pkg/kubelet/qos pkg/kubelet/remote diff --git a/pkg/kubelet/prober/results/results_manager.go b/pkg/kubelet/prober/results/results_manager.go index f66a472c381..58d02c588c3 100644 --- a/pkg/kubelet/prober/results/results_manager.go +++ b/pkg/kubelet/prober/results/results_manager.go @@ -19,7 +19,7 @@ package results import ( "sync" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" ) @@ -43,7 +43,10 @@ type Manager interface { type Result bool const ( + // Success is encoded as "true" (type Result) Success Result = true + + // Failure is encoded as "false" (type Result) Failure Result = false ) From cbdfccc9f83c3a5993df318dbe252d47f81aeb16 Mon Sep 17 00:00:00 2001 From: obitech Date: Sat, 25 May 2019 22:35:35 +0200 Subject: [PATCH 3/3] Fix golint issues in pkg/kubelet/secret --- hack/.golint_failures | 1 - pkg/kubelet/prober/testing/fake_manager.go | 24 +++++++++++++++------- pkg/kubelet/secret/fake_manager.go | 7 ++++--- pkg/kubelet/secret/secret_manager.go | 5 +++-- 4 files changed, 24 insertions(+), 13 deletions(-) diff --git a/hack/.golint_failures b/hack/.golint_failures index 28b2b7b1350..87548266087 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -170,7 +170,6 @@ pkg/kubelet/metrics pkg/kubelet/pluginmanager/pluginwatcher pkg/kubelet/pod/testing pkg/kubelet/preemption -pkg/kubelet/prober/testing pkg/kubelet/qos pkg/kubelet/remote pkg/kubelet/stats diff --git a/pkg/kubelet/prober/testing/fake_manager.go b/pkg/kubelet/prober/testing/fake_manager.go index 23ba94d91f9..e0cfc785133 100644 --- a/pkg/kubelet/prober/testing/fake_manager.go +++ b/pkg/kubelet/prober/testing/fake_manager.go @@ -17,19 +17,29 @@ limitations under the License. package testing import ( - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" ) +// FakeManager simulates a prober.Manager for testing. type FakeManager struct{} -// Unused methods. -func (_ FakeManager) AddPod(_ *v1.Pod) {} -func (_ FakeManager) RemovePod(_ *v1.Pod) {} -func (_ FakeManager) CleanupPods(_ []*v1.Pod) {} -func (_ FakeManager) Start() {} +// Unused methods below. -func (_ FakeManager) UpdatePodStatus(_ types.UID, podStatus *v1.PodStatus) { +// AddPod simulates adding a Pod. +func (FakeManager) AddPod(_ *v1.Pod) {} + +// RemovePod simulates removing a Pod. +func (FakeManager) RemovePod(_ *v1.Pod) {} + +// CleanupPods simulates cleaning up Pods. +func (FakeManager) CleanupPods(_ []*v1.Pod) {} + +// Start simulates start syncing the probe status +func (FakeManager) Start() {} + +// UpdatePodStatus simulates updating the Pod Status. +func (FakeManager) UpdatePodStatus(_ types.UID, podStatus *v1.PodStatus) { for i := range podStatus.ContainerStatuses { podStatus.ContainerStatuses[i].Ready = true } diff --git a/pkg/kubelet/secret/fake_manager.go b/pkg/kubelet/secret/fake_manager.go index 023582d97aa..4f4bf9fe4cd 100644 --- a/pkg/kubelet/secret/fake_manager.go +++ b/pkg/kubelet/secret/fake_manager.go @@ -16,9 +16,7 @@ limitations under the License. package secret -import ( - "k8s.io/api/core/v1" -) +import v1 "k8s.io/api/core/v1" // fakeManager implements Manager interface for testing purposes. // simple operations to apiserver. @@ -30,12 +28,15 @@ func NewFakeManager() Manager { return &fakeManager{} } +// GetSecret returns a nil secret for testing func (s *fakeManager) GetSecret(namespace, name string) (*v1.Secret, error) { return nil, nil } +// RegisterPod implements the RegisterPod method for testing purposes. func (s *fakeManager) RegisterPod(pod *v1.Pod) { } +// UnregisterPod implements the UnregisterPod method for testing purposes. func (s *fakeManager) UnregisterPod(pod *v1.Pod) { } diff --git a/pkg/kubelet/secret/secret_manager.go b/pkg/kubelet/secret/secret_manager.go index 14c6572547a..56843ed9107 100644 --- a/pkg/kubelet/secret/secret_manager.go +++ b/pkg/kubelet/secret/secret_manager.go @@ -20,7 +20,7 @@ import ( "fmt" "time" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" clientset "k8s.io/client-go/kubernetes" podutil "k8s.io/kubernetes/pkg/api/v1/pod" corev1 "k8s.io/kubernetes/pkg/apis/core/v1" @@ -33,7 +33,8 @@ import ( "k8s.io/apimachinery/pkg/watch" ) -// Manager interface provides methods for Kubelet to manage secrets. +// Manager manages Kubernets secrets. This includes retrieving +// secrets or registering/unregistering them via Pods. type Manager interface { // Get secret by secret namespace and name. GetSecret(namespace, name string) (*v1.Secret, error)