Merge pull request kubernetes#3641 from yaroslava-serdiuk/DS2

change how DaemonSet utilization is calculated

Author: k8s-ci-robot

cluster-autoscaler/simulator/cluster.go

@@ -258,9 +258,15 @@ func calculateUtilizationOfResource(node *apiv1.Node, nodeInfo *schedulerframewo
 		return 0, fmt.Errorf("%v is 0 at %s", resourceName, node.Name)
 	}
 	podsRequest := resource.MustParse("0")
+	daemonSetUtilization := resource.MustParse("0")
 	for _, podInfo := range nodeInfo.Pods {
 		// factor daemonset pods out of the utilization calculations
 		if skipDaemonSetPods && pod_util.IsDaemonSetPod(podInfo.Pod) {
+			for _, container := range podInfo.Pod.Spec.Containers {
+				if resourceValue, found := container.Resources.Requests[resourceName]; found {
+					daemonSetUtilization.Add(resourceValue)
+				}
+			}
 			continue
 		}
 		// factor mirror pods out of the utilization calculations
@@ -273,7 +279,7 @@ func calculateUtilizationOfResource(node *apiv1.Node, nodeInfo *schedulerframewo
 			}
 		}
 	}
-	return float64(podsRequest.MilliValue()) / float64(nodeAllocatable.MilliValue()), nil
+	return float64(podsRequest.MilliValue()) / float64(nodeAllocatable.MilliValue()-daemonSetUtilization.MilliValue()), nil
 }
 
 func findPlaceFor(removedNode string, pods []*apiv1.Pod, nodes map[string]bool,

cluster-autoscaler/simulator/cluster_test.go

@@ -59,7 +59,7 @@ func TestUtilization(t *testing.T) {
 	nodeInfo = schedulerframework.NewNodeInfo(pod, pod, pod2, daemonSetPod3, daemonSetPod4)
 	utilInfo, err = CalculateUtilization(node, nodeInfo, true, false, gpuLabel)
 	assert.NoError(t, err)
-	assert.InEpsilon(t, 2.0/10, utilInfo.Utilization, 0.01)
+	assert.InEpsilon(t, 2.5/10, utilInfo.Utilization, 0.01)
 
 	nodeInfo = schedulerframework.NewNodeInfo(pod, pod2, daemonSetPod3)
 	utilInfo, err = CalculateUtilization(node, nodeInfo, false, false, gpuLabel)