Merge pull request #246 from gnufied/fix-panic-from-nil-error

k8s-ci-robot · web-flow · commit 3abfba4eff85 · 2022-12-05T09:03:03.000-08:00
Fix panic if unable to update PVC
diff --git a/pkg/controller/resize_status.go b/pkg/controller/resize_status.go
@@ -45,7 +45,7 @@ func (ctrl *resizeController) markControllerResizeInProgress(
 	newPVC.Status.AllocatedResources = v1.ResourceList{v1.ResourceStorage: newSize}
 	updatedPVC, err := ctrl.patchClaim(pvc, newPVC, true /* addResourceVersionCheck */)
 	if err != nil {
-		return nil, err
+		return pvc, err
 	}
 	return updatedPVC, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ func (ctrl *resizeController) markControllerResizeInProgress(`
`45`	`45`	`newPVC.Status.AllocatedResources = v1.ResourceList{v1.ResourceStorage: newSize}`
`46`	`46`	`updatedPVC, err := ctrl.patchClaim(pvc, newPVC, true /* addResourceVersionCheck */)`
`47`	`47`	`if err != nil {`
`48`		`- return nil, err`
	`48`	`+ return pvc, err`
`49`	`49`	`}`
`50`	`50`	`return updatedPVC, nil`
`51`	`51`	`}`