Review comments

ironcore-dev · Jul 19, 2023 · d9b4f90 · d9b4f90
1 parent 8592768
commit d9b4f90
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 54 deletions.
diff --git a/broker/machinebroker/server/machine_pool_info.go b/broker/machinebroker/server/machine_pool_info.go
@@ -34,21 +34,22 @@ func (s *Server) PoolInfo(ctx context.Context, req *ori.PoolInfoRequest) (*ori.P
 	}
 
 	var (
-		sharedCPU, staticCPU       int64
-		sharedMemory, staticMemory uint64
+		sharedCPU, staticCPU       = resource.NewQuantity(0, resource.DecimalSI), resource.NewQuantity(0, resource.DecimalSI)
+		sharedMemory, staticMemory = resource.NewQuantity(0, resource.BinarySI), resource.NewQuantity(0, resource.BinarySI)
 	)
+
 	for _, onmetalMachinePool := range onmetalMachinePoolList.Items {
-		staticCPU += onmetalMachinePool.Status.Capacity.Name(corev1alpha1.ResourceCPU, resource.DecimalSI).AsDec().UnscaledBig().Int64()
-		sharedCPU += onmetalMachinePool.Status.Capacity.Name(corev1alpha1.ResourceSharedCPU, resource.DecimalSI).AsDec().UnscaledBig().Int64()
+		sharedCPU.Add(*onmetalMachinePool.Status.Capacity.Name(corev1alpha1.ResourceCPU, resource.DecimalSI))
+		sharedCPU.Add(*onmetalMachinePool.Status.Capacity.Name(corev1alpha1.ResourceSharedCPU, resource.DecimalSI))
 
-		staticMemory += onmetalMachinePool.Status.Capacity.Name(corev1alpha1.ResourceMemory, resource.BinarySI).AsDec().UnscaledBig().Uint64()
-		sharedMemory += onmetalMachinePool.Status.Capacity.Name(corev1alpha1.ResourceSharedMemory, resource.BinarySI).AsDec().UnscaledBig().Uint64()
+		staticMemory.Add(*onmetalMachinePool.Status.Capacity.Name(corev1alpha1.ResourceMemory, resource.BinarySI))
+		sharedMemory.Add(*onmetalMachinePool.Status.Capacity.Name(corev1alpha1.ResourceSharedMemory, resource.BinarySI))
 	}
 
 	return &ori.PoolInfoResponse{
-		SharedCpu:    sharedCPU,
-		StaticCpu:    staticCPU,
-		SharedMemory: sharedMemory,
-		StaticMemory: staticMemory,
+		SharedCpu:    sharedCPU.AsDec().UnscaledBig().Int64(),
+		StaticCpu:    staticCPU.AsDec().UnscaledBig().Int64(),
+		SharedMemory: sharedMemory.AsDec().UnscaledBig().Uint64(),
+		StaticMemory: staticMemory.AsDec().UnscaledBig().Uint64(),
 	}, nil
 }
diff --git a/cmd/onmetal-controller-manager/main.go b/cmd/onmetal-controller-manager/main.go
@@ -192,7 +192,7 @@ func main() {
 
 	if controllers.Enabled(machineSchedulerController) {
 		schedulerCache := scheduler.NewCache(mgr.GetLogger(), scheduler.DefaultCacheStrategy)
-		if mgr.Add(schedulerCache); err != nil {
+		if err := mgr.Add(schedulerCache); err != nil {
 			setupLog.Error(err, "unable to create cache", "controller", "MachineSchedulerCache")
 			os.Exit(1)
 		}

diff --git a/internal/controllers/compute/scheduler/cache.go b/internal/controllers/compute/scheduler/cache.go
@@ -3,7 +3,6 @@ package scheduler
 import (
 	"context"
 	"fmt"
-	"k8s.io/apimachinery/pkg/util/wait"
 	"sync"
 	"time"
 
@@ -12,7 +11,7 @@ import (
 	"golang.org/x/exp/maps"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/sets"
-	toolscache "k8s.io/client-go/tools/cache"
+	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/klog/v2"
 	ccache "sigs.k8s.io/controller-runtime/pkg/cache"
 )
@@ -87,35 +86,6 @@ func NewCache(log logr.Logger, strategy CacheStrategy) *Cache {
 	}
 }
 
-type listener struct {
-	handler toolscache.ResourceEventHandler
-}
-
-type updateNotification struct {
-	oldObj any
-	newObj any
-}
-
-type addNotification struct {
-	newObj          any
-	isInInitialList bool
-}
-
-type deleteNotification struct {
-	oldObj any
-}
-
-func (r *listener) add(evt any) {
-	switch n := evt.(type) {
-	case addNotification:
-		r.handler.OnAdd(n, n.isInInitialList)
-	case updateNotification:
-		r.handler.OnUpdate(n.oldObj, n.newObj)
-	case deleteNotification:
-		r.handler.OnDelete(n.oldObj)
-	}
-}
-
 type Cache struct {
 	mu sync.RWMutex
 
@@ -130,9 +100,6 @@ type Cache struct {
 	instanceStates   map[types.UID]*instanceState
 	nodes            map[string]*ContainerInfo
 
-	containerListenersMu sync.RWMutex
-	containerListeners   sets.Set[*listener]
-
 	strategy CacheStrategy
 }
 
@@ -256,15 +223,6 @@ func (c *Cache) FinishBinding(instance *v1alpha1.Machine) error {
 	return nil
 }
 
-func (c *Cache) distributeContainerEvent(evt any) {
-	c.containerListenersMu.RLock()
-	defer c.containerListenersMu.RUnlock()
-
-	for l := range c.containerListeners {
-		l.add(evt)
-	}
-}
-
 func (c *Cache) AddContainer(node *v1alpha1.MachinePool) {
 	c.mu.Lock()
 	defer c.mu.Unlock()