Disable node expansion on a node if not required

Author: gnufied

pkg/controller/expand_and_recover.go

@@ -22,6 +22,7 @@ import (
 	"github.com/kubernetes-csi/external-resizer/pkg/util"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/klog/v2"
 )
 
@@ -196,6 +197,27 @@ func (ctrl *resizeController) expandAndRecover(pvc *v1.PersistentVolumeClaim, pv
 	return pvc, pv, nil, true
 }
 
+func (ctrl *resizeController) removeNodeExpansionNotRequiredAnnotation(pvc *v1.PersistentVolumeClaim) *v1.PersistentVolumeClaim {
+	if !metav1.HasAnnotation(pvc.ObjectMeta, util.NodeExpansionNotRequired) {
+		return pvc
+	}
+
+	delete(pvc.Annotations, util.NodeExpansionNotRequired)
+	return pvc
+}
+
+func (ctrl *resizeController) addNodeExpansionNotRequiredAnnotation(pvc *v1.PersistentVolumeClaim) *v1.PersistentVolumeClaim {
+	if metav1.HasAnnotation(pvc.ObjectMeta, util.NodeExpansionNotRequired) {
+		return pvc
+	}
+
+	if pvc.Annotations == nil {
+		pvc.Annotations = make(map[string]string)
+	}
+	pvc.Annotations[util.NodeExpansionNotRequired] = "true"
+	return pvc
+}
+
 func (ctrl *resizeController) markForSlowRetry(pvcKey string, resizeStatus v1.ClaimResourceStatus) {
 	if resizeStatus == v1.PersistentVolumeClaimControllerResizeInfeasible {
 		ctrl.slowSet.Add(pvcKey)

pkg/controller/resize_status.go

@@ -47,6 +47,8 @@ func (ctrl *resizeController) markControllerResizeInProgress(
 		newPVC.Status.Conditions = util.MergeResizeConditionsOfPVC(newPVC.Status.Conditions, conditions, true /*keepOldResizeConditions*/)
 	}
 
+	newPVC = ctrl.removeNodeExpansionNotRequiredAnnotation(newPVC)
+
 	if updateStatus {
 		newPVC = mergeStorageResourceStatus(newPVC, v1.PersistentVolumeClaimControllerResizeInProgress)
 	}
@@ -78,6 +80,9 @@ func (ctrl *resizeController) markForPendingNodeExpansion(pvc *v1.PersistentVolu
 	newPVC.Status.Conditions = util.MergeResizeConditionsOfPVC(newPVC.Status.Conditions,
 		[]v1.PersistentVolumeClaimCondition{pvcCondition}, true /*keepOldResizeConditions*/)
 
+	// make sure if any annotation was previously added is removed here
+	newPVC = ctrl.removeNodeExpansionNotRequiredAnnotation(newPVC)
+
 	newPVC = mergeStorageResourceStatus(newPVC, v1.PersistentVolumeClaimNodeResizePending)
 	updatedPVC, err := util.PatchClaim(ctrl.kubeClient, pvc, newPVC, true /* addResourceVersionCheck */)
 
@@ -173,6 +178,8 @@ func (ctrl *resizeController) markOverallExpansionAsFinished(
 		newPVC.Status.AllocatedResourceStatuses = resourceStatusMap
 	}
 
+	newPVC = ctrl.addNodeExpansionNotRequiredAnnotation(newPVC)
+
 	updatedPVC, err := util.PatchClaim(ctrl.kubeClient, pvc, newPVC, true /* addResourceVersionCheck */)
 	if err != nil {
 		return pvc, fmt.Errorf("mark PVC %q as resize finished failed: %v", klog.KObj(pvc), err)

pkg/util/util.go

@@ -53,6 +53,8 @@ var (
 	// Its value will be set by the external-resizer when it deems that filesystem resize is required after resizing volume.
 	// Its value will be used by pv_controller to determine pvc's status capacity when binding pvc and pv.
 	AnnPreResizeCapacity = "volume.alpha.kubernetes.io/pre-resize-capacity"
+
+	NodeExpansionNotRequired = "volume.kubernetes.io/node-expansion-not-required"
 )
 
 // MergeResizeConditionsOfPVC updates pvc with requested resize conditions