github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix code that uses old values for resize errors

Browse Source
This commit is contained in:
Hemant Kumar
2024-07-12 14:37:35 -04:00
parent dac308bdce
commit ad28dfb42e
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/api/persistentvolumeclaim/util_test.go
View File

@@ -498,7 +498,7 @@ func TestDropDisabledFieldsFromStatus(t *testing.T) {
name: "for:newPVC=hasResizeStatus,oldPVC=nil, featuregate=false should drop field", name: "for:newPVC=hasResizeStatus,oldPVC=nil, featuregate=false should drop field",
enableRecoverVolumeExpansionFailure: false, enableRecoverVolumeExpansionFailure: false,
enableVolumeAttributesClass: false, enableVolumeAttributesClass: false,
pvc: withResizeStatus(core.PersistentVolumeClaimNodeResizeFailed), pvc: withResizeStatus(core.PersistentVolumeClaimNodeResizeInfeasible),
oldPVC: nil, oldPVC: nil,
expected: getPVC(), expected: getPVC(),
}, },
@@ -506,25 +506,25 @@ func TestDropDisabledFieldsFromStatus(t *testing.T) {
name: "for:newPVC=hasResizeStatus,oldPVC=doesnot,featuregate=RecoverVolumeExpansionFailure=true; should keep field", name: "for:newPVC=hasResizeStatus,oldPVC=doesnot,featuregate=RecoverVolumeExpansionFailure=true; should keep field",
enableRecoverVolumeExpansionFailure: true, enableRecoverVolumeExpansionFailure: true,
enableVolumeAttributesClass: false, enableVolumeAttributesClass: false,
pvc: withResizeStatus(core.PersistentVolumeClaimNodeResizeFailed), pvc: withResizeStatus(core.PersistentVolumeClaimNodeResizeInfeasible),
oldPVC: getPVC(), oldPVC: getPVC(),
expected: withResizeStatus(core.PersistentVolumeClaimNodeResizeFailed), expected: withResizeStatus(core.PersistentVolumeClaimNodeResizeInfeasible),
}, },
{ {
name: "for:newPVC=hasResizeStatus,oldPVC=hasResizeStatus,featuregate=RecoverVolumeExpansionFailure=true; should keep field", name: "for:newPVC=hasResizeStatus,oldPVC=hasResizeStatus,featuregate=RecoverVolumeExpansionFailure=true; should keep field",
enableRecoverVolumeExpansionFailure: true, enableRecoverVolumeExpansionFailure: true,
enableVolumeAttributesClass: false, enableVolumeAttributesClass: false,
pvc: withResizeStatus(core.PersistentVolumeClaimNodeResizeFailed), pvc: withResizeStatus(core.PersistentVolumeClaimNodeResizeInfeasible),
oldPVC: withResizeStatus(core.PersistentVolumeClaimNodeResizeFailed), oldPVC: withResizeStatus(core.PersistentVolumeClaimNodeResizeInfeasible),
expected: withResizeStatus(core.PersistentVolumeClaimNodeResizeFailed), expected: withResizeStatus(core.PersistentVolumeClaimNodeResizeInfeasible),
}, },
{ {
name: "for:newPVC=hasResizeStatus,oldPVC=hasResizeStatus,featuregate=false; should keep field", name: "for:newPVC=hasResizeStatus,oldPVC=hasResizeStatus,featuregate=false; should keep field",
enableRecoverVolumeExpansionFailure: false, enableRecoverVolumeExpansionFailure: false,
enableVolumeAttributesClass: false, enableVolumeAttributesClass: false,
pvc: withResizeStatus(core.PersistentVolumeClaimNodeResizeFailed), pvc: withResizeStatus(core.PersistentVolumeClaimNodeResizeInfeasible),
oldPVC: withResizeStatus(core.PersistentVolumeClaimNodeResizeFailed), oldPVC: withResizeStatus(core.PersistentVolumeClaimNodeResizeInfeasible),
expected: withResizeStatus(core.PersistentVolumeClaimNodeResizeFailed), expected: withResizeStatus(core.PersistentVolumeClaimNodeResizeInfeasible),
}, },
{ {
name: "for:newPVC=hasVolumeAttributeClass,oldPVC=nil, featuregate=false should drop field", name: "for:newPVC=hasVolumeAttributeClass,oldPVC=nil, featuregate=false should drop field",

2
pkg/volume/util/operationexecutor/node_expander_test.go
View File

@@ -29,7 +29,7 @@ import (
) )
func TestNodeExpander(t *testing.T) { func TestNodeExpander(t *testing.T) {
nodeResizeFailed := v1.PersistentVolumeClaimNodeResizeFailed nodeResizeFailed := v1.PersistentVolumeClaimNodeResizeInfeasible
nodeResizePending := v1.PersistentVolumeClaimNodeResizePending nodeResizePending := v1.PersistentVolumeClaimNodeResizePending
var tests = []struct { var tests = []struct {

10
pkg/volume/util/operationexecutor/operation_generator_test.go
View File

@@ -94,7 +94,7 @@ func TestOperationGenerator_GenerateUnmapVolumeFunc_PluginName(t *testing.T) {
func TestOperationGenerator_GenerateExpandAndRecoverVolumeFunc(t *testing.T) { func TestOperationGenerator_GenerateExpandAndRecoverVolumeFunc(t *testing.T) {
nodeResizePending := v1.PersistentVolumeClaimNodeResizePending nodeResizePending := v1.PersistentVolumeClaimNodeResizePending
nodeResizeFailed := v1.PersistentVolumeClaimNodeResizeFailed nodeResizeFailed := v1.PersistentVolumeClaimNodeResizeInfeasible
var tests = []struct { var tests = []struct {
name string name string
pvc *v1.PersistentVolumeClaim pvc *v1.PersistentVolumeClaim
@@ -194,7 +194,7 @@ func TestOperationGenerator_nodeExpandVolume(t *testing.T) {
return &x return &x
} }
nodeResizeFailed := v1.PersistentVolumeClaimNodeResizeFailed nodeResizeFailed := v1.PersistentVolumeClaimNodeResizeInfeasible
nodeResizePending := v1.PersistentVolumeClaimNodeResizePending nodeResizePending := v1.PersistentVolumeClaimNodeResizePending
var tests = []struct { var tests = []struct {
name string name string
@@ -217,7 +217,7 @@ func TestOperationGenerator_nodeExpandVolume(t *testing.T) {
pvc: getTestPVC("test-vol0", "2G", "1G", "", &nodeResizeFailed), pvc: getTestPVC("test-vol0", "2G", "1G", "", &nodeResizeFailed),
pv: getTestPV("test-vol0", "2G"), pv: getTestPV("test-vol0", "2G"),
expectedResizeStatus: v1.PersistentVolumeClaimNodeResizeFailed, expectedResizeStatus: v1.PersistentVolumeClaimNodeResizeInfeasible,
resizeCallCount: 0, resizeCallCount: 0,
expectedStatusSize: resource.MustParse("1G"), expectedStatusSize: resource.MustParse("1G"),
}, },
@@ -234,7 +234,7 @@ func TestOperationGenerator_nodeExpandVolume(t *testing.T) {
pvc: getTestPVC(volumetesting.AlwaysFailNodeExpansion, "2G", "1G", "2G", &nodeResizePending), pvc: getTestPVC(volumetesting.AlwaysFailNodeExpansion, "2G", "1G", "2G", &nodeResizePending),
pv: getTestPV(volumetesting.AlwaysFailNodeExpansion, "2G"), pv: getTestPV(volumetesting.AlwaysFailNodeExpansion, "2G"),
expectError: true, expectError: true,
expectedResizeStatus: v1.PersistentVolumeClaimNodeResizeFailed, expectedResizeStatus: v1.PersistentVolumeClaimNodeResizeInfeasible,
resizeCallCount: 1, resizeCallCount: 1,
expectedStatusSize: resource.MustParse("1G"), expectedStatusSize: resource.MustParse("1G"),
}, },
@@ -265,7 +265,7 @@ func TestOperationGenerator_nodeExpandVolume(t *testing.T) {
desiredSize: getSizeFunc("2G"), desiredSize: getSizeFunc("2G"),
actualSize: getSizeFunc("1G"), actualSize: getSizeFunc("1G"),
expectedResizeStatus: v1.PersistentVolumeClaimNodeResizeFailed, expectedResizeStatus: v1.PersistentVolumeClaimNodeResizeInfeasible,
resizeCallCount: 0, resizeCallCount: 0,
expectedStatusSize: resource.MustParse("2G"), expectedStatusSize: resource.MustParse("2G"),
}, },

2
plugin/pkg/admission/noderestriction/admission_test.go
View File

@@ -1448,7 +1448,7 @@ func TestAdmitPVCStatus(t *testing.T) {
noExistingPods := corev1lister.NewPodLister(noExistingPodsIndex) noExistingPods := corev1lister.NewPodLister(noExistingPodsIndex)
mynode := &user.DefaultInfo{Name: "system:node:mynode", Groups: []string{"system:nodes"}} mynode := &user.DefaultInfo{Name: "system:node:mynode", Groups: []string{"system:nodes"}}
nodeExpansionFailed := api.PersistentVolumeClaimNodeResizeFailed nodeExpansionFailed := api.PersistentVolumeClaimNodeResizeInfeasible
tests := []struct { tests := []struct {
name string name string