Merge pull request #2619 from Nikhil-Ladha/fix-sc-version

Fix storagecluster version in odfinfoconfig unit test
red-hat-storage · May 20, 2024 · c92a7d9 · c92a7d9
2 parents ec44394 + 88bfcf0
commit c92a7d9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/controllers/storagecluster/initialization_reconciler_test.go b/controllers/storagecluster/initialization_reconciler_test.go
@@ -3,12 +3,13 @@ package storagecluster
 import (
 	"context"
 	"fmt"
+	"os"
+	"testing"
+
 	"github.com/blang/semver/v4"
 	oprverion "github.com/operator-framework/api/pkg/lib/version"
 	opv1a1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
 	ocsversion "github.com/red-hat-storage/ocs-operator/v4/version"
-	"os"
-	"testing"
 
 	"github.com/imdario/mergo"
 	nbv1 "github.com/noobaa/noobaa-operator/v5/pkg/apis/noobaa/v1alpha1"
@@ -355,7 +356,7 @@ func createFakeInitializationStorageClusterReconciler(t *testing.T, obj ...runti
 			Phase: cephv1.ConditionType(util.PhaseReady),
 		},
 	}
-	verOcs, err := semver.Make(getSemVer(ocsversion.Version, 1, true))
+	verOcs, err := semver.Make(ocsversion.Version)
 	if err != nil {
 		panic(err)
 	}

diff --git a/controllers/storagecluster/odfinfoconfig_test.go b/controllers/storagecluster/odfinfoconfig_test.go
@@ -1,13 +1,15 @@
 package storagecluster
 
 import (
+	"os"
+	"testing"
+
 	"github.com/red-hat-storage/ocs-operator/api/v4/v1alpha1"
 	"github.com/red-hat-storage/ocs-operator/v4/controllers/util"
+	ocsversion "github.com/red-hat-storage/ocs-operator/v4/version"
 	"k8s.io/apimachinery/pkg/types"
-	"os"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/yaml"
-	"testing"
 
 	api "github.com/red-hat-storage/ocs-operator/api/v4/v1"
 	"gotest.tools/v3/assert"
@@ -38,7 +40,7 @@ func TestOdfInfoConfig(t *testing.T) {
 				Kind:       "StorageSystem",
 				APIVersion: "v1",
 			},
-			ocsVersion:                   "3.16.0",
+			ocsVersion:                   ocsversion.Version,
 			deploymentType:               odfDeploymentTypeInternal,
 			storageClusterNamespacedName: types.NamespacedName{Name: "storage-test", Namespace: namespace},
 			cephClusterFSID:              cephFSID,
@@ -52,7 +54,7 @@ func TestOdfInfoConfig(t *testing.T) {
 				Kind:       "StorageSystem",
 				APIVersion: "v1",
 			},
-			ocsVersion:                   "3.16.0",
+			ocsVersion:                   ocsversion.Version,
 			deploymentType:               odfDeploymentTypeInternal,
 			storageClusterNamespacedName: types.NamespacedName{Name: "storage-test", Namespace: namespace},
 			cephClusterFSID:              cephFSID,

diff --git a/controllers/storagecluster/storagecluster_controller_test.go b/controllers/storagecluster/storagecluster_controller_test.go
@@ -3,14 +3,15 @@ package storagecluster
 import (
 	"context"
 	"fmt"
-	opverion "github.com/operator-framework/api/pkg/lib/version"
-	opv1a1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
-	ocsversion "github.com/red-hat-storage/ocs-operator/v4/version"
 	"net"
 	"os"
 	"regexp"
 	"testing"
 
+	opverion "github.com/operator-framework/api/pkg/lib/version"
+	opv1a1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
+	ocsversion "github.com/red-hat-storage/ocs-operator/v4/version"
+
 	"github.com/blang/semver/v4"
 	snapapi "github.com/kubernetes-csi/external-snapshotter/client/v7/apis/volumesnapshot/v1"
 	nbv1 "github.com/noobaa/noobaa-operator/v5/pkg/apis/noobaa/v1alpha1"
@@ -1128,7 +1129,7 @@ func createFakeStorageClusterReconciler(t *testing.T, obj ...runtime.Object) Sto
 			Phase: rookCephv1.ConditionType(statusutil.PhaseReady),
 		},
 	}
-	verOcs, err := semver.Make(getSemVer(ocsversion.Version, 1, true))
+	verOcs, err := semver.Make(ocsversion.Version)
 	if err != nil {
 		panic(fmt.Sprintf("failed to parse version: %v", err))
 	}