admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update dependencies (#6267)

Browse Source 
Signed-off-by: hongming <coder.scala@gmail.com>
(cherry picked from commit cfebd96a1f)
This commit is contained in:
hongming
2025-03-11 14:19:32 +08:00
parent 742c1e52db
commit 39eab5ee5c
4246 changed files with 341171 additions and 131193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/controller/quota/resourcequota_controller.go
View File

@@ -83,7 +83,7 @@ func (r *Reconciler) SetupWithManager(mgr *kscontroller.Manager) error {
}).
For(&quotav1alpha2.ResourceQuota{}).
WithEventFilter(predicate.GenerationChangedPredicate{
Funcs: predicate.Funcs{
TypedFuncs: predicate.Funcs{
UpdateFunc: func(e event.UpdateEvent) bool {
oldQuota := e.ObjectOld.(*quotav1alpha2.ResourceQuota)
newQuota := e.ObjectNew.(*quotav1alpha2.ResourceQuota)
@@ -101,12 +101,11 @@ func (r *Reconciler) SetupWithManager(mgr *kscontroller.Manager) error {
&corev1.Service{},
&corev1.PersistentVolumeClaim{},
}
realClock := clock.RealClock{}
for _, resource := range resources {
if err = c.Watch(
source.Kind(mgr.GetCache(), resource),
handler.EnqueueRequestsFromMapFunc(r.mapper),
predicate.Funcs{
p := predicate.GenerationChangedPredicate{
TypedFuncs: predicate.Funcs{
GenericFunc: func(e event.GenericEvent) bool {
return false
},
@@ -133,7 +132,9 @@ func (r *Reconciler) SetupWithManager(mgr *kscontroller.Manager) error {
DeleteFunc: func(e event.DeleteEvent) bool {
return true
},
}); err != nil {
},
}
if err = c.Watch(source.Kind(mgr.GetCache(), resource, handler.EnqueueRequestsFromMapFunc(r.mapper), p)); err != nil {
return err
}
}
@@ -171,7 +172,7 @@ func (r *Reconciler) mapper(ctx context.Context, h client.Object) []reconcile.Re
func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
logger := r.logger.WithValues("resourcequota", req.NamespacedName)
rootCtx := context.TODO()
rootCtx := klog.NewContext(ctx, logger)
resourceQuota := &quotav1alpha2.ResourceQuota{}
if err := r.Get(rootCtx, req.NamespacedName, resourceQuota); err != nil {
return ctrl.Result{}, client.IgnoreNotFound(err)