fix: multi-cluster proxy authentication

Signed-off-by: hongming <talonwan@yunify.com>
2020-06-19 13:30:40 +08:00
parent 0493a352dc
commit ee741858b6
7 changed files with 163 additions and 37 deletions
--- a/pkg/apiserver/request/requestinfo.go
+++ b/pkg/apiserver/request/requestinfo.go
@@ -299,10 +299,6 @@ const (

 func (r *RequestInfoFactory) resolveResourceScope(request RequestInfo) string {

-	if request.Cluster != "" {
-		return ClusterScope
-	}
-
 	if request.Namespace != "" {
 		return NamespaceScope
 	}
@@ -311,5 +307,5 @@ func (r *RequestInfoFactory) resolveResourceScope(request RequestInfo) string {
 		return WorkspaceScope
 	}

-	return GlobalScope
+	return ClusterScope
 }