Skip to content

Commit dd1e3f2

Browse files
adevjoeifooth
authored andcommitted
fix: cluster-resource shared cluster ns (merge request !2365)
Squash merge branch 'fix/cr-ns-1.30' into 'v1.30.x' fix: cluster-resource shared cluster ns
1 parent 089bb58 commit dd1e3f2

File tree

1 file changed

+11
-2
lines changed
  • bcs-services/cluster-resources/pkg/resource/client

1 file changed

+11
-2
lines changed

bcs-services/cluster-resources/pkg/resource/client/ns.go

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,12 @@ func (c *NSClient) List(ctx context.Context, opts metav1.ListOptions) (map[strin
6262
if err != nil {
6363
return nil, err
6464
}
65-
if clusterInfo.Type == cluster.ClusterTypeShared {
65+
projInfo, err := project.FromContext(ctx)
66+
if err != nil {
67+
return nil, err
68+
}
69+
70+
if clusterInfo.Type == cluster.ClusterTypeShared && clusterInfo.ProjID != projInfo.ID {
6671
return filterProjNSList(ctx, manifest)
6772
}
6873
return manifest, nil
@@ -93,7 +98,11 @@ func (c *NSClient) ListByClusterViewPerm(
9398
if err != nil {
9499
return nil, err
95100
}
96-
if clusterInfo.Type == cluster.ClusterTypeShared {
101+
projInfo, err := project.FromContext(ctx)
102+
if err != nil {
103+
return nil, err
104+
}
105+
if clusterInfo.Type == cluster.ClusterTypeShared && clusterInfo.ProjID != projInfo.ID {
97106
return filterProjNSList(ctx, manifest)
98107
}
99108
return manifest, nil

0 commit comments

Comments
 (0)