[node-cleanup] Check node label to know if pv is linked to a deleted node

Author: Fricounet

pkg/common/common.go

@@ -33,9 +33,10 @@ import (
 	"sigs.k8s.io/yaml"
 
 	v1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/labels"
+	"k8s.io/apimachinery/pkg/selection"
 	"k8s.io/client-go/informers"
 	"k8s.io/client-go/kubernetes"
 	corelisters "k8s.io/client-go/listers/core/v1"
@@ -488,12 +489,17 @@ func GetVolumeMode(volUtil util.VolumeUtil, fullPath string) (v1.PersistentVolum
 }
 
 // NodeExists checks to see if a Node exists in the Indexer of a NodeLister.
-func NodeExists(nodeLister corelisters.NodeLister, nodeName string) (bool, error) {
-	_, err := nodeLister.Get(nodeName)
-	if errors.IsNotFound(err) {
-		return false, nil
+// It uses the well known label `kubernetes.io/hostname` to find the Node.
+func NodeExists(nodeLister corelisters.NodeLister, nodeLabelValue string) (bool, error) {
+	req, err := labels.NewRequirement(NodeLabelKey, selection.Equals, []string{nodeLabelValue})
+	if err != nil {
+		return false, err
+	}
+	nodes, err := nodeLister.List(labels.NewSelector().Add(*req))
+	if err != nil {
+		return false, err
 	}
-	return err == nil, err
+	return len(nodes) > 0, nil
 }
 
 // NodeAttachedToLocalPV gets the name of the Node that a local PV has a NodeAffinity to.

pkg/common/common_test.go

@@ -480,7 +480,9 @@ func TestGetVolumeMode(t *testing.T) {
 func TestNodeExists(t *testing.T) {
 	node := &v1.Node{
 		ObjectMeta: metav1.ObjectMeta{
-			Name: "test-node",
+			Labels: map[string]string{
+				NodeLabelKey: "test-node",
+			},
 		},
 	}
 
@@ -510,7 +512,7 @@ func TestNodeExists(t *testing.T) {
 			nodeInformer.Informer().GetStore().Add(test.nodeAdded)
 		}
 
-		exists, err := NodeExists(nodeInformer.Lister(), test.nodeQueried.Name)
+		exists, err := NodeExists(nodeInformer.Lister(), test.nodeQueried.Labels[NodeLabelKey])
 		if err != nil {
 			t.Errorf("Got unexpected error: %s", err.Error())
 		}

pkg/node-cleanup/controller/controller_test.go

@@ -330,7 +330,7 @@ func pvWithPVCAndNode(pvc *v1.PersistentVolumeClaim, node *v1.Node) *v1.Persiste
 						{
 							Key:      common.NodeLabelKey,
 							Operator: v1.NodeSelectorOpIn,
-							Values:   []string{node.Name},
+							Values:   []string{node.Labels[common.NodeLabelKey]},
 						},
 					},
 				},
@@ -351,7 +351,7 @@ func pvWithNode(node *v1.Node) *v1.PersistentVolume {
 						{
 							Key:      common.NodeLabelKey,
 							Operator: v1.NodeSelectorOpIn,
-							Values:   []string{node.Name},
+							Values:   []string{node.Labels[common.NodeLabelKey]},
 						},
 					},
 				},
@@ -386,7 +386,7 @@ func pvcWithUID(uid string) *v1.PersistentVolumeClaim {
 func node() *v1.Node {
 	return &v1.Node{
 		ObjectMeta: metav1.ObjectMeta{
-			Name: defaultNodeName,
+			Labels: map[string]string{common.NodeLabelKey: defaultNodeName},
 		},
 	}
 }

pkg/node-cleanup/deleter/deleter_test.go

@@ -211,7 +211,7 @@ func localPV(node *v1.Node, phase v1.PersistentVolumePhase, reclaimPolicy v1.Per
 								{
 									Key:      common.NodeLabelKey,
 									Operator: v1.NodeSelectorOpIn,
-									Values:   []string{node.Name},
+									Values:   []string{node.Labels[common.NodeLabelKey]},
 								},
 							},
 						},
@@ -230,7 +230,7 @@ func localPV(node *v1.Node, phase v1.PersistentVolumePhase, reclaimPolicy v1.Per
 func node() *v1.Node {
 	return &v1.Node{
 		ObjectMeta: metav1.ObjectMeta{
-			Name: testNodeName,
+			Labels: map[string]string{common.NodeLabelKey: testNodeName},
 		},
 	}
 }