From ad28dfb42ec516bd70003c682379369e8614c493 Mon Sep 17 00:00:00 2001 From: Hemant Kumar Date: Fri, 12 Jul 2024 14:37:35 -0400 Subject: [PATCH] Fix code that uses old values for resize errors --- pkg/api/persistentvolumeclaim/util_test.go | 18 +++++++++--------- .../operationexecutor/node_expander_test.go | 2 +- .../operation_generator_test.go | 10 +++++----- .../noderestriction/admission_test.go | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pkg/api/persistentvolumeclaim/util_test.go b/pkg/api/persistentvolumeclaim/util_test.go index d75aadde912..f24d3f61b22 100644 --- a/pkg/api/persistentvolumeclaim/util_test.go +++ b/pkg/api/persistentvolumeclaim/util_test.go @@ -498,7 +498,7 @@ func TestDropDisabledFieldsFromStatus(t *testing.T) { name: "for:newPVC=hasResizeStatus,oldPVC=nil, featuregate=false should drop field", enableRecoverVolumeExpansionFailure: false, enableVolumeAttributesClass: false, - pvc: withResizeStatus(core.PersistentVolumeClaimNodeResizeFailed), + pvc: withResizeStatus(core.PersistentVolumeClaimNodeResizeInfeasible), oldPVC: nil, expected: getPVC(), }, @@ -506,25 +506,25 @@ func TestDropDisabledFieldsFromStatus(t *testing.T) { name: "for:newPVC=hasResizeStatus,oldPVC=doesnot,featuregate=RecoverVolumeExpansionFailure=true; should keep field", enableRecoverVolumeExpansionFailure: true, enableVolumeAttributesClass: false, - pvc: withResizeStatus(core.PersistentVolumeClaimNodeResizeFailed), + pvc: withResizeStatus(core.PersistentVolumeClaimNodeResizeInfeasible), oldPVC: getPVC(), - expected: withResizeStatus(core.PersistentVolumeClaimNodeResizeFailed), + expected: withResizeStatus(core.PersistentVolumeClaimNodeResizeInfeasible), }, { name: "for:newPVC=hasResizeStatus,oldPVC=hasResizeStatus,featuregate=RecoverVolumeExpansionFailure=true; should keep field", enableRecoverVolumeExpansionFailure: true, enableVolumeAttributesClass: false, - pvc: withResizeStatus(core.PersistentVolumeClaimNodeResizeFailed), - oldPVC: withResizeStatus(core.PersistentVolumeClaimNodeResizeFailed), - expected: withResizeStatus(core.PersistentVolumeClaimNodeResizeFailed), + pvc: withResizeStatus(core.PersistentVolumeClaimNodeResizeInfeasible), + oldPVC: withResizeStatus(core.PersistentVolumeClaimNodeResizeInfeasible), + expected: withResizeStatus(core.PersistentVolumeClaimNodeResizeInfeasible), }, { name: "for:newPVC=hasResizeStatus,oldPVC=hasResizeStatus,featuregate=false; should keep field", enableRecoverVolumeExpansionFailure: false, enableVolumeAttributesClass: false, - pvc: withResizeStatus(core.PersistentVolumeClaimNodeResizeFailed), - oldPVC: withResizeStatus(core.PersistentVolumeClaimNodeResizeFailed), - expected: withResizeStatus(core.PersistentVolumeClaimNodeResizeFailed), + pvc: withResizeStatus(core.PersistentVolumeClaimNodeResizeInfeasible), + oldPVC: withResizeStatus(core.PersistentVolumeClaimNodeResizeInfeasible), + expected: withResizeStatus(core.PersistentVolumeClaimNodeResizeInfeasible), }, { name: "for:newPVC=hasVolumeAttributeClass,oldPVC=nil, featuregate=false should drop field", diff --git a/pkg/volume/util/operationexecutor/node_expander_test.go b/pkg/volume/util/operationexecutor/node_expander_test.go index 189663359a3..09d1620fd52 100644 --- a/pkg/volume/util/operationexecutor/node_expander_test.go +++ b/pkg/volume/util/operationexecutor/node_expander_test.go @@ -29,7 +29,7 @@ import ( ) func TestNodeExpander(t *testing.T) { - nodeResizeFailed := v1.PersistentVolumeClaimNodeResizeFailed + nodeResizeFailed := v1.PersistentVolumeClaimNodeResizeInfeasible nodeResizePending := v1.PersistentVolumeClaimNodeResizePending var tests = []struct { diff --git a/pkg/volume/util/operationexecutor/operation_generator_test.go b/pkg/volume/util/operationexecutor/operation_generator_test.go index f0527c39c15..6fc4497361d 100644 --- a/pkg/volume/util/operationexecutor/operation_generator_test.go +++ b/pkg/volume/util/operationexecutor/operation_generator_test.go @@ -94,7 +94,7 @@ func TestOperationGenerator_GenerateUnmapVolumeFunc_PluginName(t *testing.T) { func TestOperationGenerator_GenerateExpandAndRecoverVolumeFunc(t *testing.T) { nodeResizePending := v1.PersistentVolumeClaimNodeResizePending - nodeResizeFailed := v1.PersistentVolumeClaimNodeResizeFailed + nodeResizeFailed := v1.PersistentVolumeClaimNodeResizeInfeasible var tests = []struct { name string pvc *v1.PersistentVolumeClaim @@ -194,7 +194,7 @@ func TestOperationGenerator_nodeExpandVolume(t *testing.T) { return &x } - nodeResizeFailed := v1.PersistentVolumeClaimNodeResizeFailed + nodeResizeFailed := v1.PersistentVolumeClaimNodeResizeInfeasible nodeResizePending := v1.PersistentVolumeClaimNodeResizePending var tests = []struct { name string @@ -217,7 +217,7 @@ func TestOperationGenerator_nodeExpandVolume(t *testing.T) { pvc: getTestPVC("test-vol0", "2G", "1G", "", &nodeResizeFailed), pv: getTestPV("test-vol0", "2G"), - expectedResizeStatus: v1.PersistentVolumeClaimNodeResizeFailed, + expectedResizeStatus: v1.PersistentVolumeClaimNodeResizeInfeasible, resizeCallCount: 0, expectedStatusSize: resource.MustParse("1G"), }, @@ -234,7 +234,7 @@ func TestOperationGenerator_nodeExpandVolume(t *testing.T) { pvc: getTestPVC(volumetesting.AlwaysFailNodeExpansion, "2G", "1G", "2G", &nodeResizePending), pv: getTestPV(volumetesting.AlwaysFailNodeExpansion, "2G"), expectError: true, - expectedResizeStatus: v1.PersistentVolumeClaimNodeResizeFailed, + expectedResizeStatus: v1.PersistentVolumeClaimNodeResizeInfeasible, resizeCallCount: 1, expectedStatusSize: resource.MustParse("1G"), }, @@ -265,7 +265,7 @@ func TestOperationGenerator_nodeExpandVolume(t *testing.T) { desiredSize: getSizeFunc("2G"), actualSize: getSizeFunc("1G"), - expectedResizeStatus: v1.PersistentVolumeClaimNodeResizeFailed, + expectedResizeStatus: v1.PersistentVolumeClaimNodeResizeInfeasible, resizeCallCount: 0, expectedStatusSize: resource.MustParse("2G"), }, diff --git a/plugin/pkg/admission/noderestriction/admission_test.go b/plugin/pkg/admission/noderestriction/admission_test.go index d4eb6d8fef4..63aa1c5fb68 100644 --- a/plugin/pkg/admission/noderestriction/admission_test.go +++ b/plugin/pkg/admission/noderestriction/admission_test.go @@ -1448,7 +1448,7 @@ func TestAdmitPVCStatus(t *testing.T) { noExistingPods := corev1lister.NewPodLister(noExistingPodsIndex) mynode := &user.DefaultInfo{Name: "system:node:mynode", Groups: []string{"system:nodes"}} - nodeExpansionFailed := api.PersistentVolumeClaimNodeResizeFailed + nodeExpansionFailed := api.PersistentVolumeClaimNodeResizeInfeasible tests := []struct { name string