chore: code change due to k8s lib upgrade

golint

Author: andyzhangx

pkg/node-cleanup/controller/controller.go

@@ -36,10 +36,10 @@ import (
 	"k8s.io/client-go/tools/record"
 	"k8s.io/client-go/util/workqueue"
 	"k8s.io/klog/v2"
-	volumeUtil "k8s.io/kubernetes/pkg/volume/util"
 
 	"sigs.k8s.io/sig-storage-local-static-provisioner/pkg/common"
 	cleanupmetrics "sigs.k8s.io/sig-storage-local-static-provisioner/pkg/metrics/node-cleanup"
+	"sigs.k8s.io/sig-storage-local-static-provisioner/pkg/util"
 )
 
 // CleanupController handles the deletion of PVCs that reference deleted Nodes.
@@ -197,7 +197,7 @@ func (c *CleanupController) syncHandler(ctx context.Context, pvName string) erro
 		return err
 	}
 
-	nodeNames := volumeUtil.GetLocalPersistentVolumeNodeNames(pv)
+	nodeNames := util.GetLocalPersistentVolumeNodeNames(pv)
 	if nodeNames == nil {
 		// For whatever reason the PV isn't formatted properly so we will
 		// never be able to get its corresponding Node, so ignore.
@@ -262,7 +262,7 @@ func (c *CleanupController) startCleanupTimersIfNeeded() {
 			continue
 		}
 
-		nodeNames := volumeUtil.GetLocalPersistentVolumeNodeNames(pv)
+		nodeNames := util.GetLocalPersistentVolumeNodeNames(pv)
 		if nodeNames == nil {
 			klog.Errorf("error getting node attached to pv: %s", pv)
 			continue

pkg/node-cleanup/deleter/deleter.go

@@ -27,10 +27,10 @@ import (
 	"k8s.io/client-go/kubernetes"
 	corelisters "k8s.io/client-go/listers/core/v1"
 	"k8s.io/klog/v2"
-	volumeUtil "k8s.io/kubernetes/pkg/volume/util"
 
 	"sigs.k8s.io/sig-storage-local-static-provisioner/pkg/common"
 	cleanupmetrics "sigs.k8s.io/sig-storage-local-static-provisioner/pkg/metrics/node-cleanup"
+	"sigs.k8s.io/sig-storage-local-static-provisioner/pkg/util"
 )
 
 // Deleter handles cleanup of local PVs with an affinity to a deleted Node.
@@ -120,7 +120,7 @@ func (d *Deleter) DeletePVs(ctx context.Context) {
 //	        values:
 //	        - <node1>
 func (d *Deleter) referencesNonExistentNode(localPV *v1.PersistentVolume) bool {
-	nodeNames := volumeUtil.GetLocalPersistentVolumeNodeNames(localPV)
+	nodeNames := util.GetLocalPersistentVolumeNodeNames(localPV)
 	if nodeNames == nil {
 		return false
 	}

pkg/util/volume_util.go

@@ -18,6 +18,9 @@ package util
 
 import (
 	"os"
+
+	"k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/util/sets"
 )
 
 // VolumeUtil is an interface for local filesystem operations
@@ -74,3 +77,41 @@ func (u *volumeUtil) ReadDir(fullPath string) ([]string, error) {
 	}
 	return files, nil
 }
+
+// GetLocalPersistentVolumeNodeNames returns the node affinity node name(s) for
+// local PersistentVolumes. nil is returned if the PV does not have any
+// specific node affinity node selector terms and match expressions.
+// PersistentVolume with node affinity has select and match expressions
+// in the form of:
+//
+//	nodeAffinity:
+//	  required:
+//	    nodeSelectorTerms:
+//	    - matchExpressions:
+//	      - key: kubernetes.io/hostname
+//	        operator: In
+//	        values:
+//	        - <node1>
+//	        - <node2>
+func GetLocalPersistentVolumeNodeNames(pv *v1.PersistentVolume) []string {
+	if pv == nil || pv.Spec.NodeAffinity == nil || pv.Spec.NodeAffinity.Required == nil {
+		return nil
+	}
+
+	var result sets.Set[string]
+	for _, term := range pv.Spec.NodeAffinity.Required.NodeSelectorTerms {
+		var nodes sets.Set[string]
+		for _, matchExpr := range term.MatchExpressions {
+			if matchExpr.Key == v1.LabelHostname && matchExpr.Operator == v1.NodeSelectorOpIn {
+				if nodes == nil {
+					nodes = sets.New(matchExpr.Values...)
+				} else {
+					nodes = nodes.Intersection(sets.New(matchExpr.Values...))
+				}
+			}
+		}
+		result = result.Union(nodes)
+	}
+
+	return sets.List(result)
+}

test/e2e/e2e_test.go

@@ -860,7 +860,7 @@ func newLocalClaim(config *localTestConfig) *v1.PersistentVolumeClaim {
 			AccessModes: []v1.PersistentVolumeAccessMode{
 				v1.ReadWriteOnce,
 			},
-			Resources: v1.ResourceRequirements{
+			Resources: v1.VolumeResourceRequirements{
 				Requests: v1.ResourceList{
 					v1.ResourceName(v1.ResourceStorage): resource.MustParse(testRequestSize),
 				},