Skip to content

feat(license): suppor limit user count#6556

Merged
cuisongliu merged 3 commits intolabring:mainfrom
bxy4543:limit-user-counter2
Jan 21, 2026
Merged

feat(license): suppor limit user count#6556
cuisongliu merged 3 commits intolabring:mainfrom
bxy4543:limit-user-counter2

Conversation

@bxy4543
Copy link
Member

@bxy4543 bxy4543 commented Jan 21, 2026

No description provided.

…icense

Multiple Active licenses only use the latest License for restriction detection

init

# Conflicts:
#	controllers/user/api/v1/user_webhook.go
#	controllers/user/controllers/user_controller.go
@bxy4543 bxy4543 force-pushed the limit-user-counter2 branch from daab326 to 80c53cd Compare January 21, 2026 11:27
@cuisongliu cuisongliu modified the milestones: v5.1, v5.2 Jan 21, 2026
@cuisongliu cuisongliu merged commit d6d0845 into labring:main Jan 21, 2026
38 of 44 checks passed
@github-actions
Copy link
Contributor

🤖 says: Error cherry-picking.

Auto-merging controllers/pkg/go.mod
Auto-merging controllers/pkg/go.sum
CONFLICT (content): Merge conflict in controllers/pkg/go.sum
error: could not apply d6d0845... feat(license): suppor limit user count (#6556)
hint: After resolving the conflicts, mark them with
hint: "git add/rm ", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"

@github-actions
Copy link
Contributor

🤖 says: ‼️ cherry pick action failed.
See: https://github.com/labring/sealos/actions/runs/21208583437

bxy4543 added a commit to bxy4543/sealos that referenced this pull request Jan 21, 2026
* Add a prompt for detecting the number of users exceeding the active license

Multiple Active licenses only use the latest License for restriction detection

init

# Conflicts:
#	controllers/user/api/v1/user_webhook.go
#	controllers/user/controllers/user_controller.go

* fix rebase conflict

* fix ci lint

(cherry picked from commit d6d0845)
cuisongliu pushed a commit that referenced this pull request Jan 21, 2026
feat(license): suppor limit user count (#6556)

* Add a prompt for detecting the number of users exceeding the active license

Multiple Active licenses only use the latest License for restriction detection

init

# Conflicts:
#	controllers/user/api/v1/user_webhook.go
#	controllers/user/controllers/user_controller.go

* fix rebase conflict

* fix ci lint

(cherry picked from commit d6d0845)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants