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

Code cleanup for for probe/http

Browse Source 
Two small code cleanup changes for `probe/http`.

- Tests name the `followNonLocalRedirects` variable before passing to
`New`, so its clear what the boolean flag in the construct impacts.
- Change import name from `httprobe` to `httpprobe` when used by
`pkg/kubelet/prober/prober.go`. Establishes consistency with other uses
in the repo.
This commit is contained in:
mattjmcnaughton 2019-05-17 10:18:01 -04:00
parent 6602f61596
commit 46267759bc
No known key found for this signature in database
GPG Key ID: BC530981A9A1CC9D
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,7 +35,7 @@ import (
"k8s.io/kubernetes/pkg/kubelet/util/format" "k8s.io/kubernetes/pkg/kubelet/util/format"
"k8s.io/kubernetes/pkg/probe" "k8s.io/kubernetes/pkg/probe"
execprobe "k8s.io/kubernetes/pkg/probe/exec" execprobe "k8s.io/kubernetes/pkg/probe/exec"
httprobe "k8s.io/kubernetes/pkg/probe/http" httpprobe "k8s.io/kubernetes/pkg/probe/http"
tcprobe "k8s.io/kubernetes/pkg/probe/tcp" tcprobe "k8s.io/kubernetes/pkg/probe/tcp"
"k8s.io/utils/exec" "k8s.io/utils/exec"
@ -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 httpprobe.Prober
livenessHTTP httprobe.Prober livenessHTTP httpprobe.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: httpprobe.New(followNonLocalRedirects),
livenessHTTP: httprobe.New(followNonLocalRedirects), livenessHTTP: httpprobe.New(followNonLocalRedirects),
tcp: tcprobe.New(), tcp: tcprobe.New(),
runner: runner, runner: runner,
refManager: refManager, refManager: refManager,

12
pkg/probe/http/http_test.go
View File

@ -67,7 +67,8 @@ func TestHTTPProbeProxy(t *testing.T) {
defer unsetEnv("no_proxy")() defer unsetEnv("no_proxy")()
defer unsetEnv("NO_PROXY")() defer unsetEnv("NO_PROXY")()
prober := New(true) followNonLocalRedirects := true
prober := New(followNonLocalRedirects)
go func() { go func() {
http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
@ -122,7 +123,8 @@ func TestHTTPProbeChecker(t *testing.T) {
} }
} }
prober := New(true) followNonLocalRedirects := true
prober := New(followNonLocalRedirects)
testCases := []struct { testCases := []struct {
handler func(w http.ResponseWriter, r *http.Request) handler func(w http.ResponseWriter, r *http.Request)
reqHeaders http.Header reqHeaders http.Header
@ -299,14 +301,16 @@ func TestHTTPProbeChecker_NonLocalRedirects(t *testing.T) {
} }
for desc, test := range testCases { for desc, test := range testCases {
t.Run(desc+"-local", func(t *testing.T) { t.Run(desc+"-local", func(t *testing.T) {
prober := New(false) followNonLocalRedirects := false
prober := New(followNonLocalRedirects)
target, err := url.Parse(server.URL + "/redirect?loc=" + url.QueryEscape(test.redirect)) target, err := url.Parse(server.URL + "/redirect?loc=" + url.QueryEscape(test.redirect))
require.NoError(t, err) require.NoError(t, err)
result, _, _ := prober.Probe(target, nil, wait.ForeverTestTimeout) result, _, _ := prober.Probe(target, nil, wait.ForeverTestTimeout)
assert.Equal(t, test.expectLocalResult, result) assert.Equal(t, test.expectLocalResult, result)
}) })
t.Run(desc+"-nonlocal", func(t *testing.T) { t.Run(desc+"-nonlocal", func(t *testing.T) {
prober := New(true) followNonLocalRedirects := true
prober := New(followNonLocalRedirects)
target, err := url.Parse(server.URL + "/redirect?loc=" + url.QueryEscape(test.redirect)) target, err := url.Parse(server.URL + "/redirect?loc=" + url.QueryEscape(test.redirect))
require.NoError(t, err) require.NoError(t, err)
result, _, _ := prober.Probe(target, nil, wait.ForeverTestTimeout) result, _, _ := prober.Probe(target, nil, wait.ForeverTestTimeout)