Update imageLocality plugin

Barakmor1 · Barakmor1 · commit c8aaa024e8d0 · 2025-08-07T10:27:20.000+03:00
to account for ImageVolume images when scoring
and prioritizing nodes with required pod images

Signed-off-by: bmordeha &lt;bmordeha@redhat.com&gt;
diff --git a/pkg/scheduler/framework/plugins/imagelocality/image_locality.go b/pkg/scheduler/framework/plugins/imagelocality/image_locality.go
@@ -87,7 +87,8 @@ func calculatePriority(sumScores int64, numContainers int) int64 {
 	return framework.MaxNodeScore * (sumScores - minThreshold) / (maxThreshold - minThreshold)
 }
 
-// sumImageScores returns the sum of image scores of all the containers that are already on the node.
+// sumImageScores returns the sum of image scores of all the containers, including init containers and
+// imageVolumes specified in the pod's spec, that are already on the node.
 // Each image receives a raw score of its size, scaled by scaledImageScore. The raw scores are later used to calculate
 // the final score.
 func sumImageScores(nodeInfo fwk.NodeInfo, pod *v1.Pod, totalNumNodes int) int64 {
@@ -102,6 +103,14 @@ func sumImageScores(nodeInfo fwk.NodeInfo, pod *v1.Pod, totalNumNodes int) int64
 			sum += scaledImageScore(state, totalNumNodes)
 		}
 	}
+	for _, volume := range pod.Spec.Volumes {
+		if volume.Image == nil {
+			continue
+		}
+		if state, ok := nodeInfo.GetImageStates()[normalizedImageName(volume.Image.Reference)]; ok {
+			sum += scaledImageScore(state, totalNumNodes)
+		}
+	}
 	return sum
 }
 
diff --git a/pkg/scheduler/framework/plugins/imagelocality/image_locality_test.go b/pkg/scheduler/framework/plugins/imagelocality/image_locality_test.go
@@ -92,6 +92,24 @@ func TestImageLocalityPriority(t *testing.T) {
 		},
 	}
 
+	testImageVolume := v1.PodSpec{
+		Containers: []v1.Container{
+			{
+				Image: "gcr.io/30",
+			},
+		},
+		Volumes: []v1.Volume{
+			{
+				Name: "imageVolume",
+				VolumeSource: v1.VolumeSource{
+					Image: &v1.ImageVolumeSource{
+						Reference: "gcr.io/300",
+					},
+				},
+			},
+		},
+	}
+
 	test30Init300 := v1.PodSpec{
 		Containers: []v1.Container{
 			{
@@ -340,6 +358,21 @@ func TestImageLocalityPriority(t *testing.T) {
 			expectedList: []framework.NodeScore{{Name: "node1", Score: 1}, {Name: "node2", Score: 0}},
 			name:         "pod with multiple small images",
 		},
+		{
+			// Pod: gcr.io/300 gcr.io/30
+
+			// Node1
+			// Image: gcr.io/300:latest 300MB
+			// Score: 100 * (300M * 1/2 - 23M) / (1000M - 23M) = 12
+
+			// Node2
+			// Image: gcr.io/30:latest 30MB
+			// Score:  100 * (30M - 23M) / (1000M - 23M) = 0
+			pod:          &v1.Pod{Spec: testImageVolume},
+			nodes:        []*v1.Node{makeImageNode("node1", node300600900), makeImageNode("node2", node400030)},
+			expectedList: []framework.NodeScore{{Name: "node1", Score: 12}, {Name: "node2", Score: 0}},
+			name:         "pod with ImageVolume",
+		},
 		{
 			// Pod: gcr.io/30  InitContainers: gcr.io/300
 

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,8 @@ func calculatePriority(sumScores int64, numContainers int) int64 {`
`87`	`87`	`return framework.MaxNodeScore * (sumScores - minThreshold) / (maxThreshold - minThreshold)`
`88`	`88`	`}`
`89`	`89`
`90`		`-// sumImageScores returns the sum of image scores of all the containers that are already on the node.`
	`90`	`+// sumImageScores returns the sum of image scores of all the containers, including init containers and`
	`91`	`+// imageVolumes specified in the pod's spec, that are already on the node.`
`91`	`92`	`// Each image receives a raw score of its size, scaled by scaledImageScore. The raw scores are later used to calculate`
`92`	`93`	`// the final score.`
`93`	`94`	`func sumImageScores(nodeInfo fwk.NodeInfo, pod *v1.Pod, totalNumNodes int) int64 {`
`@@ -102,6 +103,14 @@ func sumImageScores(nodeInfo fwk.NodeInfo, pod *v1.Pod, totalNumNodes int) int64`
`102`	`103`	`sum += scaledImageScore(state, totalNumNodes)`
`103`	`104`	`}`
`104`	`105`	`}`
	`106`	`+ for _, volume := range pod.Spec.Volumes {`
	`107`	`+ if volume.Image == nil {`
	`108`	`+ continue`
	`109`	`+ }`
	`110`	`+ if state, ok := nodeInfo.GetImageStates()[normalizedImageName(volume.Image.Reference)]; ok {`
	`111`	`+ sum += scaledImageScore(state, totalNumNodes)`
	`112`	`+ }`
	`113`	`+ }`
`105`	`114`	`return sum`
`106`	`115`	`}`
`107`	`116`