Merge pull request kubernetes#129145 from ialidzhikov/fix/confusing-err-message

k8s-ci-robot · web-flow · commit 04b1ef36245d · 2025-04-23T13:30:45.000-07:00
kube-scheduler: Fix a misleading error message in the VolumeRestrictions plugin
diff --git a/pkg/scheduler/framework/plugins/volumerestrictions/volume_restrictions.go b/pkg/scheduler/framework/plugins/volumerestrictions/volume_restrictions.go
@@ -54,8 +54,8 @@ const (
 
 	// ErrReasonDiskConflict is used for NoDiskConflict predicate error.
 	ErrReasonDiskConflict = "node(s) had no available disk"
-	// ErrReasonReadWriteOncePodConflict is used when a pod is found using the same PVC with the ReadWriteOncePod access mode.
-	ErrReasonReadWriteOncePodConflict = "node has pod using PersistentVolumeClaim with the same name and ReadWriteOncePod access mode"
+	// ErrReasonReadWriteOncePodConflict is used when a PVC with ReadWriteOncePod access mode is already in-use by another pod.
+	ErrReasonReadWriteOncePodConflict = "node(s) unavailable due to PersistentVolumeClaim with ReadWriteOncePod access mode already in-use by another pod"
 )
 
 // preFilterState computed at PreFilter and used at Filter.

Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,8 @@ const (`
`54`	`54`
`55`	`55`	`// ErrReasonDiskConflict is used for NoDiskConflict predicate error.`
`56`	`56`	`ErrReasonDiskConflict = "node(s) had no available disk"`
`57`		`- // ErrReasonReadWriteOncePodConflict is used when a pod is found using the same PVC with the ReadWriteOncePod access mode.`
`58`		`- ErrReasonReadWriteOncePodConflict = "node has pod using PersistentVolumeClaim with the same name and ReadWriteOncePod access mode"`
	`57`	`+ // ErrReasonReadWriteOncePodConflict is used when a PVC with ReadWriteOncePod access mode is already in-use by another pod.`
	`58`	`+ ErrReasonReadWriteOncePodConflict = "node(s) unavailable due to PersistentVolumeClaim with ReadWriteOncePod access mode already in-use by another pod"`
`59`	`59`	`)`
`60`	`60`
`61`	`61`	`// preFilterState computed at PreFilter and used at Filter.`