fix(scheduler): update lib-csi pkg to exclude cordoned nodes

Signed-off-by: Abhilash Shetty <[email protected]>
openebs · Feb 25, 2025 · 26a721a · 26a721a
1 parent 32a301a
commit 26a721a
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 15 deletions.
diff --git a/go.mod b/go.mod
@@ -8,7 +8,7 @@ require (
 	github.com/onsi/ginkgo v1.16.4
 	github.com/onsi/gomega v1.27.4
 	github.com/openebs/google-analytics-4 v0.3.0
-	github.com/openebs/lib-csi v0.8.2
+	github.com/openebs/lib-csi v0.9.0
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.15.1
 	github.com/spf13/cobra v1.6.0

diff --git a/go.sum b/go.sum
@@ -314,8 +314,8 @@ github.com/onsi/gomega v1.27.4 h1:Z2AnStgsdSayCMDiCU42qIz+HLqEPcgiOCXjAU/w+8E=
 github.com/onsi/gomega v1.27.4/go.mod h1:riYq/GJKh8hhoM01HN6Vmuy93AarCXCBGpvFDK3q3fQ=
 github.com/openebs/google-analytics-4 v0.3.0 h1:rAv9BC476ennyGPWAy4D3vU7TlxEKiynbLUP3VgeBUc=
 github.com/openebs/google-analytics-4 v0.3.0/go.mod h1:lKjvRs6HAYOlOTYjtOUp35iTutoXzRL0hOeVAvLAfZI=
-github.com/openebs/lib-csi v0.8.2 h1:HmoiZX3VXFPglwqnRPnRus7K58ixDWBa19OpPZGk2Ws=
-github.com/openebs/lib-csi v0.8.2/go.mod h1:4yc0Q1thH+oU80z73zGELfrOw2yeLdLNIRmcrxBxsBc=
+github.com/openebs/lib-csi v0.9.0 h1:Yro5CN0cT3bRYOB1IdGPKXnBcPzxZnkxd4MLREAtFME=
+github.com/openebs/lib-csi v0.9.0/go.mod h1:4yc0Q1thH+oU80z73zGELfrOw2yeLdLNIRmcrxBxsBc=
 github.com/pborman/uuid v0.0.0-20170612153648-e790cca94e6c/go.mod h1:VyrYX9gd7irzKovcSS6BIIEwPRkP2Wm2m9ufcdFSJ34=
 github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=

diff --git a/tests/lvm_utils.go b/tests/lvm_utils.go
@@ -159,7 +159,6 @@ func removeVg(name string) {
 		if current_retry < retries {
 			vg_empty := vgEmpty(name)
 			if vg_empty {
-				fmt.Printf("No lv in vg before vg remove\n")
 				break
 			} else {
 				fmt.Printf("lv in vg during retry %d\n", current_retry)

diff --git a/tests/provision_test.go b/tests/provision_test.go
@@ -158,7 +158,7 @@ func scheduleOnCordonedNodeTest() {
 	createAndVerifyPVC(false)
 	By("Uncordon the node", uncordonk8sNode)
 	By("Verify the PVC gets Bound")
-	verifyPVC(pvcName, true)
+	verifyPVCStatus(pvcName, true)
 	deleteAndVerifyPVC(pvcName)
 	By("Verifying that PV doesnt exists after PVC deletion")
 	verifyPVForPVC(false, pvcName)

diff --git a/tests/utils.go b/tests/utils.go
@@ -304,14 +304,7 @@ func createAndVerifyPVC(expect_bound bool) {
 		pvcName,
 		OpenEBSNamespace,
 	)
-	ok := false
-	if !expect_bound {
-		ok = IsPVCPendingConsistently(pvcName)
-	} else {
-		ok = IsPVCBoundEventually(pvcName)
-	}
-	gomega.Expect(ok).To(gomega.Equal(true),
-		"while checking the pvc status")
+	verifyPVCStatus(pvcName, expect_bound)
 
 	pvcObj, err = PVCClient.WithNamespace(OpenEBSNamespace).Get(pvcObj.Name, metav1.GetOptions{})
 	gomega.Expect(err).To(
@@ -323,7 +316,7 @@ func createAndVerifyPVC(expect_bound bool) {
 }
 
 // Verifies state of already created pvc based on expect_bound.
-func verifyPVC(pvc_name string, expect_bound bool) {
+func verifyPVCStatus(pvc_name string, expect_bound bool) {
 	ok := false
 	if !expect_bound {
 		ok = IsPVCPendingConsistently(pvc_name)
@@ -872,7 +865,6 @@ func cordonk8sNode() {
 				"Could not cordon node",
 			)
 		}
-
 	}
 }