mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-30 15:05:27 +00:00
Merge pull request #78347 from obitech/fix_golint_pkg_kubelet_prober
Fix golint issues in pkg/kubelet/{prober,secret}
This commit is contained in:
commit
dfb7748542
@ -169,8 +169,6 @@ pkg/kubelet/metrics
|
|||||||
pkg/kubelet/pluginmanager/pluginwatcher
|
pkg/kubelet/pluginmanager/pluginwatcher
|
||||||
pkg/kubelet/pod/testing
|
pkg/kubelet/pod/testing
|
||||||
pkg/kubelet/preemption
|
pkg/kubelet/preemption
|
||||||
pkg/kubelet/prober/results
|
|
||||||
pkg/kubelet/prober/testing
|
|
||||||
pkg/kubelet/qos
|
pkg/kubelet/qos
|
||||||
pkg/kubelet/remote
|
pkg/kubelet/remote
|
||||||
pkg/kubelet/stats
|
pkg/kubelet/stats
|
||||||
|
@ -26,7 +26,7 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"k8s.io/api/core/v1"
|
v1 "k8s.io/api/core/v1"
|
||||||
"k8s.io/apimachinery/pkg/util/intstr"
|
"k8s.io/apimachinery/pkg/util/intstr"
|
||||||
"k8s.io/client-go/tools/record"
|
"k8s.io/client-go/tools/record"
|
||||||
kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
|
kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
|
||||||
|
@ -20,7 +20,7 @@ import (
|
|||||||
"sync"
|
"sync"
|
||||||
|
|
||||||
"github.com/prometheus/client_golang/prometheus"
|
"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/types"
|
||||||
"k8s.io/apimachinery/pkg/util/sets"
|
"k8s.io/apimachinery/pkg/util/sets"
|
||||||
"k8s.io/apimachinery/pkg/util/wait"
|
"k8s.io/apimachinery/pkg/util/wait"
|
||||||
@ -92,7 +92,7 @@ type manager struct {
|
|||||||
prober *prober
|
prober *prober
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewManager creates a new prober manager instance.
|
// NewManager creates a Manager for pod probing.
|
||||||
func NewManager(
|
func NewManager(
|
||||||
statusManager status.Manager,
|
statusManager status.Manager,
|
||||||
livenessManager results.Manager,
|
livenessManager results.Manager,
|
||||||
|
@ -22,7 +22,7 @@ import (
|
|||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"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/types"
|
"k8s.io/apimachinery/pkg/types"
|
||||||
"k8s.io/apimachinery/pkg/util/runtime"
|
"k8s.io/apimachinery/pkg/util/runtime"
|
||||||
@ -37,7 +37,7 @@ func init() {
|
|||||||
runtime.ReallyCrash = true
|
runtime.ReallyCrash = true
|
||||||
}
|
}
|
||||||
|
|
||||||
var defaultProbe *v1.Probe = &v1.Probe{
|
var defaultProbe = &v1.Probe{
|
||||||
Handler: v1.Handler{
|
Handler: v1.Handler{
|
||||||
Exec: &v1.ExecAction{},
|
Exec: &v1.ExecAction{},
|
||||||
},
|
},
|
||||||
|
@ -19,7 +19,7 @@ package results
|
|||||||
import (
|
import (
|
||||||
"sync"
|
"sync"
|
||||||
|
|
||||||
"k8s.io/api/core/v1"
|
v1 "k8s.io/api/core/v1"
|
||||||
"k8s.io/apimachinery/pkg/types"
|
"k8s.io/apimachinery/pkg/types"
|
||||||
kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
|
kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
|
||||||
)
|
)
|
||||||
@ -43,7 +43,10 @@ type Manager interface {
|
|||||||
type Result bool
|
type Result bool
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
// Success is encoded as "true" (type Result)
|
||||||
Success Result = true
|
Success Result = true
|
||||||
|
|
||||||
|
// Failure is encoded as "false" (type Result)
|
||||||
Failure Result = false
|
Failure Result = false
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -17,19 +17,29 @@ limitations under the License.
|
|||||||
package testing
|
package testing
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"k8s.io/api/core/v1"
|
v1 "k8s.io/api/core/v1"
|
||||||
"k8s.io/apimachinery/pkg/types"
|
"k8s.io/apimachinery/pkg/types"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// FakeManager simulates a prober.Manager for testing.
|
||||||
type FakeManager struct{}
|
type FakeManager struct{}
|
||||||
|
|
||||||
// Unused methods.
|
// Unused methods below.
|
||||||
func (_ FakeManager) AddPod(_ *v1.Pod) {}
|
|
||||||
func (_ FakeManager) RemovePod(_ *v1.Pod) {}
|
|
||||||
func (_ FakeManager) CleanupPods(_ []*v1.Pod) {}
|
|
||||||
func (_ FakeManager) Start() {}
|
|
||||||
|
|
||||||
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 {
|
for i := range podStatus.ContainerStatuses {
|
||||||
podStatus.ContainerStatuses[i].Ready = true
|
podStatus.ContainerStatuses[i].Ready = true
|
||||||
}
|
}
|
||||||
|
@ -16,9 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
package secret
|
package secret
|
||||||
|
|
||||||
import (
|
import v1 "k8s.io/api/core/v1"
|
||||||
"k8s.io/api/core/v1"
|
|
||||||
)
|
|
||||||
|
|
||||||
// fakeManager implements Manager interface for testing purposes.
|
// fakeManager implements Manager interface for testing purposes.
|
||||||
// simple operations to apiserver.
|
// simple operations to apiserver.
|
||||||
@ -30,12 +28,15 @@ func NewFakeManager() Manager {
|
|||||||
return &fakeManager{}
|
return &fakeManager{}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GetSecret returns a nil secret for testing
|
||||||
func (s *fakeManager) GetSecret(namespace, name string) (*v1.Secret, error) {
|
func (s *fakeManager) GetSecret(namespace, name string) (*v1.Secret, error) {
|
||||||
return nil, nil
|
return nil, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// RegisterPod implements the RegisterPod method for testing purposes.
|
||||||
func (s *fakeManager) RegisterPod(pod *v1.Pod) {
|
func (s *fakeManager) RegisterPod(pod *v1.Pod) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// UnregisterPod implements the UnregisterPod method for testing purposes.
|
||||||
func (s *fakeManager) UnregisterPod(pod *v1.Pod) {
|
func (s *fakeManager) UnregisterPod(pod *v1.Pod) {
|
||||||
}
|
}
|
||||||
|
@ -20,7 +20,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"k8s.io/api/core/v1"
|
v1 "k8s.io/api/core/v1"
|
||||||
clientset "k8s.io/client-go/kubernetes"
|
clientset "k8s.io/client-go/kubernetes"
|
||||||
podutil "k8s.io/kubernetes/pkg/api/v1/pod"
|
podutil "k8s.io/kubernetes/pkg/api/v1/pod"
|
||||||
corev1 "k8s.io/kubernetes/pkg/apis/core/v1"
|
corev1 "k8s.io/kubernetes/pkg/apis/core/v1"
|
||||||
@ -33,7 +33,8 @@ import (
|
|||||||
"k8s.io/apimachinery/pkg/watch"
|
"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 {
|
type Manager interface {
|
||||||
// Get secret by secret namespace and name.
|
// Get secret by secret namespace and name.
|
||||||
GetSecret(namespace, name string) (*v1.Secret, error)
|
GetSecret(namespace, name string) (*v1.Secret, error)
|
||||||
|
Loading…
Reference in New Issue
Block a user