feat: adapt license for community edition #3644
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Whoa! Easy there, Partner!This PR is too big. Please break it up into smaller PRs. |
🤖 Generated by lychee actionSummary
Full action output |
Codecov ReportPatch and project coverage have no change.
Additional details and impacted files@@ Coverage Diff @@
## main #3644 +/- ##
=======================================
Coverage 67.77% 67.77%
=======================================
Files 8 8
Lines 661 661
=======================================
Hits 448 448
Misses 171 171
Partials 42 42 ☔ View full report in Codecov by Sentry. |
lingdie
approved these changes
Aug 8, 2023
controllers/licenseissuer/.env
Outdated
| @@ -0,0 +1,3 @@ | |||
| MONITOR= "true" | |||
| CAN_CONNECT_TO_EXTERNAL_NETWORK= "true" | |||
| MONGO_URI= "mongodb://root:7zfqwxsm@127.0.0.1:27017/sealos-resources?authSource=admin&directConnection=true" | |||
lingdie
approved these changes
Aug 9, 2023
Comment on lines
106
to
107
| func loadNotification(receivers []string, event Event, queue []v1.Notification) []v1.Notification { | ||
| for _, receiver := range receivers { | ||
| queue = append(queue, newNotification(receiver, event)) | ||
| } | ||
| return queue | ||
| } |
Comment on lines
78
to
79
| pool := NewPool(maxBatchSize) | ||
| pool.Run(maxChannelSize) |
There was a problem hiding this comment.
change pool into NotificationManager
Comment on lines
137
to
170
| type Pool struct { | ||
| wg sync.WaitGroup | ||
| work chan func() | ||
| } | ||
|
|
||
| func NewPool(size int) *Pool { | ||
| p := &Pool{ | ||
| work: make(chan func(), size), | ||
| } | ||
| return p | ||
| } | ||
|
|
||
| func (p *Pool) Add(f func()) { | ||
| p.work <- func() { | ||
| f() | ||
| } | ||
| } | ||
|
|
||
| func (p *Pool) Wait() { | ||
| close(p.work) | ||
| p.wg.Wait() | ||
| } | ||
|
|
||
| func (p *Pool) Run(size int) { | ||
| p.wg.Add(size) | ||
| for i := 0; i < size; i++ { | ||
| go func() { | ||
| for f := range p.work { | ||
| f() | ||
| } | ||
| p.wg.Done() | ||
| }() | ||
| } | ||
| } |
Comment on lines
103
to
123
| func (rv *Receiver) Cache(obj client.ObjectList) error { | ||
| err := rv.Client.List(rv.Context, obj) | ||
| if err != nil { | ||
| logger.Error(err, "Failed to list namespaces") | ||
| return err | ||
| } | ||
| namespaces, ok := obj.(*corev1.NamespaceList) | ||
| if !ok { | ||
| logger.Error(err, "Failed to cast to NamespaceList") | ||
| return fmt.Errorf("failed to cast to NamespaceList: %w", err) | ||
| } | ||
| for _, ns := range namespaces.Items { | ||
| if filters[string(General)](&ns) { | ||
| rv.UserNamespaces = append(rv.UserNamespaces, ns.GetName()) | ||
| } | ||
| if filters[string(Admin)](&ns) { | ||
| rv.AdminNamespaces = append(rv.AdminNamespaces, ns.GetName()) | ||
| } | ||
| } | ||
| return nil | ||
| } |
There was a problem hiding this comment.
change to map to contain namespace.
Comment on lines
87
to
66
| func (rv *Receiver) SetReceiver(receiver string, kind ...Kind) *Receiver { | ||
| if len(kind) == 0 { | ||
| rv.UserNamespaces = append(rv.UserNamespaces, receiver) | ||
| return rv | ||
| } | ||
| switch kind[0] { | ||
| case General: | ||
| rv.UserNamespaces = append(rv.UserNamespaces, receiver) | ||
| case Admin: | ||
| rv.AdminNamespaces = append(rv.AdminNamespaces, receiver) | ||
| } | ||
| return rv | ||
| } |
Comment on lines
246
to
277
| // The Pool proviveds a pool of goroutines that can be used to perform work. | ||
| // type Pool struct { | ||
| // work chan func() | ||
| // wg sync.WaitGroup | ||
| // } | ||
|
|
||
| // func NewPool(size int) *Pool { | ||
| // return &Pool{ | ||
| // work: make(chan func(), size), | ||
| // } | ||
| // } | ||
|
|
||
| // func (p *Pool) Run(workerCount int) { | ||
| // p.wg.Add(workerCount) | ||
| // for i := 0; i < workerCount; i++ { | ||
| // go func() { | ||
| // for work := range p.work { | ||
| // work() | ||
| // } | ||
| // p.wg.Done() | ||
| // }() | ||
| // } | ||
| // } | ||
|
|
||
| // func (p *Pool) Add(work func()) { | ||
| // p.work <- work | ||
| // } | ||
|
|
||
| // func (p *Pool) Wait() { | ||
| // close(p.work) | ||
| // p.wg.Wait() | ||
| // } |
| return nil | ||
| } | ||
|
|
||
| func GetUIDURL(ctx context.Context, client client.Client) (string, map[string]string, error) { |
| package util | ||
|
|
||
| const ( | ||
| SealosNamespace = "sealos-system" |
There was a problem hiding this comment.
use env to set SealosNamespace
| const ( | ||
| SealosNamespace = "sealos-system" | ||
| ClusterInfo = "cluster-info" | ||
| URLConfig = "url-config" |
| ClusterInfo = "cluster-info" | ||
| URLConfig = "url-config" | ||
| LicenseHistory = "license-history" | ||
| LicenseName = "license" |
yxxchange
force-pushed
the
community-edition-advance
branch
from
ad24b90
to
a897ef4
Compare
yxxchange
force-pushed
the
community-edition-advance
branch
from
6004d40
to
4c3ad8d
Compare
zzjin
approved these changes
Aug 11, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
🤖 Generated by Copilot at 53ef12f
Summary
📄🔄🚀
Refactor the licenseissuer controller to use runnable tasks and new APIs for license management, resource collection, data sync, and notification. Simplify and secure the RBAC, deployment, and configuration files. Add environment variables for MongoDB and other options.
Walkthrough
.envfile andMakefile(link, link)contextandutilpackages to imports ofmain.gofile (link, link)main.gofile (link, link)role.yamlfile (link, link, link)registrydirectory and add environment variables toKubefile(link)Launcherresource fromcustomconfig.yaml.tmplfile (link, link)deploy.yamlfile (link)setup.shscript by applying files together and removing unused CRD wait (link)Reconcilemethod, updatePredicatevariable, and add methods toLicenseReconcilerstruct inlicense_controller.gofile (link, link, link, link, link, link)collect.go,const.go,datasync.go,external.go,init.go,license.go, andnotice.gofiles toutilpackage for different sub-tasks of licenseissuer controller (link, link, link, link, link, link, link)collector_controller.go,launcher_controller.go,datasync_controller.go, andnotification_controller.go(link, link, link, link)