Reduce duplication between helpers for checking featuregate

pkg/api/persistentvolumeclaim/util.go

@@ -22,6 +22,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/validation/field"
 	utilfeature "k8s.io/apiserver/pkg/util/feature"
 	"k8s.io/kubernetes/pkg/apis/core"
+	"k8s.io/kubernetes/pkg/apis/core/helper"
 	"k8s.io/kubernetes/pkg/features"
 )
 
@@ -95,10 +96,10 @@ func EnforceDataSourceBackwardsCompatibility(pvcSpec, oldPVCSpec *core.Persisten
 
 func DropDisabledFieldsFromStatus(pvc, oldPVC *core.PersistentVolumeClaim) {
 	if !utilfeature.DefaultFeatureGate.Enabled(features.RecoverVolumeExpansionFailure) {
-		if !allocatedResourcesInUse(oldPVC) {
+		if !helper.ClaimContainsAllocatedResources(oldPVC) {
 			pvc.Status.AllocatedResources = nil
 		}
-		if !resizeStatusInUse(oldPVC) {
+		if !helper.ClaimContainsAllocatedResourceStatus(oldPVC) {
 			pvc.Status.AllocatedResourceStatuses = nil
 		}
 	}
@@ -175,28 +176,6 @@ func NormalizeDataSources(pvcSpec *core.PersistentVolumeClaimSpec) {
 	}
 }
 
-func resizeStatusInUse(oldPVC *core.PersistentVolumeClaim) bool {
-	if oldPVC == nil {
-		return false
-	}
-	if oldPVC.Status.AllocatedResourceStatuses != nil {
-		return true
-	}
-	return false
-}
-
-func allocatedResourcesInUse(oldPVC *core.PersistentVolumeClaim) bool {
-	if oldPVC == nil {
-		return false
-	}
-
-	if oldPVC.Status.AllocatedResources != nil {
-		return true
-	}
-
-	return false
-}
-
 func GetWarningsForPersistentVolumeClaim(pv *core.PersistentVolumeClaim) []string {
 	var warnings []string