mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-21 19:01:49 +00:00
Merge pull request #78571 from SataQiu/fix-golint-kubelet-20190531
Fix golint failures of pkg/kubelet/prober pkg/kubelet/secret
This commit is contained in:
commit
a08084d475
@ -172,12 +172,10 @@ 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
|
|
||||||
pkg/kubelet/prober/results
|
pkg/kubelet/prober/results
|
||||||
pkg/kubelet/prober/testing
|
pkg/kubelet/prober/testing
|
||||||
pkg/kubelet/qos
|
pkg/kubelet/qos
|
||||||
pkg/kubelet/remote
|
pkg/kubelet/remote
|
||||||
pkg/kubelet/secret
|
|
||||||
pkg/kubelet/stats
|
pkg/kubelet/stats
|
||||||
pkg/kubelet/status
|
pkg/kubelet/status
|
||||||
pkg/kubelet/status/testing
|
pkg/kubelet/status/testing
|
||||||
|
@ -50,8 +50,8 @@ type prober struct {
|
|||||||
// probe types needs different httprobe instances so they don't
|
// probe types needs different httprobe instances so they don't
|
||||||
// share a connection pool which can cause collsions to the
|
// share a connection pool which can cause collsions to the
|
||||||
// same host:port and transient failures. See #49740.
|
// same host:port and transient failures. See #49740.
|
||||||
readinessHttp httprobe.Prober
|
readinessHTTP httprobe.Prober
|
||||||
livenessHttp httprobe.Prober
|
livenessHTTP httprobe.Prober
|
||||||
tcp tcprobe.Prober
|
tcp tcprobe.Prober
|
||||||
runner kubecontainer.ContainerCommandRunner
|
runner kubecontainer.ContainerCommandRunner
|
||||||
|
|
||||||
@ -69,8 +69,8 @@ func newProber(
|
|||||||
const followNonLocalRedirects = false
|
const followNonLocalRedirects = false
|
||||||
return &prober{
|
return &prober{
|
||||||
exec: execprobe.New(),
|
exec: execprobe.New(),
|
||||||
readinessHttp: httprobe.New(followNonLocalRedirects),
|
readinessHTTP: httprobe.New(followNonLocalRedirects),
|
||||||
livenessHttp: httprobe.New(followNonLocalRedirects),
|
livenessHTTP: httprobe.New(followNonLocalRedirects),
|
||||||
tcp: tcprobe.New(),
|
tcp: tcprobe.New(),
|
||||||
runner: runner,
|
runner: runner,
|
||||||
refManager: refManager,
|
refManager: refManager,
|
||||||
@ -175,10 +175,10 @@ func (pb *prober) runProbe(probeType probeType, p *v1.Probe, pod *v1.Pod, status
|
|||||||
headers := buildHeader(p.HTTPGet.HTTPHeaders)
|
headers := buildHeader(p.HTTPGet.HTTPHeaders)
|
||||||
klog.V(4).Infof("HTTP-Probe Headers: %v", headers)
|
klog.V(4).Infof("HTTP-Probe Headers: %v", headers)
|
||||||
if probeType == liveness {
|
if probeType == liveness {
|
||||||
return pb.livenessHttp.Probe(url, headers, timeout)
|
return pb.livenessHTTP.Probe(url, headers, timeout)
|
||||||
} else { // readiness
|
|
||||||
return pb.readinessHttp.Probe(url, headers, timeout)
|
|
||||||
}
|
}
|
||||||
|
// readiness
|
||||||
|
return pb.readinessHTTP.Probe(url, headers, timeout)
|
||||||
}
|
}
|
||||||
if p.TCPSocket != nil {
|
if p.TCPSocket != nil {
|
||||||
port, err := extractPort(p.TCPSocket.Port, container)
|
port, err := extractPort(p.TCPSocket.Port, container)
|
||||||
|
@ -92,6 +92,7 @@ type manager struct {
|
|||||||
prober *prober
|
prober *prober
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// NewManager creates a new prober manager instance.
|
||||||
func NewManager(
|
func NewManager(
|
||||||
statusManager status.Manager,
|
statusManager status.Manager,
|
||||||
livenessManager results.Manager,
|
livenessManager results.Manager,
|
||||||
|
@ -25,6 +25,7 @@ import (
|
|||||||
type fakeManager struct {
|
type fakeManager struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// NewFakeManager creates empty/fake secret manager
|
||||||
func NewFakeManager() Manager {
|
func NewFakeManager() Manager {
|
||||||
return &fakeManager{}
|
return &fakeManager{}
|
||||||
}
|
}
|
||||||
|
@ -33,6 +33,7 @@ import (
|
|||||||
"k8s.io/apimachinery/pkg/watch"
|
"k8s.io/apimachinery/pkg/watch"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// Manager interface provides methods for Kubelet to manage secrets.
|
||||||
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)
|
||||||
@ -54,6 +55,7 @@ type simpleSecretManager struct {
|
|||||||
kubeClient clientset.Interface
|
kubeClient clientset.Interface
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// NewSimpleSecretManager creates a new SecretManager instance.
|
||||||
func NewSimpleSecretManager(kubeClient clientset.Interface) Manager {
|
func NewSimpleSecretManager(kubeClient clientset.Interface) Manager {
|
||||||
return &simpleSecretManager{kubeClient: kubeClient}
|
return &simpleSecretManager{kubeClient: kubeClient}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user