refine(util): refine getting reserved

kubewharf · May 24, 2024 · 5e1814b · 5e1814b
1 parent 6685716
commit 5e1814b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 16 deletions.
diff --git a/pkg/agent/qrm-plugins/cpu/util/util.go b/pkg/agent/qrm-plugins/cpu/util/util.go
@@ -53,15 +53,11 @@ func GetCoresReservedForSystem(conf *config.Configuration, metaServer *metaserve
 		reservedQuantity, found, err := utilkubeconfig.GetReservedQuantity(klConfig, string(v1.ResourceCPU))
 		if err != nil {
 			return machine.NewCPUSet(), fmt.Errorf("GetKubeletReservedQuantity failed with error: %v", err)
-		} else if found {
+		} else {
 			reservedQuantityFloat := float64(reservedQuantity.MilliValue()) / 1000
 			reservedQuantityInt = int(math.Ceil(reservedQuantityFloat))
 
-			general.Infof("get reservedQuantityInt: %d from kubelet config", reservedQuantityInt)
-		} else if !found {
-			reservedQuantityInt = conf.ReservedCPUCores
-			general.Infof("reserved cpu config isn't found in kubelet config, fallback to get reservedQuantityInt: %d from ReservedCPUCores configuration",
-				reservedQuantityInt)
+			general.Infof("get reservedQuantityInt: %d from kubelet config, found: %v", reservedQuantityInt, found)
 		}
 	} else {
 		reservedQuantityInt = conf.ReservedCPUCores

diff --git a/pkg/agent/qrm-plugins/memory/dynamicpolicy/util.go b/pkg/agent/qrm-plugins/memory/dynamicpolicy/util.go
@@ -71,14 +71,10 @@ func getReservedMemory(conf *config.Configuration, metaServer *metaserver.MetaSe
 		reservedQuantity, found, err := utilkubeconfig.GetReservedQuantity(klConfig, string(v1.ResourceMemory))
 		if err != nil {
 			return nil, fmt.Errorf("GetKubeletReservedQuantity failed with error: %v", err)
-		} else if found {
+		} else {
 			unitGB := resource.MustParse("1Gi")
 			reservedMemoryGB = float64(reservedQuantity.Value()) / float64(unitGB.Value())
-			general.Infof("get reservedMemoryGB: %.2f from kubelet config", reservedMemoryGB)
-		} else if !found {
-			reservedMemoryGB = float64(conf.ReservedMemoryGB)
-			general.Infof("reserved memory config isn't found in kubelet config, "+
-				"fallback to get reservedMemoryGB: %.2f from ReservedMemoryGB configuration", reservedMemoryGB)
+			general.Infof("get reservedMemoryGB: %.2f from kubelet config, found: %v", reservedMemoryGB, found)
 		}
 	} else {
 		reservedMemoryGB = float64(conf.ReservedMemoryGB)

diff --git a/pkg/util/kubelet/config/kubeletconfig.go b/pkg/util/kubelet/config/kubeletconfig.go
@@ -49,17 +49,17 @@ func GetReservedQuantity(kubeletConfig *kubeletconfigv1beta1.KubeletConfiguratio
 	found := false
 	reservedQuantity := resource.NewQuantity(0, resource.DecimalSI)
 
-	if kubeletConfig.KubeReserved != nil {
-		kubeReserved, err := resource.ParseQuantity(kubeletConfig.KubeReserved[resourceName])
+	if kubeReservedStr, ok := kubeletConfig.KubeReserved[resourceName]; ok {
+		kubeReserved, err := resource.ParseQuantity(kubeReservedStr)
 		if err != nil {
 			return resource.MustParse("0"), false,
 				fmt.Errorf("failed because parse cpu quantity for kube-reserved failed with error: %v", err)
 		}
 		reservedQuantity.Add(kubeReserved)
 		found = true
 	}
-	if kubeletConfig.SystemReserved != nil {
-		systemReserved, err := resource.ParseQuantity(kubeletConfig.SystemReserved[resourceName])
+	if systemReservedStr, ok := kubeletConfig.SystemReserved[resourceName]; ok {
+		systemReserved, err := resource.ParseQuantity(systemReservedStr)
 		if err != nil {
 			return resource.MustParse("0"), false,
 				fmt.Errorf("parse cpu quantity for system-reserved failed with error: %v", err)