feat: 共享集群支持查询集群下所有命名空间的release

TencentBlueKing · Dec 24, 2024 · f83a591 · f83a591
1 parent 86d5f22
commit f83a591
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/bcs-services/bcs-helm-manager/internal/actions/release/listv1.go b/bcs-services/bcs-helm-manager/internal/actions/release/listv1.go
@@ -102,10 +102,6 @@ func (l *ListReleaseV1Action) list() (*helmmanager.ReleaseListData, error) {
 		dbReleases = append(dbReleases, item.Transfer2Proto())
 	}
 
-	if cluster.IsShared && len(option.Namespace) == 0 {
-		return l.mergeReleases(nil, dbReleases), nil
-	}
-
 	// get release from cluster
 	_, origin, err := l.releaseHandler.Cluster(clusterID).List(l.ctx, option)
 	if err != nil {

diff --git a/bcs-services/bcs-helm-manager/internal/actions/release/listv2.go b/bcs-services/bcs-helm-manager/internal/actions/release/listv2.go
@@ -92,10 +92,6 @@ func (l *ListReleaseV2Action) list() (*helmmanager.ReleaseListData, error) {
 		dbReleases = append(dbReleases, item.Transfer2Proto())
 	}
 
-	if cluster.IsShared && len(option.Namespace) == 0 {
-		return l.mergeReleases(nil, dbReleases), nil
-	}
-
 	// get release from cluster
 	_, origin, err := l.releaseHandler.Cluster(clusterID).ListV2(l.ctx, option)
 	if err != nil {