mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-24 11:01:26 +00:00
apiserver: indroduces NotFoundHanlder
The new handler is meant to be executed at the end of the delegation chain. It simply checks if the request have been made before the server has installed all known HTTP paths. In that case it returns a 503 response otherwise it returns a 404. We don't want to add additional checks to the readyz path as it might prevent fixing bricked clusters. This specific handler is meant to "protect" requests that arrive before the paths and handlers are fully initialized.
This commit is contained in:
parent
7a342a0f8a
commit
53867975e7
@ -38,6 +38,7 @@ import (
|
|||||||
"k8s.io/apimachinery/pkg/util/sets"
|
"k8s.io/apimachinery/pkg/util/sets"
|
||||||
"k8s.io/apiserver/pkg/admission"
|
"k8s.io/apiserver/pkg/admission"
|
||||||
"k8s.io/apiserver/pkg/authorization/authorizer"
|
"k8s.io/apiserver/pkg/authorization/authorizer"
|
||||||
|
genericapifilters "k8s.io/apiserver/pkg/endpoints/filters"
|
||||||
openapinamer "k8s.io/apiserver/pkg/endpoints/openapi"
|
openapinamer "k8s.io/apiserver/pkg/endpoints/openapi"
|
||||||
genericfeatures "k8s.io/apiserver/pkg/features"
|
genericfeatures "k8s.io/apiserver/pkg/features"
|
||||||
genericapiserver "k8s.io/apiserver/pkg/server"
|
genericapiserver "k8s.io/apiserver/pkg/server"
|
||||||
|
@ -0,0 +1,66 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2021 The Kubernetes Authors.
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package notfoundhandler
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"net/http"
|
||||||
|
|
||||||
|
apierrors "k8s.io/apimachinery/pkg/api/errors"
|
||||||
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||||
|
"k8s.io/apimachinery/pkg/runtime"
|
||||||
|
"k8s.io/apimachinery/pkg/runtime/schema"
|
||||||
|
"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
|
||||||
|
apirequest "k8s.io/apiserver/pkg/endpoints/request"
|
||||||
|
)
|
||||||
|
|
||||||
|
// New returns an HTTP handler that is meant to be executed at the end of the delegation chain.
|
||||||
|
// It checks if the request have been made before the server has installed all known HTTP paths.
|
||||||
|
// In that case it returns a 503 response otherwise it returns a 404.
|
||||||
|
//
|
||||||
|
// Note that we don't want to add additional checks to the readyz path as it might prevent fixing bricked clusters.
|
||||||
|
// This specific handler is meant to "protect" requests that arrive before the paths and handlers are fully initialized.
|
||||||
|
func New(serializer runtime.NegotiatedSerializer, hasMuxIncompleteKeyFn func(ctx context.Context) bool) *Handler {
|
||||||
|
return &Handler{serializer: serializer, hasMuxIncompleteKeyFn: hasMuxIncompleteKeyFn}
|
||||||
|
}
|
||||||
|
|
||||||
|
type Handler struct {
|
||||||
|
serializer runtime.NegotiatedSerializer
|
||||||
|
hasMuxIncompleteKeyFn func(ctx context.Context) bool
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *Handler) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
|
||||||
|
if h.hasMuxIncompleteKeyFn(req.Context()) {
|
||||||
|
errMsg := fmt.Sprintf("the request has been made before all known HTTP paths have been installed, please try again")
|
||||||
|
err := apierrors.NewServiceUnavailable(errMsg)
|
||||||
|
if err.ErrStatus.Details == nil {
|
||||||
|
err.ErrStatus.Details = &metav1.StatusDetails{}
|
||||||
|
}
|
||||||
|
err.ErrStatus.Details.RetryAfterSeconds = int32(5)
|
||||||
|
|
||||||
|
gv := schema.GroupVersion{Group: "unknown", Version: "unknown"}
|
||||||
|
requestInfo, ok := apirequest.RequestInfoFrom(req.Context())
|
||||||
|
if ok {
|
||||||
|
gv.Group = requestInfo.APIGroup
|
||||||
|
gv.Version = requestInfo.APIVersion
|
||||||
|
}
|
||||||
|
responsewriters.ErrorNegotiated(err, h.serializer, gv, rw, req)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
http.NotFound(rw, req)
|
||||||
|
}
|
@ -0,0 +1,74 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2021 The Kubernetes Authors.
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package notfoundhandler
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"io"
|
||||||
|
"net/http/httptest"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"k8s.io/apimachinery/pkg/runtime"
|
||||||
|
"k8s.io/apimachinery/pkg/runtime/serializer"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestNotFoundHandler(t *testing.T) {
|
||||||
|
hasMuxIncompleteKeyGlobalValue := false
|
||||||
|
hasMuxIncompleteKeyTestFn := func(ctx context.Context) bool { return hasMuxIncompleteKeyGlobalValue }
|
||||||
|
serializer := serializer.NewCodecFactory(runtime.NewScheme()).WithoutConversion()
|
||||||
|
target := New(serializer, hasMuxIncompleteKeyTestFn)
|
||||||
|
|
||||||
|
// scenario 1: pretend the request has been made after the signal has been ready
|
||||||
|
req := httptest.NewRequest("GET", "http://apiserver.com/apis/flowcontrol.apiserver.k8s.io/v1beta1", nil)
|
||||||
|
rw := httptest.NewRecorder()
|
||||||
|
|
||||||
|
target.ServeHTTP(rw, req)
|
||||||
|
resp := rw.Result()
|
||||||
|
body, err := io.ReadAll(resp.Body)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
bodyStr := strings.TrimSuffix(string(body), "\n")
|
||||||
|
|
||||||
|
if resp.StatusCode != 404 {
|
||||||
|
t.Fatalf("unexpected status code %d, expected 503", resp.StatusCode)
|
||||||
|
}
|
||||||
|
expectedMsg := "404 page not found"
|
||||||
|
if bodyStr != expectedMsg {
|
||||||
|
t.Fatalf("unexpected response: %v, expected: %v", bodyStr, expectedMsg)
|
||||||
|
}
|
||||||
|
|
||||||
|
// scenario 2: pretend the request has been made before the signal has been ready
|
||||||
|
hasMuxIncompleteKeyGlobalValue = true
|
||||||
|
rw = httptest.NewRecorder()
|
||||||
|
|
||||||
|
target.ServeHTTP(rw, req)
|
||||||
|
resp = rw.Result()
|
||||||
|
body, err = io.ReadAll(resp.Body)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
bodyStr = strings.TrimSuffix(string(body), "\n")
|
||||||
|
if resp.StatusCode != 503 {
|
||||||
|
t.Fatalf("unexpected status code %d, expected 503", resp.StatusCode)
|
||||||
|
}
|
||||||
|
expectedMsg = `{"kind":"Status","apiVersion":"v1","metadata":{},"status":"Failure","message":"the request has been made before all known HTTP paths have been installed, please try again","reason":"ServiceUnavailable","details":{"retryAfterSeconds":5},"code":503}`
|
||||||
|
if bodyStr != expectedMsg {
|
||||||
|
t.Fatalf("unexpected response: %v, expected: %v", bodyStr, expectedMsg)
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user