From 526960f9885bc20dbef615e6e20eb7bfe812ba35 Mon Sep 17 00:00:00 2001 From: Richard Hrmo Date: Mon, 3 Mar 2025 16:56:18 +0100 Subject: [PATCH] Change FailedScheduling Event message to be more intuitive --- pkg/scheduler/framework/plugins/volumebinding/binder.go | 2 +- pkg/scheduler/schedule_one_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/scheduler/framework/plugins/volumebinding/binder.go b/pkg/scheduler/framework/plugins/volumebinding/binder.go index d20ca931822..175c2baf6c0 100644 --- a/pkg/scheduler/framework/plugins/volumebinding/binder.go +++ b/pkg/scheduler/framework/plugins/volumebinding/binder.go @@ -65,7 +65,7 @@ const ( // ErrReasonBindConflict is used for VolumeBindingNoMatch predicate error. ErrReasonBindConflict ConflictReason = "node(s) didn't find available persistent volumes to bind" // ErrReasonNodeConflict is used for VolumeNodeAffinityConflict predicate error. - ErrReasonNodeConflict ConflictReason = "node(s) had volume node affinity conflict" + ErrReasonNodeConflict ConflictReason = "node(s) didn't match PersistentVolume's node affinity" // ErrReasonNotEnoughSpace is used when a pod cannot start on a node because not enough storage space is available. ErrReasonNotEnoughSpace = "node(s) did not have enough free storage" // ErrReasonPVNotExist is used when a pod has one or more PVC(s) bound to non-existent persistent volume(s)" diff --git a/pkg/scheduler/schedule_one_test.go b/pkg/scheduler/schedule_one_test.go index 6e628fa1b71..8edb15c2b3c 100644 --- a/pkg/scheduler/schedule_one_test.go +++ b/pkg/scheduler/schedule_one_test.go @@ -1120,7 +1120,7 @@ func TestSchedulerWithVolumeBinding(t *testing.T) { FindReasons: volumebinding.ConflictReasons{volumebinding.ErrReasonNodeConflict}, }, eventReason: "FailedScheduling", - expectError: makePredicateError("1 node(s) had volume node affinity conflict"), + expectError: makePredicateError("1 node(s) didn't match PersistentVolume's node affinity"), }, { name: "unbound/no matches", @@ -1136,7 +1136,7 @@ func TestSchedulerWithVolumeBinding(t *testing.T) { FindReasons: volumebinding.ConflictReasons{volumebinding.ErrReasonBindConflict, volumebinding.ErrReasonNodeConflict}, }, eventReason: "FailedScheduling", - expectError: makePredicateError("1 node(s) didn't find available persistent volumes to bind, 1 node(s) had volume node affinity conflict"), + expectError: makePredicateError("1 node(s) didn't find available persistent volumes to bind, 1 node(s) didn't match PersistentVolume's node affinity"), }, { name: "unbound/found matches/bind succeeds",