Fix e2e test

storageos · Jan 19, 2021 · 3eebcb1 · 3eebcb1
1 parent 2bfb5cf
commit 3eebcb1
Showing 1 changed file with 3 additions and 17 deletions.
diff --git a/test/e2e/clusterCSINodeV2_test.go b/test/e2e/clusterCSINodeV2_test.go
@@ -4,7 +4,6 @@ package e2e
 
 import (
 	"context"
-	"strings"
 	"testing"
 
 	framework "github.com/operator-framework/operator-sdk/pkg/test"
@@ -78,23 +77,10 @@ func TestClusterCSINodeV2(t *testing.T) {
 		t.Fatalf("failed to get storageos-daemonset: %v", err)
 	}
 
-	info, err := f.KubeClient.Discovery().ServerVersion()
-	if err != nil {
-		t.Fatalf("failed to get version info: %v", err)
-	}
-
-	version := strings.TrimLeft(info.String(), "v")
-
+	//Check the number of containers in daemonset pod spec.
 	t.Run("CSIHelperCountTest", func(t *testing.T) {
-		//Check the number of containers in daemonset pod spec.
-		if deploy.CSIV1Supported(version) {
-			if len(daemonset.Spec.Template.Spec.Containers) != 3 {
-				t.Errorf("unexpected number of daemonset pod containers:\n\t(GOT) %d\n\t(WNT) %d", len(daemonset.Spec.Template.Spec.Containers), 3)
-			}
-		} else {
-			if len(daemonset.Spec.Template.Spec.Containers) != 2 {
-				t.Errorf("unexpected number of daemonset pod containers:\n\t(GOT) %d\n\t(WNT) %d", len(daemonset.Spec.Template.Spec.Containers), 2)
-			}
+		if len(daemonset.Spec.Template.Spec.Containers) != 3 {
+			t.Errorf("unexpected number of daemonset pod containers:\n\t(GOT) %d\n\t(WNT) %d", len(daemonset.Spec.Template.Spec.Containers), 3)
 		}
 	})