From 0b5b04842c0d16b9500aca09ff30be33b04c79a1 Mon Sep 17 00:00:00 2001 From: Konstantin Misyutin Date: Wed, 10 Nov 2021 21:50:19 +0800 Subject: [PATCH] Cleanup: merge checkVolumeNodeAffinity with CheckVolumeNodeAffinity Signed-off-by: Konstantin Misyutin --- .../src/k8s.io/component-helpers/storage/volume/helpers.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/staging/src/k8s.io/component-helpers/storage/volume/helpers.go b/staging/src/k8s.io/component-helpers/storage/volume/helpers.go index 2ca4201c236..7ec376f34a0 100644 --- a/staging/src/k8s.io/component-helpers/storage/volume/helpers.go +++ b/staging/src/k8s.io/component-helpers/storage/volume/helpers.go @@ -52,15 +52,12 @@ func GetPersistentVolumeClass(volume *v1.PersistentVolume) string { // CheckNodeAffinity looks at the PV node affinity, and checks if the node has the same corresponding labels // This ensures that we don't mount a volume that doesn't belong to this node func CheckNodeAffinity(pv *v1.PersistentVolume, nodeLabels map[string]string) error { - return checkVolumeNodeAffinity(pv, &v1.Node{ObjectMeta: metav1.ObjectMeta{Labels: nodeLabels}}) -} - -func checkVolumeNodeAffinity(pv *v1.PersistentVolume, node *v1.Node) error { if pv.Spec.NodeAffinity == nil { return nil } if pv.Spec.NodeAffinity.Required != nil { + node := &v1.Node{ObjectMeta: metav1.ObjectMeta{Labels: nodeLabels}} terms := pv.Spec.NodeAffinity.Required if matches, err := corev1.MatchNodeSelectorTerms(node, terms); err != nil { return err