From 3b8c28d21eeef8dde87f8f7d1c9c8bcf88a9bd55 Mon Sep 17 00:00:00 2001 From: KubeSphere CI Bot <47586280+ks-ci-bot@users.noreply.github.com> Date: Tue, 23 Aug 2022 10:30:21 +0800 Subject: [PATCH] [release-3.3] Support for filtering workspace roles using labelSelector (#5162) Support for filtering workspace roles using labelSelector Signed-off-by: Wenhao Zhou Signed-off-by: Wenhao Zhou Co-authored-by: Wenhao Zhou --- pkg/kapis/iam/v1alpha2/handler.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/kapis/iam/v1alpha2/handler.go b/pkg/kapis/iam/v1alpha2/handler.go index 9bb58077b..49cdc9f94 100644 --- a/pkg/kapis/iam/v1alpha2/handler.go +++ b/pkg/kapis/iam/v1alpha2/handler.go @@ -380,6 +380,7 @@ func (h *iamHandler) ListWorkspaceRoles(request *restful.Request, response *rest queryParam.Filters[iamv1alpha2.ScopeWorkspace] = query.Value(workspace) // shared workspace role template if string(queryParam.Filters[query.FieldLabel]) == fmt.Sprintf("%s=%s", iamv1alpha2.RoleTemplateLabel, "true") || + strings.Contains(queryParam.LabelSelector, iamv1alpha2.RoleTemplateLabel) || queryParam.Filters[iamv1alpha2.AggregateTo] != "" { delete(queryParam.Filters, iamv1alpha2.ScopeWorkspace) }