fix: not data release version in DSCI and DSC for upgrade case

Signed-off-by: Wen Zhou <[email protected]>
opendatahub-io · Oct 9, 2024 · e9feaf9 · e9feaf9
1 parent 6134496
commit e9feaf9
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/controllers/datasciencecluster/datasciencecluster_controller.go b/controllers/datasciencecluster/datasciencecluster_controller.go
@@ -237,6 +237,16 @@ func (r *DataScienceClusterReconciler) Reconcile(ctx context.Context, req ctrl.R
 			return ctrl.Result{}, err
 		}
 	}
+	// upgrade case to update release version in status
+	if instance.Status.Release.Version.Equals(currentOperatorRelease.Version.Version) {
+		instance, err = status.UpdateWithRetry(ctx, r.Client, instance, func(saved *dscv1.DataScienceCluster) {
+			saved.Status.Release = currentOperatorRelease
+		})
+		if err != nil {
+			_ = r.reportError(err, instance, fmt.Sprintf("failed to update release version for DataScienceCluster resource %s", req.Name))
+			return ctrl.Result{}, err
+		}
+	}
 
 	// Initialize error list, instead of returning errors after every component is deployed
 	var componentErrors *multierror.Error

diff --git a/controllers/dscinitialization/dscinitialization_controller.go b/controllers/dscinitialization/dscinitialization_controller.go
@@ -151,6 +151,19 @@ func (r *DSCInitializationReconciler) Reconcile(ctx context.Context, req ctrl.Re
 			return reconcile.Result{}, err
 		}
 	}
+	// upgrade case to update release version in status
+	if instance.Status.Release.Version.Equals(currentOperatorRelease.Version.Version) {
+		message := "Updating DSCInitialization status"
+		instance, err := status.UpdateWithRetry(ctx, r.Client, instance, func(saved *dsciv1.DSCInitialization) {
+			saved.Status.Release = currentOperatorRelease
+		})
+		if err != nil {
+			r.Log.Error(err, "Failed to update release version for DSCInitialization resource.", "DSCInitialization", req.Namespace, "Request.Name", req.Name)
+			r.Recorder.Eventf(instance, corev1.EventTypeWarning, "DSCInitializationReconcileError",
+				"%s for instance %s", message, instance.Name)
+			return reconcile.Result{}, err
+		}
+	}
 
 	// Check namespace is not exist, then create
 	namespace := instance.Spec.ApplicationsNamespace