mirror of https://github.com/k3s-io/k3s
Merge pull request #56601 from anfernee/probe-test
Automatic merge from submit-queue (batch tested with PRs 57127, 57011, 56754, 56601, 56483). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Test probe for redirect endpoint Make sure #18233 works **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes #18233 **Special notes for your reviewer**: **Release note**: ```release-note None ```pull/6/head
commit
a2e02ab5b6
|
@ -52,6 +52,16 @@ func TestHTTPProbeChecker(t *testing.T) {
|
||||||
w.Write([]byte(output))
|
w.Write([]byte(output))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
redirectHandler := func(s int, bad bool) func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
return func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
if r.URL.Path == "/" {
|
||||||
|
http.Redirect(w, r, "/new", s)
|
||||||
|
} else if bad && r.URL.Path == "/new" {
|
||||||
|
w.WriteHeader(http.StatusInternalServerError)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
prober := New()
|
prober := New()
|
||||||
testCases := []struct {
|
testCases := []struct {
|
||||||
handler func(w http.ResponseWriter, r *http.Request)
|
handler func(w http.ResponseWriter, r *http.Request)
|
||||||
|
@ -122,6 +132,38 @@ func TestHTTPProbeChecker(t *testing.T) {
|
||||||
},
|
},
|
||||||
health: probe.Failure,
|
health: probe.Failure,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
handler: redirectHandler(http.StatusMovedPermanently, false), // 301
|
||||||
|
health: probe.Success,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
handler: redirectHandler(http.StatusMovedPermanently, true), // 301
|
||||||
|
health: probe.Failure,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
handler: redirectHandler(http.StatusFound, false), // 302
|
||||||
|
health: probe.Success,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
handler: redirectHandler(http.StatusFound, true), // 302
|
||||||
|
health: probe.Failure,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
handler: redirectHandler(http.StatusTemporaryRedirect, false), // 307
|
||||||
|
health: probe.Success,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
handler: redirectHandler(http.StatusTemporaryRedirect, true), // 307
|
||||||
|
health: probe.Failure,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
handler: redirectHandler(http.StatusPermanentRedirect, false), // 308
|
||||||
|
health: probe.Success,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
handler: redirectHandler(http.StatusPermanentRedirect, true), // 308
|
||||||
|
health: probe.Failure,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
for i, test := range testCases {
|
for i, test := range testCases {
|
||||||
func() {
|
func() {
|
||||||
|
|
Loading…
Reference in New Issue