Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Delete the role-templates annotation for disabling role to users #2062

Merged
merged 4 commits into from
Aug 11, 2022
Merged

Delete the role-templates annotation for disabling role to users #2062

merged 4 commits into from
Aug 11, 2022

Conversation

zhou1203
Copy link
Member

@zhou1203 zhou1203 commented Aug 1, 2022 •
edited
Loading

The purpose of this PR is to remove role-template-manage-users, role-template-manage-roles in GlobalRole, and role-template-view-members in WorkspaceRole.

Following this Issue：
kubesphere/kubesphere#5054 kubesphere/kubesphere#5111

@ks-ci-bot ks-ci-bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Aug 1, 2022
@zhou1203
Copy link
Member Author

zhou1203 commented Aug 1, 2022

/cc @wansir @pixiake

@ks-ci-bot ks-ci-bot requested review from pixiake and wansir August 1, 2022 10:37
@wansir
Copy link
Member

wansir commented Aug 8, 2022

Remove the useless block directly.

@ks-ci-bot ks-ci-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Aug 8, 2022
@ks-ci-bot ks-ci-bot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Aug 8, 2022
@zhou1203
Copy link
Member Author

zhou1203 commented Aug 9, 2022 •
edited
Loading

After discussion, we decided to delete only their annotation iam.kubesphere.io/module at this stage, and the front-end filters through annotations to make some permission items invisible to users. @wansir

zhou1203 added 3 commits August 9, 2022 18:02
@zhou1203
delete the annotation iam.kubesphere.io/module of
0951488 
- GlobalRole role-template-manage-users
- GlobalRole role-template-manage-roles
- WorkspaceRole role-template-manage-roles
- RoleBase role-template-manage-roles

Signed-off-by: Wenhao Zhou <wenhaozhou@yunify.com>
@zhou1203
delete the annotation iam.kubesphere.io/module of
e7735a6 
- WorkspaceRole role-template-manage-members
- RoleBase role-template-manage-members

Signed-off-by: Wenhao Zhou <wenhaozhou@yunify.com>
@zhou1203
add view workspace members to view workspace basic
0c8f6a2 
Signed-off-by: Wenhao Zhou <wenhaozhou@yunify.com>
@zhou1203 zhou1203 changed the title Update Roletemplate Delete the role-templates annotation for disable to users Aug 9, 2022
@ks-ci-bot ks-ci-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Aug 10, 2022
@zhou1203 zhou1203 changed the title Delete the role-templates annotation for disable to users Delete the role-templates annotation for disabling role to users Aug 10, 2022
@zhou1203
delete dependencies, alias-name
a3e6cfe 
Signed-off-by: Wenhao Zhou <wenhaozhou@yunify.com>
@wansir
Copy link
Member

wansir commented Aug 11, 2022

/lgtm
/approve

@ks-ci-bot ks-ci-bot added the lgtm Indicates that a PR is ready to be merged. label Aug 11, 2022
@ks-ci-bot
Copy link
Collaborator

LGTM label has been added.

Git tree hash: bfb5af3da593165cc70a2bacdf6ea91ab21b1016

@pixiake
Copy link
Collaborator

pixiake commented Aug 11, 2022

/approve

@ks-ci-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: pixiake, wansir, zhou1203

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ks-ci-bot ks-ci-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 11, 2022
@ks-ci-bot ks-ci-bot merged commit 352f5de into kubesphere:master Aug 11, 2022
@wansir
Copy link
Member

wansir commented Aug 11, 2022

/cherry-pick release-3.3

@ks-ci-bot ks-ci-bot mentioned this pull request Aug 11, 2022
Merged
@ks-ci-bot
Copy link
Collaborator

@wansir: new pull request created: #2074

In response to this:

/cherry-pick release-3.3

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pixiake pixiake Awaiting requested review from pixiake

@wansir wansir Awaiting requested review from wansir

Assignees

@wansir wansir

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@zhou1203 @wansir @ks-ci-bot @pixiake