✨ additional flags

modified:   README.md; modified:   charts/kube-reqsizer/Chart.yaml; modified:   charts/kube-reqsizer/templates/deployment.yaml; modified:   charts/kube-reqsizer/values.yaml; modified:   controllers/pod_controller.go; modified:   controllers/pod_controller_functions.go; modified:   controllers/pod_controller_types.go; modified:   main.go

Author: amitai-devops

README.md

@@ -17,14 +17,20 @@ helm install kube-reqsizer/kube-reqsizer
 ```yaml
 sampleSize: 1
 minSeconds: 1
+enableIncrease: true
+enableReduce: true
+maxMemory: 0
+minMemory: 0
+maxCPU: 0
+minCPU: 0
 enabledAnnotation: true
 logLevel: info
 ```
 ## Description
 
-**kube-reqsizer** has three primary custom flags:
+**kube-reqsizer** has primary custom flags:
 
-```
+```bash
 --annotation-filter bool (default true)
 
     Enable a annotation filter for pod scraping. 
@@ -43,6 +49,24 @@ logLevel: info
     Minimum seconds between pod restart.
     This ensures the controller will not restart a pod if the minimum time
     has not passed since it has started sampling it.
+
+--enable-increase (default true)
+    Enables the controller to increase pod requests
+
+--enable-reduce (default true)
+    Enables the controller to reduce pod requests
+
+--max-cpu int (default 0)
+    Maximum CPU in (m) that the controller can set a pod request to. 0 is infinite 
+
+--max-memory int (default 0)
+    Maximum memory in (Mi) that the controller can set a pod request to. 0 is infinite
+
+--min-cpu int (default 0)
+    Minimum CPU in (m) that the controller can set a pod request to. 0 is infinite
+
+--min-memory int (default 0)
+    Minimum memory in (Mi) that the controller can set a pod request to. 0 is infinite
 ```
 
 Disclaimer: 

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.3
+version: 0.6.4

charts/kube-reqsizer/templates/deployment.yaml

@@ -26,14 +26,20 @@ spec:
         - --sample-size={{.Values.sampleSize}}
         - --min-seconds={{.Values.minSeconds}}
         - --zap-log-level={{.Values.logLevel}}
+        - --enable-increase={{.Values.enableIncrease}}
+        - --enable-reduce={{.Values.enableReduce}}
+        - --max-cpu={{.Values.maxCPU}}
+        - --max-memory={{.Values.maxMemory}}
+        - --min-cpu={{.Values.minCPU}}
+        - --min-memory={{.Values.minMemory}}
         resources:
           {{- toYaml .Values.controllerManager.manager.resources | nindent 10 }}
         command:
         - /manager
         env:
         - name: KUBERNETES_CLUSTER_DOMAIN
           value: {{ .Values.kubernetesClusterDomain }}
-        image: {{ .Values.controllerManager.manager.image.repository }}:{{ .Values.controllerManager.manager.image.tag | default .Chart.AppVersion }}
+        image: {{ .Values.controllerManager.manager.image.repository }}:{{ .Values.controllerManager.manager.image.tag }}
         imagePullPolicy: Always
         livenessProbe:
           httpGet:

charts/kube-reqsizer/values.yaml

@@ -1,5 +1,11 @@
 sampleSize: 1
 minSeconds: 1
+enableIncrease: true
+enableReduce: true
+maxMemory: 0
+minMemory: 0
+maxCPU: 0
+minCPU: 0
 enabledAnnotation: true
 logLevel: info
 

controllers/pod_controller.go

@@ -122,7 +122,6 @@ func (r *PodReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.R
 			}
 		}
 		log.Info(fmt.Sprint(SumPodRequest))
-		log.Info(fmt.Sprint(SumPodRequest.TimeSinceFirstSample, ">", r.MinSecondsBetweenPodRestart))
 		if (SumPodRequest.Sample >= r.SampleSize) && (SumPodRequest.TimeSinceFirstSample >= r.MinSecondsBetweenPodRestart) {
 			log.Info("Sample Size and Minimum Time have been reached")
 			PodChange := false
@@ -139,21 +138,21 @@ func (r *PodReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.R
 								log.Info(fmt.Sprint("Comparing CPU: ", fmt.Sprintf("%dm", AverageUsageCPU), " <> ", fmt.Sprintf("%dm", currentC.CPU)))
 								log.Info(fmt.Sprint("Comparing Memory: ", fmt.Sprintf("%dMi", AverageUsageMemory), " <> ", fmt.Sprintf("%dMi", currentC.Memory)))
 								// if AverageUsageCPU < currentC.CPU {
-								if AverageUsageCPU > 0 {
+								if r.ValidateCPU(currentC.CPU, AverageUsageCPU) {
 									if pod.Spec.Containers[i].Resources.Requests != nil {
 										pod.Spec.Containers[i].Resources.Requests[v1.ResourceCPU] = resource.MustParse(fmt.Sprintf("%dm", AverageUsageCPU))
 										PodChange = true
 									}
 								}
 								// }
-								// if AverageUsageMemory < currentC.Memory {
-								if AverageUsageMemory > 0 {
-									if pod.Spec.Containers[i].Resources.Requests != nil {
-										pod.Spec.Containers[i].Resources.Requests[v1.ResourceMemory] = resource.MustParse(fmt.Sprintf("%dMi", AverageUsageMemory))
-										PodChange = true
+								if r.ValidateMemory(currentC.Memory, AverageUsageMemory) {
+									if AverageUsageMemory > 0 {
+										if pod.Spec.Containers[i].Resources.Requests != nil {
+											pod.Spec.Containers[i].Resources.Requests[v1.ResourceMemory] = resource.MustParse(fmt.Sprintf("%dMi", AverageUsageMemory))
+											PodChange = true
+										}
 									}
 								}
-								// }
 								Requests = append(Requests, NewContainerRequests{Name: c.Name, Requests: pod.Spec.Containers[i].Resources})
 							}
 						}
@@ -170,7 +169,6 @@ func (r *PodReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.R
 				}
 
 				var ownerName string
-
 				switch pod.OwnerReferences[0].Kind {
 				case "ReplicaSet":
 					replica, err := r.ClientSet.AppsV1().ReplicaSets(pod.Namespace).Get(ctx, pod.OwnerReferences[0].Name, metav1.GetOptions{})
@@ -187,7 +185,9 @@ func (r *PodReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.R
 							log.Error(err, err.Error())
 							return ctrl.Result{}, err
 						}
-						UpdatePodController(deployment, Requests, ctx)
+						UpdatePodController(&deployment.Spec.Template.Spec, Requests, ctx)
+						deployment.Annotations["auto.request.operator/changed"] = "true"
+
 						return r.UpdateKubeObject(deployment, ctx)
 					} else {
 						log.Info("Is Owned by Unknown CRD")
@@ -202,7 +202,8 @@ func (r *PodReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.R
 						log.Error(err, err.Error())
 						return ctrl.Result{}, err
 					}
-					UpdatePodController(deployment, Requests, ctx)
+					UpdatePodController(&deployment.Spec.Template.Spec, Requests, ctx)
+					deployment.Annotations["auto.request.operator/changed"] = "true"
 					return r.UpdateKubeObject(deployment, ctx)
 				case "StatefulSet":
 					log.Info("Is Owned by StatefulSet")
@@ -214,7 +215,8 @@ func (r *PodReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.R
 						return ctrl.Result{}, err
 					}
 
-					UpdatePodController(deployment, Requests, ctx)
+					UpdatePodController(&deployment.Spec.Template.Spec, Requests, ctx)
+					deployment.Annotations["auto.request.operator/changed"] = "true"
 					return r.UpdateKubeObject(deployment, ctx)
 				default:
 					fmt.Printf("Could not find resource manager for type %s\n", pod.OwnerReferences[0].Kind)

controllers/pod_controller_functions.go

@@ -11,7 +11,6 @@ import (
 	"unicode/utf8"
 
 	"github.com/labstack/gommon/log"
-	v1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -49,43 +48,15 @@ func (r *PodReconciler) UpdateKubeObject(pod client.Object, ctx context.Context)
 	return ctrl.Result{RequeueAfter: 10 * time.Second}, nil
 }
 
-func UpdatePodController(deployment interface{}, Requests []NewContainerRequests, ctx context.Context) {
-
-	switch v := deployment.(type) {
-	case *v1.Deployment:
-		for _, podContainer := range Requests {
-			for i, depContainer := range v.Spec.Template.Spec.Containers {
-				if depContainer.Name == podContainer.Name {
-					log.Info(fmt.Sprint("Setting", podContainer.Requests))
-					v.Spec.Template.Spec.Containers[i].Resources = podContainer.Requests
-				}
+func UpdatePodController(podspec *corev1.PodSpec, Requests []NewContainerRequests, ctx context.Context) {
+	for _, podContainer := range Requests {
+		for i, depContainer := range podspec.Containers {
+			if depContainer.Name == podContainer.Name {
+				log.Info(fmt.Sprint("Setting", podContainer.Requests))
+				podspec.Containers[i].Resources = podContainer.Requests
 			}
 		}
-		v.Annotations["auto.request.operator/changed"] = "true"
-	case *v1.DaemonSet:
-		for _, podContainer := range Requests {
-			for i, depContainer := range v.Spec.Template.Spec.Containers {
-				if depContainer.Name == podContainer.Name {
-					log.Info(fmt.Sprint("Setting", podContainer.Requests))
-					v.Spec.Template.Spec.Containers[i].Resources = podContainer.Requests
-				}
-			}
-		}
-		v.Annotations["auto.request.operator/changed"] = "true"
-	case *v1.StatefulSet:
-		for _, podContainer := range Requests {
-			for i, depContainer := range v.Spec.Template.Spec.Containers {
-				if depContainer.Name == podContainer.Name {
-					log.Info(fmt.Sprint("Setting", podContainer.Requests))
-					v.Spec.Template.Spec.Containers[i].Resources = podContainer.Requests
-				}
-			}
-		}
-		v.Annotations["auto.request.operator/changed"] = "true"
-	default:
-		log.Debug("Unsupported type")
 	}
-
 }
 
 // SetupWithManager sets up the controller with the Manager.
@@ -101,6 +72,45 @@ func RemoveLastChar(str string) string {
 	}
 	return str
 }
+
+func (r *PodReconciler) ValidateCPU(currentCPU, AverageUsageCPU int64) bool {
+	if AverageUsageCPU > 0 {
+		if AverageUsageCPU > currentCPU {
+			if r.EnableIncrease {
+				if (AverageUsageCPU <= r.MaxCPU) || (r.MaxCPU == 0) {
+					return true
+				}
+			}
+		} else {
+			if r.EnableReduce {
+				if (AverageUsageCPU >= r.MinCPU) || (r.MinCPU == 0) {
+					return true
+				}
+			}
+		}
+	}
+	return false
+}
+
+func (r *PodReconciler) ValidateMemory(currentMemory, AverageUsageMemory int64) bool {
+	if AverageUsageMemory > 0 {
+		if AverageUsageMemory > currentMemory {
+			if r.EnableIncrease {
+				if (AverageUsageMemory <= r.MaxMemory) || (r.MaxMemory == 0) {
+					return true
+				}
+			}
+		} else {
+			if r.EnableReduce {
+				if (AverageUsageMemory >= r.MinMemory) || (r.MinMemory == 0) {
+					return true
+				}
+			}
+		}
+	}
+	return false
+}
+
 func GetPodRequests(pod corev1.Pod) PodRequests {
 	containerData := []ContainerRequests{}
 	for _, c := range pod.Spec.Containers {

controllers/pod_controller_types.go

@@ -20,6 +20,12 @@ type PodReconciler struct {
 	SampleSize                  int
 	EnableAnnotation            bool
 	MinSecondsBetweenPodRestart float64
+	EnableIncrease              bool
+	EnableReduce                bool
+	MaxMemory                   int64
+	MaxCPU                      int64
+	MinMemory                   int64
+	MinCPU                      int64
 }
 
 type PodRequests struct {

main.go

@@ -56,6 +56,20 @@ func main() {
 	var probeAddr string
 	var sampleSize int
 	var minSecondsBetweenPodRestart float64
+	var enableIncrease bool
+	var enableReduce bool
+	var maxMemory int64
+	var maxCPU int64
+	var minMemory int64
+	var minCPU int64
+
+	flag.BoolVar(&enableIncrease, "enable-increase", true, "Enables the controller to increase pod requests")
+	flag.BoolVar(&enableReduce, "enable-reduce", true, "Enables the controller to reduce pod requests")
+	flag.Int64Var(&maxMemory, "max-memory", 0, "Maximum memory in (Mi) that the controller can set a pod request to. 0 is infinite")
+	flag.Int64Var(&maxCPU, "max-cpu", 0, "Maximum CPU in (m) that the controller can set a pod request to. 0 is infinite")
+	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")
+
 	flag.StringVar(&metricsAddr, "metrics-bind-address", ":8080", "The address the metric endpoint binds to.")
 	flag.StringVar(&probeAddr, "health-probe-bind-address", ":8081", "The address the probe endpoint binds to.")
 	flag.IntVar(&sampleSize, "sample-size", 1, "The sample size to create an average from when reconciling.")
@@ -112,6 +126,12 @@ func main() {
 		SampleSize:                  sampleSize,
 		EnableAnnotation:            enableAnnotation,
 		MinSecondsBetweenPodRestart: minSecondsBetweenPodRestart,
+		EnableIncrease:              enableIncrease,
+		EnableReduce:                enableReduce,
+		MaxMemory:                   maxMemory,
+		MaxCPU:                      maxCPU,
+		MinMemory:                   minMemory,
+		MinCPU:                      minCPU,
 	}).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "Pod")
 		log.Error(err, err.Error())