fix kubeapiserver proxy rejects all dryRun requests (#2240)

This commit is contained in:
zryfish
2020-06-22 14:24:59 +08:00
committed by GitHub
parent 60444ba945
commit 5caee71b25
3 changed files with 31 additions and 12 deletions

View File

@@ -21,9 +21,10 @@ import (
"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
"kubesphere.io/kubesphere/pkg/apiserver/request"
"net/http"
"strings"
)
func WithRequestInfo(handler http.Handler, resolver request.RequestInfoResolver) http.Handler {
func WithRequestInfo(handler http.Handler, resolver request.RequestInfoResolver, multiClusterEnabled bool) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
ctx := req.Context()
info, err := resolver.NewRequestInfo(req)
@@ -32,16 +33,26 @@ func WithRequestInfo(handler http.Handler, resolver request.RequestInfoResolver)
return
}
// KubeSphere supports kube-apiserver proxy requests in multicluster mode. But kube-apiserver
// stripped all authorization headers. Use custom header to carry token to avoid losing authentication token.
// We may need a better way. See issue below.
// https://github.com/kubernetes/kubernetes/issues/38775#issuecomment-277915961
authorization := req.Header.Get("Authorization")
if len(authorization) == 0 {
xAuthorization := req.Header.Get("X-KubeSphere-Authorization")
if len(xAuthorization) != 0 {
req.Header.Set("Authorization", xAuthorization)
req.Header.Del("X-KubeSphere-Authorization")
if multiClusterEnabled {
// KubeSphere supports kube-apiserver proxy requests in multicluster mode. But kube-apiserver
// stripped all authorization headers. Use custom header to carry token to avoid losing authentication token.
// We may need a better way. See issue below.
// https://github.com/kubernetes/kubernetes/issues/38775#issuecomment-277915961
authorization := req.Header.Get("Authorization")
if len(authorization) == 0 {
xAuthorization := req.Header.Get("X-KubeSphere-Authorization")
if len(xAuthorization) != 0 {
req.Header.Set("Authorization", xAuthorization)
req.Header.Del("X-KubeSphere-Authorization")
}
}
// kube-apiserver proxy rejects all proxy requests with dryRun, we had on choice but to
// replace it with 'dryrun' before proxy and convert it back before send it to kube-apiserver
// https://github.com/kubernetes/kubernetes/pull/66083
// See pkg/apiserver/dispatch/dispatch.go for more details
if len(req.URL.Query()["dryrun"]) != 0 {
req.URL.RawQuery = strings.Replace(req.URL.RawQuery, "dryrun", "dryRun", 1)
}
}