From dd5b96254c596bd7e631c104f248268863a98ad1 Mon Sep 17 00:00:00 2001
From: zryfish <jeffzhang@yunify.com>
Date: Fri, 10 Apr 2020 14:47:41 +0800
Subject: [PATCH] fix cluster bug (#1997)

---
 pkg/apiserver/filters/kubeapiserver.go | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/pkg/apiserver/filters/kubeapiserver.go b/pkg/apiserver/filters/kubeapiserver.go
index 009ed5dc..f259dad7 100644
--- a/pkg/apiserver/filters/kubeapiserver.go
+++ b/pkg/apiserver/filters/kubeapiserver.go
@@ -1,7 +1,7 @@
 package filters
 
 import (
-	"fmt"
+	"k8s.io/apimachinery/pkg/util/proxy"
 	"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
 	"k8s.io/client-go/rest"
 	"k8s.io/klog"
@@ -9,9 +9,6 @@ import (
 	"kubesphere.io/kubesphere/pkg/server/errors"
 	"net/http"
 	"net/url"
-	"strings"
-
-	"k8s.io/apimachinery/pkg/util/proxy"
 )
 
 // WithKubeAPIServer proxy request to kubernetes service if requests path starts with /api
@@ -35,8 +32,6 @@ func WithKubeAPIServer(handler http.Handler, config *rest.Config, failed proxy.E
 			s := *req.URL
 			s.Host = kubernetes.Host
 			s.Scheme = kubernetes.Scheme
-			// remove cluster path
-			s.Path = strings.Replace(s.Path, fmt.Sprintf("/clusters/%s", info.Cluster), "", 1)
 
 			httpProxy := proxy.NewUpgradeAwareHandler(&s, defaultTransport, true, false, failed)
 			httpProxy.ServeHTTP(w, req)
-- 
GitLab