Merge pull request #2527 from harche/bug_1949387

Bug 1949387: Fix the typo in reserved calculation in auto sizing script
openshift · Apr 15, 2021 · fbc4d8e · fbc4d8e
2 parents 12d2b34 + 92b1e18
commit fbc4d8e
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/templates/common/_base/files/kubelet-auto-sizing.yaml b/templates/common/_base/files/kubelet-auto-sizing.yaml
@@ -37,7 +37,7 @@ contents:
             recommended_systemreserved_memory=$(echo $recommended_systemreserved_memory 6.72 | awk '{print $1 + $2}')
             total_memory=$((total_memory-112))
         fi
-        if (($total_memory >= 128)); then # 2% of any memory above 128GB
+        if (($total_memory >= 0)); then # 2% of any memory above 128GB
             recommended_systemreserved_memory=$(echo $recommended_systemreserved_memory $(echo $total_memory 0.02 | awk '{print $1 * $2}') | awk '{print $1 + $2}')
         fi
         echo "SYSTEM_RESERVED_MEMORY=${recommended_systemreserved_memory}Gi">> ${NODE_SIZES_ENV}
@@ -46,15 +46,16 @@ contents:
         total_cpu=$(getconf _NPROCESSORS_ONLN)
         recommended_systemreserved_cpu=0
         if (($total_cpu <= 1)); then # 6% of the first core
-            recommended_systemreserved_cpu=$(echo $total_cpu 0.60 | awk '{print $1 * $2}')
+            recommended_systemreserved_cpu=$(echo $total_cpu 0.06 | awk '{print $1 * $2}')
             total_cpu=0
         else
             recommended_systemreserved_cpu=0.06
             total_cpu=$((total_cpu-1))
         fi
         if (($total_cpu <= 1)); then # 1% of the next core (up to 2 cores)
-            recommended_systemreserved_cpu=$(echo $recommended_systemreserved_cpu $(echo $total_cpu 0.10 | awk '{print $1 * $2}') | awk '{print $1 + $2}')
-            total_cpu=0 else
+            recommended_systemreserved_cpu=$(echo $recommended_systemreserved_cpu $(echo $total_cpu 0.01 | awk '{print $1 * $2}') | awk '{print $1 + $2}')
+            total_cpu=0
+        else
             recommended_systemreserved_cpu=$(echo $recommended_systemreserved_cpu 0.01 | awk '{print $1 + $2}')
             total_cpu=$((total_cpu-1))
         fi
@@ -65,7 +66,7 @@ contents:
             recommended_systemreserved_cpu=$(echo $recommended_systemreserved_cpu 0.01 | awk '{print $1 + $2}')
             total_cpu=$((total_cpu-2))
         fi
-        if (($total_cpu >= 4)); then # 0.25% of any cores above 4 cores
+        if (($total_cpu >= 0)); then # 0.25% of any cores above 4 cores
             recommended_systemreserved_cpu=$(echo $recommended_systemreserved_cpu $(echo $total_cpu 0.0025 | awk '{print $1 * $2}') | awk '{print $1 + $2}')
         fi
         echo "SYSTEM_RESERVED_CPU=${recommended_systemreserved_cpu}">> ${NODE_SIZES_ENV}