Add Parameter for Percentage of up/down scaling (#28)

Author: amitai-devops

README.md

@@ -42,6 +42,10 @@ maxMemory: 0
 minMemory: 0
 maxCPU: 0
 minCPU: 0
+minCPUIncreasePercentage: 0
+minCPUDecreasePercentage: 0
+minMemoryIncreasePercentage: 0
+minMemoryDecreasePercentage: 0
 cpuFactor: 1
 memoryFactor: 1
 logLevel: info
@@ -86,6 +90,15 @@ persistence:
 --min-cpu int (default 0)
 --min-memory int (default 0)
 
+# Min CPU and Memory (%) the controller will count as a condition to resize requests.
+# For Example:
+# If reqsizer want so change from 5m to 10m, that's a 50% increase. 
+# It will ignore this if min-cpu-increase-percentage is less than 50.
+--min-cpu-increase-percentage int (default 0)
+--min-memory-increase-percentage int (default 0)
+--min-cpu-decrease-percentage int (default 0)
+--min-memory-decrease-percentage int (default 0)
+
 # Multiply requests when reconciling
 --cpu-factor float (default 1)
 --memory-factor float (default 1)

charts/kube-reqsizer/Chart.yaml

@@ -13,7 +13,7 @@ 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.9.21
+version: 0.9.22
 dependencies:
 - name: redis
   condition: persistence.enabled

charts/kube-reqsizer/templates/deployment.yaml

@@ -36,6 +36,10 @@ spec:
         - --max-memory={{.Values.maxMemory}}
         - --min-cpu={{.Values.minCPU}}
         - --min-memory={{.Values.minMemory}}
+        - --min-cpu-increase-percentage={{.Values.minCPUIncreasePercentage}}
+        - --min-memory-increase-percentage={{.Values.minMemoryIncreasePercentage}}
+        - --min-cpu-decreases-percentage={{.Values.minCPUDecreasePercentage}}
+        - --min-memory-decrease-percentage={{.Values.minMemoryDecreasePercentage}}
         - --cpu-factor={{.Values.cpuFactor}}
         - --memory-factor={{.Values.memoryFactor}}        
         - --concurrent-workers={{.Values.concurrentWorkers}}

charts/kube-reqsizer/values.yaml

@@ -7,6 +7,10 @@ maxMemory: 0
 minMemory: 0
 maxCPU: 0
 minCPU: 0
+minCPUIncreasePercentage: 0
+minCPUDecreasePercentage: 0
+minMemoryIncreasePercentage: 0
+minMemoryDecreasePercentage: 0
 cpuFactor: 1
 memoryFactor: 1
 logLevel: info

controllers/pod_controller.go

@@ -57,6 +57,10 @@ type PodReconciler struct {
 	MaxCPU                      int64
 	MinMemory                   int64
 	MinCPU                      int64
+	MinCPUIncreasePercentage    int64
+	MinMemoryIncreasePercentage int64
+	MinCPUDecreasePercentage    int64
+	MinMemoryDecreasePercentage int64
 	CPUFactor                   float64
 	MemoryFactor                float64
 	RedisClient                 rediscache.RedisClient

controllers/pod_controller_functions.go

@@ -115,13 +115,17 @@ func (r *PodReconciler) ValidateCPU(currentCPU, AverageUsageCPU int64) bool {
 		if AverageUsageCPU > currentCPU {
 			if r.EnableIncrease {
 				if (AverageUsageCPU <= r.MaxCPU) || (r.MaxCPU == 0) {
-					return true
+					// From 5 to 10
+					// ((10-5)/10 * 100) >= 50%
+					return ((float64(AverageUsageCPU-currentCPU) / float64(currentCPU)) * 100) >= float64(r.MinCPUIncreasePercentage)
 				}
 			}
 		} else {
 			if r.EnableReduce {
 				if (AverageUsageCPU >= r.MinCPU) || (r.MinCPU == 0) {
-					return true
+					// From 10 to 5
+					// ((10-5)/10 * 100) >= 50%
+					return ((float64(currentCPU-AverageUsageCPU) / float64(currentCPU)) * 100) >= float64(r.MinCPUDecreasePercentage)
 				}
 			}
 		}
@@ -134,13 +138,13 @@ func (r *PodReconciler) ValidateMemory(currentMemory, AverageUsageMemory int64)
 		if AverageUsageMemory > currentMemory {
 			if r.EnableIncrease {
 				if (AverageUsageMemory <= r.MaxMemory) || (r.MaxMemory == 0) {
-					return true
+					return ((float64(AverageUsageMemory-currentMemory) / float64(currentMemory)) * 100) >= float64(r.MinMemoryIncreasePercentage)
 				}
 			}
 		} else {
 			if r.EnableReduce {
 				if (AverageUsageMemory >= r.MinMemory) || (r.MinMemory == 0) {
-					return true
+					return ((float64(currentMemory-AverageUsageMemory) / float64(currentMemory)) * 100) >= float64(r.MinMemoryDecreasePercentage)
 				}
 			}
 		}

main.go

@@ -65,6 +65,10 @@ func main() {
 	var maxCPU int64
 	var minMemory int64
 	var minCPU int64
+	var minCPUIncreasePercentage int64
+	var minCPUDecreasePercentage int64
+	var minMemoryIncreasePercentage int64
+	var minMemoryDecreasePercentage int64
 	var concurrentWorkers uint
 
 	var cpuFactor float64
@@ -82,6 +86,11 @@ func main() {
 	flag.StringVar(&redisPassword, "redis-password", "", "Redis password")
 	flag.UintVar(&redisDB, "redis-db", 0, "Redis DB number")
 
+	flag.Int64Var(&minCPUIncreasePercentage, "min-cpu-increase-percentage", 0, "Minimum difference in percentage that is required to increase CPU requests")
+	flag.Int64Var(&minMemoryIncreasePercentage, "min-memory-increase-percentage", 0, "Minimum difference in percentage that is required to increase Memory requests")
+	flag.Int64Var(&minCPUDecreasePercentage, "min-cpu-decrease-percentage", 0, "Minimum difference in percentage that is required to decrease CPU requests")
+	flag.Int64Var(&minMemoryDecreasePercentage, "min-memory-decrease-percentage", 0, "Minimum difference in percentage that is required to decrease Memory requests")
+
 	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")
@@ -160,6 +169,10 @@ func main() {
 		MaxCPU:                      maxCPU,
 		MinMemory:                   minMemory,
 		MinCPU:                      minCPU,
+		MinCPUIncreasePercentage:    minCPUIncreasePercentage,
+		MinMemoryIncreasePercentage: minMemoryIncreasePercentage,
+		MinCPUDecreasePercentage:    minCPUDecreasePercentage,
+		MinMemoryDecreasePercentage: minMemoryDecreasePercentage,
 		CPUFactor:                   cpuFactor,
 		MemoryFactor:                memoryFactor,
 		RedisClient:                 rediscache.RedisClient{Client: redisClient},