mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 03:41:45 +00:00
Also change final status by removing featuregate check
This commit is contained in:
parent
014728e763
commit
4370821c87
@ -174,7 +174,7 @@ func (ne *NodeExpander) expandOnPlugin() (bool, error, testResponseData) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// File system resize succeeded, now update the PVC's Capacity to match the PV's
|
// File system resize succeeded, now update the PVC's Capacity to match the PV's
|
||||||
ne.pvc, err = util.MarkFSResizeFinished(ne.pvc, ne.pluginResizeOpts.NewSize, ne.kubeClient)
|
ne.pvc, err = util.MarkNodeExpansionFinishedWithRecovery(ne.pvc, ne.pluginResizeOpts.NewSize, ne.kubeClient)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return true, fmt.Errorf("mountVolume.NodeExpandVolume update pvc status failed: %v", err), testResponseData{true, true}
|
return true, fmt.Errorf("mountVolume.NodeExpandVolume update pvc status failed: %v", err), testResponseData{true, true}
|
||||||
}
|
}
|
||||||
|
@ -236,6 +236,28 @@ func MarkFSResizeFinished(
|
|||||||
return updatedPVC, err
|
return updatedPVC, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func MarkNodeExpansionFinishedWithRecovery(
|
||||||
|
pvc *v1.PersistentVolumeClaim,
|
||||||
|
newSize resource.Quantity,
|
||||||
|
kubeClient clientset.Interface) (*v1.PersistentVolumeClaim, error) {
|
||||||
|
newPVC := pvc.DeepCopy()
|
||||||
|
|
||||||
|
newPVC.Status.Capacity[v1.ResourceStorage] = newSize
|
||||||
|
|
||||||
|
// if RecoverVolumeExpansionFailure is enabled, we need to reset ResizeStatus back to nil
|
||||||
|
allocatedResourceStatusMap := newPVC.Status.AllocatedResourceStatuses
|
||||||
|
delete(allocatedResourceStatusMap, v1.ResourceStorage)
|
||||||
|
if len(allocatedResourceStatusMap) == 0 {
|
||||||
|
newPVC.Status.AllocatedResourceStatuses = nil
|
||||||
|
} else {
|
||||||
|
newPVC.Status.AllocatedResourceStatuses = allocatedResourceStatusMap
|
||||||
|
}
|
||||||
|
|
||||||
|
newPVC = MergeResizeConditionOnPVC(newPVC, []v1.PersistentVolumeClaimCondition{}, false /* keepOldResizeConditions */)
|
||||||
|
updatedPVC, err := PatchPVCStatus(pvc /*oldPVC*/, newPVC, kubeClient)
|
||||||
|
return updatedPVC, err
|
||||||
|
}
|
||||||
|
|
||||||
// MarkNodeExpansionInfeasible marks a PVC for node expansion as failed. Kubelet should not retry expansion
|
// MarkNodeExpansionInfeasible marks a PVC for node expansion as failed. Kubelet should not retry expansion
|
||||||
// of volumes which are in failed state.
|
// of volumes which are in failed state.
|
||||||
func MarkNodeExpansionInfeasible(pvc *v1.PersistentVolumeClaim, kubeClient clientset.Interface, err error) (*v1.PersistentVolumeClaim, error) {
|
func MarkNodeExpansionInfeasible(pvc *v1.PersistentVolumeClaim, kubeClient clientset.Interface, err error) (*v1.PersistentVolumeClaim, error) {
|
||||||
|
Loading…
Reference in New Issue
Block a user