Remove annotations arg from GetMongoDBVersion

Author: m1kola

api/v1/mongodbcommunity_types.go

@@ -1114,15 +1114,15 @@ func (m *MongoDBCommunity) CurrentArbiters() int {
 	return m.Status.CurrentStatefulSetArbitersReplicas
 }
 
-func (m *MongoDBCommunity) GetMongoDBVersion(map[string]string) string {
+func (m *MongoDBCommunity) GetMongoDBVersion() string {
 	return m.Spec.Version
 }
 
 // GetMongoDBVersionForAnnotation returns the MDB version used to annotate the object.
 // Here it's the same as GetMongoDBVersion, but a different name is used in order to make
 // the usage clearer in enterprise (where it's a method of OpsManager but is used for the AppDB)
 func (m *MongoDBCommunity) GetMongoDBVersionForAnnotation() string {
-	return m.GetMongoDBVersion(nil)
+	return m.GetMongoDBVersion()
 }
 
 func (m *MongoDBCommunity) StatefulSetReplicasThisReconciliation() int {

controllers/construct/mongodbstatefulset.go

@@ -2,11 +2,12 @@ package construct
 
 import (
 	"fmt"
-	"github.com/mongodb/mongodb-kubernetes-operator/pkg/readiness/config"
 	"os"
 	"strconv"
 	"strings"
 
+	"github.com/mongodb/mongodb-kubernetes-operator/pkg/readiness/config"
+
 	"github.com/mongodb/mongodb-kubernetes-operator/pkg/util/envvar"
 
 	"github.com/mongodb/mongodb-kubernetes-operator/pkg/automationconfig"
@@ -93,7 +94,7 @@ type MongoDBStatefulSetOwner interface {
 	// GetNamespace returns the namespace the resource is defined in.
 	GetNamespace() string
 	// GetMongoDBVersion returns the version of MongoDB to be used for this resource.
-	GetMongoDBVersion(annotations map[string]string) string
+	GetMongoDBVersion() string
 	// AutomationConfigSecretName returns the name of the secret which will contain the automation config.
 	AutomationConfigSecretName() string
 	// GetUpdateStrategyType returns the UpdateStrategyType of the statefulset.
@@ -243,7 +244,7 @@ func BuildMongoDBReplicaSetStatefulSetModificationFunction(mdb MongoDBStatefulSe
 				podtemplatespec.WithVolume(keyFileVolume),
 				podtemplatespec.WithServiceAccount(mongodbDatabaseServiceAccountName),
 				podtemplatespec.WithContainer(AgentName, mongodbAgentContainer(mdb.AutomationConfigSecretName(), mongodbAgentVolumeMounts, agentLogLevel, agentLogFile, agentMaxLogFileDurationHours, agentImage)),
-				podtemplatespec.WithContainer(MongodbName, mongodbContainer(mdb.GetMongoDBVersion(nil), mongodVolumeMounts, mdb.GetMongodConfiguration())),
+				podtemplatespec.WithContainer(MongodbName, mongodbContainer(mdb.GetMongoDBVersion(), mongodVolumeMounts, mdb.GetMongodConfiguration())),
 				upgradeInitContainer,
 				readinessInitContainer,
 			),

controllers/replica_set_controller.go

@@ -212,7 +212,7 @@ func (r ReplicaSetReconciler) Reconcile(ctx context.Context, request reconcile.R
 		withMongoDBArbiters(mdb.AutomationConfigArbitersThisReconciliation()).
 		withMessage(None, "").
 		withRunningPhase().
-		withVersion(mdb.GetMongoDBVersion(nil)))
+		withVersion(mdb.GetMongoDBVersion()))
 	if err != nil {
 		r.log.Errorf("Error updating the status of the MongoDB resource: %s", err)
 		return res, err

test/e2e/mongodbtests/mongodbtests.go

@@ -503,7 +503,7 @@ func BasicFunctionality(ctx context.Context, mdb *mdbv1.MongoDBCommunity, skipSt
 			t.Run("Test Status Was Updated", Status(ctx, mdb, mdbv1.MongoDBCommunityStatus{
 				MongoURI:                   mdb.MongoURI(""),
 				Phase:                      mdbv1.Running,
-				Version:                    mdb.GetMongoDBVersion(nil),
+				Version:                    mdb.GetMongoDBVersion(),
 				CurrentMongoDBMembers:      mdb.Spec.Members,
 				CurrentStatefulSetReplicas: mdb.Spec.Members,
 			}))

test/e2e/replica_set_recovery/replica_set_recovery_test.go

@@ -59,7 +59,7 @@ func TestReplicaSetRecovery(t *testing.T) {
 		t.Run("Test Status Was Updated", mongodbtests.Status(ctx, &mdb, mdbv1.MongoDBCommunityStatus{
 			MongoURI:                   mdb.MongoURI(""),
 			Phase:                      mdbv1.Running,
-			Version:                    mdb.GetMongoDBVersion(nil),
+			Version:                    mdb.GetMongoDBVersion(),
 			CurrentMongoDBMembers:      3,
 			CurrentStatefulSetReplicas: 3,
 		}))

test/e2e/replica_set_scale/replica_set_scaling_test.go

@@ -54,7 +54,7 @@ func TestReplicaSetScaleUp(t *testing.T) {
 		t.Run("Test Status Was Updated", mongodbtests.Status(ctx, &mdb, mdbv1.MongoDBCommunityStatus{
 			MongoURI:                   mdb.MongoURI(""),
 			Phase:                      mdbv1.Running,
-			Version:                    mdb.GetMongoDBVersion(nil),
+			Version:                    mdb.GetMongoDBVersion(),
 			CurrentMongoDBMembers:      5,
 			CurrentStatefulSetReplicas: 5,
 		}))

test/e2e/replica_set_scale_down/replica_set_scale_down_test.go

@@ -57,7 +57,7 @@ func TestReplicaSetScaleDown(t *testing.T) {
 		t.Run("Test Status Was Updated", mongodbtests.Status(ctx, &mdb, mdbv1.MongoDBCommunityStatus{
 			MongoURI:                   mdb.MongoURI(""),
 			Phase:                      mdbv1.Running,
-			Version:                    mdb.GetMongoDBVersion(nil),
+			Version:                    mdb.GetMongoDBVersion(),
 			CurrentMongoDBMembers:      1,
 			CurrentStatefulSetReplicas: 1,
 		}))

test/e2e/statefulset_delete/statefulset_delete_test.go

@@ -42,7 +42,7 @@ func TestStatefulSetDelete(t *testing.T) {
 		t.Run("Test Status Was Updated", mongodbtests.Status(ctx, &mdb, mdbv1.MongoDBCommunityStatus{
 			MongoURI:              mdb.MongoURI(""),
 			Phase:                 mdbv1.Running,
-			Version:               mdb.GetMongoDBVersion(nil),
+			Version:               mdb.GetMongoDBVersion(),
 			CurrentMongoDBMembers: mdb.DesiredReplicas(),
 		}))
 	})