Update condition to avoid upgrade on reoncile

red-hat-data-services · Apr 17, 2024 · b98201c · b98201c
1 parent 5760b2a
commit b98201c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/controllers/datasciencecluster/datasciencecluster_controller.go b/controllers/datasciencecluster/datasciencecluster_controller.go
@@ -214,7 +214,7 @@ func (r *DataScienceClusterReconciler) Reconcile(ctx context.Context, req ctrl.R
 		return ctrl.Result{}, nil
 	}
 	// Check preconditions if this is an upgrade
-	if instance.Status.Phase == status.PhaseReady {
+	if instance.Status.Phase == status.PhaseReady || instance.Status.Phase == status.PhaseError {
 		// Check for existence of Argo Workflows if DSP is
 		if instance.Spec.Components.DataSciencePipelines.ManagementState == v1.Managed {
 			if err := datasciencepipelines.UnmanagedArgoWorkFlowExists(ctx, r.Client); err != nil {

diff --git a/get_all_manifests.sh b/get_all_manifests.sh
@@ -8,18 +8,18 @@ MANIFEST_ORG="red-hat-data-services"
 # component: notebook, dsp, kserve, dashbaord, cf/ray, trustyai, modelmesh.
 # in the format of "repo-org:repo-name:branch-name:source-folder:target-folder".
 declare -A COMPONENT_MANIFESTS=(
-    ["codeflare"]="red-hat-data-services:codeflare-operator:rhoai-2.8:config:codeflare"
-    ["ray"]="red-hat-data-services:kuberay:rhoai-2.8:ray-operator/config:ray"
-    ["kueue"]="red-hat-data-services:kueue:rhoai-2.8:config:kueue"
-    ["data-science-pipelines-operator"]="red-hat-data-services:data-science-pipelines-operator:rhoai-2.8:config:data-science-pipelines-operator"
-    ["kf-notebook-controller"]="red-hat-data-services:kubeflow:rhoai-2.8:components/notebook-controller/config:odh-notebook-controller/kf-notebook-controller"
-    ["odh-notebook-controller"]="red-hat-data-services:kubeflow:rhoai-2.8:components/odh-notebook-controller/config:odh-notebook-controller/odh-notebook-controller"
-    ["notebooks"]="red-hat-data-services:notebooks:rhoai-2.8:manifests:/jupyterhub/notebooks"
-    ["trustyai"]="red-hat-data-services:trustyai-service-operator:rhoai-2.8:config:trustyai-service-operator"
-    ["model-mesh"]="red-hat-data-services:modelmesh-serving:rhoai-2.8:config:model-mesh"
-    ["odh-model-controller"]="red-hat-data-services:odh-model-controller:rhoai-2.8:config:odh-model-controller"
-    ["kserve"]="red-hat-data-services:kserve:rhoai-2.8:config:kserve"
-    ["odh-dashboard"]="red-hat-data-services:odh-dashboard:rhoai-2.8:manifests:dashboard"
+    ["codeflare"]="red-hat-data-services:codeflare-operator:rhoai-2.9:config:codeflare"
+    ["ray"]="red-hat-data-services:kuberay:rhoai-2.9:ray-operator/config:ray"
+    ["kueue"]="red-hat-data-services:kueue:rhoai-2.9:config:kueue"
+    ["data-science-pipelines-operator"]="red-hat-data-services:data-science-pipelines-operator:rhoai-2.9:config:data-science-pipelines-operator"
+    ["kf-notebook-controller"]="red-hat-data-services:kubeflow:rhoai-2.9:components/notebook-controller/config:odh-notebook-controller/kf-notebook-controller"
+    ["odh-notebook-controller"]="red-hat-data-services:kubeflow:rhoai-2.9:components/odh-notebook-controller/config:odh-notebook-controller/odh-notebook-controller"
+    ["notebooks"]="red-hat-data-services:notebooks:rhoai-2.9:manifests:/jupyterhub/notebooks"
+    ["trustyai"]="red-hat-data-services:trustyai-service-operator:rhoai-2.9:config:trustyai-service-operator"
+    ["model-mesh"]="red-hat-data-services:modelmesh-serving:rhoai-2.9:config:model-mesh"
+    ["odh-model-controller"]="red-hat-data-services:odh-model-controller:rhoai-2.9:config:odh-model-controller"
+    ["kserve"]="red-hat-data-services:kserve:rhoai-2.9:config:kserve"
+    ["odh-dashboard"]="red-hat-data-services:odh-dashboard:rhoai-2.9:manifests:dashboard"
 )
 
 # Allow overwriting repo using flags component=repo