PTEUDO-1989 - Fix migration trigger check. (#369)

infobloxopen · Dec 3, 2024 · 01bf173 · 01bf173
1 parent afdf6b5
commit 01bf173
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/pkg/databaseclaim/databaseclaim.go b/pkg/databaseclaim/databaseclaim.go
@@ -461,7 +461,7 @@ func (r *DatabaseClaimReconciler) reconcileUseExistingDB(ctx context.Context, re
 
 	err = r.manageUserAndExtensions(ctx, reqInfo, logr, dbClient, &dbClaim.Status.NewDB, dbName, dbClaim.Spec.Username, operationalMode)
 	if err != nil {
-		logr.Error(err, "unable to update users, user credents not persisted to status object")
+		logr.Error(err, "unable to update users, user credentials not persisted to status object")
 		return err
 	}
 	if err = r.updateClientStatus(ctx, dbClaim); err != nil {

diff --git a/pkg/hostparams/hostparams.go b/pkg/hostparams/hostparams.go
@@ -144,11 +144,10 @@ func New(config *viper.Viper, dbClaim *v1.DatabaseClaim) (*HostParams, error) {
 	}
 
 	if hostParams.DBVersion == "" {
-		if dbClaim.Status.ActiveDB.DBVersion != "" {
-			//for an existing (Status.ActiveDB NOT empty) it picks up the Status DBVersion, so no update is triggered.
+		if dbClaim.Spec.UseExistingSource != nil && *dbClaim.Spec.UseExistingSource {
 			hostParams.DBVersion = dbClaim.Status.ActiveDB.DBVersion
-		} else {
-			//for a new Claim (Status.ActiveDB empty) it assumes 15 only
+		}
+		if hostParams.DBVersion == "" {
 			hostParams.IsDefaultVersion = true
 			hostParams.DBVersion = defaultMajorVersion
 		}