github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #78347 from obitech/fix_golint_pkg_kubelet_prober

Browse Source 
Fix golint issues in pkg/kubelet/{prober,secret}
This commit is contained in:
Kubernetes Prow Robot 2019-06-27 17:43:21 -07:00 committed by GitHub
commit dfb7748542
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hack/.golint_failures
View File

@ -169,8 +169,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
pkg/kubelet/stats

2
pkg/kubelet/prober/prober.go
View File

@ -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"

4
pkg/kubelet/prober/prober_manager.go
View File

@ -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,

4
pkg/kubelet/prober/prober_manager_test.go
View File

@ -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{},
},

5
pkg/kubelet/prober/results/results_manager.go
View File

@ -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
)

24
pkg/kubelet/prober/testing/fake_manager.go
View File

@ -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
}

7
pkg/kubelet/secret/fake_manager.go
View File

@ -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) {
}

5
pkg/kubelet/secret/secret_manager.go
View File

@ -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)