⚡ improve performance and make it customizable (#19)

Author: amitai-devops

README.md

@@ -45,6 +45,7 @@ minCPU: 0
 cpuFactor: 1
 memoryFactor: 1
 logLevel: info
+concurrentWorkers: 100
 ```
 ## Prerequisites
 - The metrics server must be deployed in your cluster. Read more about [Metrics Server](https://github.com/kubernetes-sigs/metrics-server). This controller uses the **metrics.k8s.io** extension API group (apis/metrics.k8s.io/v1beta1)
@@ -98,6 +99,9 @@ logLevel: info
 
 --memory-factor float (default 1)
     A factor to multiply Memory requests when reconciling.
+
+--concurrent-workers (default 100)
+    How many pods to sample in parallel. This may affect the controller's stability.
 ```
 
 ### Annotations 

charts/kube-reqsizer/Chart.yaml

@@ -13,4 +13,4 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.6.7
+version: 0.8.0

charts/kube-reqsizer/templates/deployment.yaml

@@ -36,6 +36,7 @@ spec:
         - --min-memory={{.Values.minMemory}}
         - --cpu-factor={{.Values.cpuFactor}}
         - --memory-factor={{.Values.memoryFactor}}        
+        - --concurrent-workers={{.Values.concurrentWorkers}}        
         resources:
           {{- toYaml .Values.controllerManager.manager.resources | nindent 10 }}
         command:

charts/kube-reqsizer/values.yaml

@@ -10,6 +10,8 @@ minCPU: 0
 cpuFactor: 1
 memoryFactor: 1
 logLevel: info
+concurrentWorkers: 100
+
 
 controllerManager:
   manager:

controllers/pod_controller.go

@@ -99,51 +99,47 @@ func (r *PodReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.R
 			addToCache(cacheStore, SumPodRequest)
 			log.Info(fmt.Sprint("Items in Cache: ", len(cacheStore.List())))
 		} else {
-			if err != nil {
-				log.Error(err, err.Error())
-			} else {
-				SumPodRequest.Sample = LatestPodRequest.Sample + 1
-				if LatestPodRequest.Sample == 1 {
-					SumPodRequest.Timestamp = time.Now()
-					LatestPodRequest.Timestamp = SumPodRequest.Timestamp
-				}
-				log.Info(fmt.Sprint(time.Now(), LatestPodRequest.Timestamp))
-				SumPodRequest.TimeSinceFirstSample = time.Since(LatestPodRequest.Timestamp).Seconds()
-
-				log.Info(fmt.Sprint("Updating cache sample ", SumPodRequest.Sample))
-
-				for _, sumC := range SumPodRequest.ContainerRequests {
-					for _, latestC := range LatestPodRequest.ContainerRequests {
-						if latestC.Name == sumC.Name {
-							sumCAddr := &sumC
-							if latestC.CPU > 0 {
-								sumCAddr.MaxCPU = int64(math.Max(float64(sumCAddr.MaxCPU), float64(latestC.CPU)))
-								sumCAddr.MinCPU = int64(math.Min(float64(sumCAddr.MinCPU), float64(latestC.CPU)))
-							} else {
-								// sumCAddr.MaxCPU = latestC.CPU
-								sumCAddr.MinCPU = 1
-							}
-							if latestC.Memory > 0 {
-								sumCAddr.MaxMemory = int64(math.Max(float64(sumCAddr.MaxMemory), float64(latestC.Memory)))
-								sumCAddr.MinMemory = int64(math.Min(float64(sumCAddr.MinMemory), float64(latestC.Memory)))
-							} else {
-								// sumCAddr.MaxMemory = latestC.Memory
-								sumCAddr.MinMemory = 1
-							}
-							sumCAddr.CPU += latestC.CPU
-							sumCAddr.Memory += latestC.Memory
+
+			SumPodRequest.Sample = LatestPodRequest.Sample + 1
+			if LatestPodRequest.Sample == 1 {
+				SumPodRequest.Timestamp = time.Now()
+				LatestPodRequest.Timestamp = SumPodRequest.Timestamp
+			}
+			log.Info(fmt.Sprint(time.Now(), LatestPodRequest.Timestamp))
+			SumPodRequest.TimeSinceFirstSample = time.Since(LatestPodRequest.Timestamp).Seconds()
+
+			log.Info(fmt.Sprint("Updating cache sample ", SumPodRequest.Sample))
+
+			for _, sumC := range SumPodRequest.ContainerRequests {
+				for _, latestC := range LatestPodRequest.ContainerRequests {
+					if latestC.Name == sumC.Name {
+						sumCAddr := &sumC
+						if latestC.CPU > 0 {
+							sumCAddr.MaxCPU = int64(math.Max(float64(sumCAddr.MaxCPU), float64(latestC.CPU)))
+							sumCAddr.MinCPU = int64(math.Min(float64(sumCAddr.MinCPU), float64(latestC.CPU)))
+						} else {
+							// sumCAddr.MaxCPU = latestC.CPU
+							sumCAddr.MinCPU = 1
+						}
+						if latestC.Memory > 0 {
+							sumCAddr.MaxMemory = int64(math.Max(float64(sumCAddr.MaxMemory), float64(latestC.Memory)))
+							sumCAddr.MinMemory = int64(math.Min(float64(sumCAddr.MinMemory), float64(latestC.Memory)))
+						} else {
+							// sumCAddr.MaxMemory = latestC.Memory
+							sumCAddr.MinMemory = 1
 						}
+						sumCAddr.CPU += latestC.CPU
+						sumCAddr.Memory += latestC.Memory
 					}
 				}
+			}
 
-				err := deleteFromCache(cacheStore, LatestPodRequest)
-				if err != nil {
-					log.Error(err, err.Error())
-				}
-				err = addToCache(cacheStore, SumPodRequest)
-				if err != nil {
-					log.Error(err, err.Error())
-				}
+			if err := deleteFromCache(cacheStore, LatestPodRequest); err != nil {
+				log.Error(err, err.Error())
+			}
+
+			if err = addToCache(cacheStore, SumPodRequest); err != nil {
+				log.Error(err, err.Error())
 			}
 		}
 		log.Info(fmt.Sprint(SumPodRequest))

controllers/pod_controller_functions.go

@@ -94,10 +94,11 @@ func UpdatePodController(podspec *corev1.PodSpec, Requests []NewContainerRequest
 }
 
 // SetupWithManager sets up the controller with the Manager.
-func (r *PodReconciler) SetupWithManager(mgr ctrl.Manager) error {
+func (r *PodReconciler) SetupWithManager(mgr ctrl.Manager, concurrentWorkers uint) error {
 	return ctrl.NewControllerManagedBy(mgr).
 		WithOptions(controller.Options{
-			MaxConcurrentReconciles: 4,
+			MaxConcurrentReconciles: int(concurrentWorkers),
+			RecoverPanic:            true,
 		}).
 		For(&corev1.Pod{}).
 		Complete(r)

main.go

@@ -62,6 +62,7 @@ func main() {
 	var maxCPU int64
 	var minMemory int64
 	var minCPU int64
+	var concurrentWorkers uint
 
 	var cpuFactor float64
 	var memoryFactor float64
@@ -73,6 +74,8 @@ func main() {
 	flag.Float64Var(&cpuFactor, "cpu-factor", 1, "A factor to multiply CPU requests when reconciling. 1 By default.")
 	flag.Float64Var(&memoryFactor, "memory-factor", 1, "A factor to multiply Memory requests when reconciling. 1 By default.")
 
+	flag.UintVar(&concurrentWorkers, "concurrent-workers", 100, "How many pods to sample in parallel. This may affect the controller's stability.")
+
 	flag.Int64Var(&minMemory, "min-memory", 0, "Minimum memory in (Mi) that the controller can set a pod request to. 0 is infinite")
 	flag.Int64Var(&minCPU, "min-cpu", 0, "Minimum CPU in (m) that the controller can set a pod request to. 0 is infinite")
 
@@ -140,7 +143,7 @@ func main() {
 		MinCPU:                      minCPU,
 		CPUFactor:                   cpuFactor,
 		MemoryFactor:                memoryFactor,
-	}).SetupWithManager(mgr); err != nil {
+	}).SetupWithManager(mgr, concurrentWorkers); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "Pod")
 		log.Error(err, err.Error())
 		os.Exit(1)