Update

opendatahub-io · Feb 12, 2025 · 27cc5a2 · 27cc5a2
1 parent fda6430
commit 27cc5a2
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 63 deletions.
diff --git a/controllers/components/codeflare/codeflare_controller.go b/controllers/components/codeflare/codeflare_controller.go
@@ -63,9 +63,6 @@ func (s *componentHandler) NewComponentReconciler(ctx context.Context, mgr ctrl.
 			reconciler.WithPredicates(
 				component.ForLabel(labels.ODH.Component(LegacyComponentName), labels.True)),
 		).
-		// Detecting component status should be the first step as the
-		// subsequent action could fail for transient errors, but we
-		// should report the current component status if possible
 		WithAction(deployments.NewAction()).
 		WithAction(initialize).
 		WithAction(devFlags).

diff --git a/controllers/components/datasciencepipelines/datasciencepipelines_controller.go b/controllers/components/datasciencepipelines/datasciencepipelines_controller.go
@@ -61,11 +61,8 @@ func (s *componentHandler) NewComponentReconciler(ctx context.Context, mgr ctrl.
 			reconciler.WithPredicates(
 				component.ForLabel(labels.ODH.Component(LegacyComponentName), labels.True)),
 		).
-		// Detecting component status should be the first step as the
-		// subsequent action could fail for transient errors, but we
-		// should report the current component status if possible
-		WithAction(deployments.NewAction()).
 		WithAction(checkPreConditions).
+		WithAction(deployments.NewAction()).
 		WithAction(initialize).
 		WithAction(devFlags).
 		WithAction(releases.NewAction()).

diff --git a/controllers/components/feastoperator/feastoperator_controller.go b/controllers/components/feastoperator/feastoperator_controller.go
@@ -13,8 +13,8 @@ import (
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/controller/actions/deploy"
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/controller/actions/gc"
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/controller/actions/render/kustomize"
-	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/controller/actions/status/releases"
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/controller/actions/status/deployments"
+	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/controller/actions/status/releases"
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/controller/handlers"
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/controller/predicates/component"
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/controller/predicates/resources"
@@ -42,9 +42,9 @@ func (s *componentHandler) NewComponentReconciler(ctx context.Context, mgr ctrl.
 		).
 		// Add FeastOperator-specific actions
 		WithAction(deployments.NewAction()).
-		WithAction(releases.NewAction()).
 		WithAction(initialize).
 		WithAction(devFlags).
+		WithAction(releases.NewAction()).
 		WithAction(kustomize.NewAction(
 			kustomize.WithCache(),
 			kustomize.WithLabel(labels.ODH.Component(ComponentName), labels.True),

diff --git a/controllers/components/kserve/kserve_controller.go b/controllers/components/kserve/kserve_controller.go
@@ -149,13 +149,9 @@ func (s *componentHandler) NewComponentReconciler(ctx context.Context, mgr ctrl.
 			reconciler.WithPredicates(predicates.DefaultPredicate)).
 
 		// actions
-
-		// Detecting component status should be the first step as the
-		// subsequent action could fail for transient errors, but we
-		// should report the current component status if possible
+		WithAction(checkPreConditions).
 		WithAction(deployments.NewAction()).
 		WithAction(setStatusFields).
-		WithAction(checkPreConditions).
 		WithAction(initialize).
 		WithAction(devFlags).
 		WithAction(releases.NewAction()).

diff --git a/controllers/components/kueue/kueue_controller.go b/controllers/components/kueue/kueue_controller.go
@@ -81,12 +81,8 @@ func (s *componentHandler) NewComponentReconciler(ctx context.Context, mgr ctrl.
 			reconciler.WithPredicates(
 				component.ForLabel(labels.ODH.Component(LegacyComponentName), labels.True)),
 		).
-		// Detecting component status should be the first step as the
-		// subsequent action could fail for transient errors, but we
-		// should report the current component status if possible
+		WithAction(checkPreConditions).
 		WithAction(deployments.NewAction()).
-		// Add Kueue-specific actions
-		WithAction(checkPreConditions). // check if CRD multikueueconfigs/multikueueclusters with v1alpha1 exist in cluster and not in termination
 		WithAction(initialize).
 		WithAction(devFlags).
 		WithAction(releases.NewAction()).

diff --git a/controllers/components/kueue/kueue_controller_actions.go b/controllers/components/kueue/kueue_controller_actions.go
@@ -29,7 +29,7 @@ func checkPreConditions(ctx context.Context, rr *odhtypes.ReconciliationRequest)
 		return odherrors.NewStopError("failed to check %s CRDs version: %w", gvk.MultiKueueConfigV1Alpha1, err)
 	}
 
-	if rConfig || rCluster {
+	if !rConfig || !rCluster {
 		return odherrors.NewStopError(MultiKueueCRDMessage)
 	}
 

diff --git a/controllers/components/modelcontroller/modelcontroller_controller.go b/controllers/components/modelcontroller/modelcontroller_controller.go
@@ -66,12 +66,9 @@ func (s *componentHandler) NewComponentReconciler(ctx context.Context, mgr ctrl.
 			reconciler.WithPredicates(
 				component.ForLabel(labels.ODH.Component(LegacyComponentName), labels.True)),
 		).
-		// Detecting component status should be the first step as the
-		// subsequent action could fail for transient errors, but we
-		// should report the current component status if possible
 		WithAction(deployments.NewAction()).
 		WithAction(initialize).
-		WithAction(devFlags). // devFlags triggerd by changes in DSC kserve and ModelMeshServing, also update .status.devflagurl
+		WithAction(devFlags).
 		WithAction(kustomize.NewAction(
 			kustomize.WithCache(),
 			kustomize.WithLabel(labels.ODH.Component(LegacyComponentName), labels.True),

diff --git a/controllers/components/modelmeshserving/modelmeshserving_controller.go b/controllers/components/modelmeshserving/modelmeshserving_controller.go
@@ -83,9 +83,6 @@ func (s *componentHandler) NewComponentReconciler(ctx context.Context, mgr ctrl.
 				},
 			)),
 		).
-		// Detecting component status should be the first step as the
-		// subsequent action could fail for transient errors, but we
-		// should report the current component status if possible
 		WithAction(deployments.NewAction()).
 		WithAction(initialize).
 		WithAction(devFlags).

diff --git a/controllers/components/modelregistry/modelregistry_controller.go b/controllers/components/modelregistry/modelregistry_controller.go
@@ -80,13 +80,9 @@ func (s *componentHandler) NewComponentReconciler(ctx context.Context, mgr ctrl.
 		// namespaces that may not be known when the controller is started, hence
 		// it should be watched dynamically
 		WatchesGVK(gvk.ServiceMeshMember, reconciler.Dynamic()).
-		// Detecting component status should be the first step as the
-		// subsequent action could fail for transient errors, but we
-		// should report the current component status if possible
+		WithAction(checkPreConditions).
 		WithAction(deployments.NewAction()).
 		WithAction(updateStatus).
-		// past initial status computation
-		WithAction(checkPreConditions).
 		WithAction(initialize).
 		WithAction(releases.NewAction()).
 		WithAction(configureDependencies).

diff --git a/controllers/components/ray/ray_controller.go b/controllers/components/ray/ray_controller.go
@@ -58,9 +58,6 @@ func (s *componentHandler) NewComponentReconciler(ctx context.Context, mgr ctrl.
 			reconciler.WithPredicates(
 				component.ForLabel(labels.ODH.Component(LegacyComponentName), labels.True)),
 		).
-		// Detecting component status should be the first step as the
-		// subsequent action could fail for transient errors, but we
-		// should report the current component status if possible
 		WithAction(deployments.NewAction()).
 		WithAction(initialize).
 		WithAction(devFlags).

diff --git a/controllers/components/trainingoperator/trainingoperator_controller.go b/controllers/components/trainingoperator/trainingoperator_controller.go
@@ -55,9 +55,6 @@ func (s *componentHandler) NewComponentReconciler(ctx context.Context, mgr ctrl.
 			reconciler.WithPredicates(
 				component.ForLabel(labels.ODH.Component(LegacyComponentName), labels.True)),
 		).
-		// Detecting component status should be the first step as the
-		// subsequent action could fail for transient errors, but we
-		// should report the current component status if possible
 		WithAction(deployments.NewAction()).
 		WithAction(initialize).
 		WithAction(devFlags).

diff --git a/controllers/components/trustyai/trustyai_controller.go b/controllers/components/trustyai/trustyai_controller.go
@@ -65,11 +65,7 @@ func (s *componentHandler) NewComponentReconciler(ctx context.Context, mgr ctrl.
 				},
 			)),
 		).
-		// Add TrustyAI-specific actions
-		WithAction(checkPreConditions). // check if CRD isvc is there
-		// Detecting component status should be the first step as the
-		// subsequent action could fail for transient errors, but we
-		// should report the current component status if possible
+		WithAction(checkPreConditions).
 		WithAction(deployments.NewAction()).
 		WithAction(initialize).
 		WithAction(devFlags).

diff --git a/controllers/components/trustyai/trustyai_controller_actions.go b/controllers/components/trustyai/trustyai_controller_actions.go
@@ -20,9 +20,6 @@ import (
 	"context"
 	"fmt"
 
-	"k8s.io/apimachinery/pkg/api/meta"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
 	componentApi "github.com/opendatahub-io/opendatahub-operator/v2/apis/components/v1alpha1"
 	"github.com/opendatahub-io/opendatahub-operator/v2/controllers/status"
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/cluster"
@@ -33,23 +30,15 @@ import (
 )
 
 func checkPreConditions(ctx context.Context, rr *odhtypes.ReconciliationRequest) error {
-	t, ok := rr.Instance.(*componentApi.TrustyAI)
-	if !ok {
-		return fmt.Errorf("resource instance %v is not a componentApi.TrustyAI)", rr.Instance)
+	isvc, err := cluster.HasCRD(ctx, rr.Client, gvk.InferenceServices)
+	if err != nil {
+		return odherrors.NewStopError("failed to check %s CRDs version: %w", gvk.InferenceServices, err)
 	}
 
-	if err := cluster.CustomResourceDefinitionExists(ctx, rr.Client, gvk.InferenceServices.GroupKind()); err != nil {
-		s := t.GetStatus()
-		s.Phase = status.PhaseNotReady
-		meta.SetStatusCondition(&s.Conditions, metav1.Condition{
-			Type:               status.ConditionTypeReady,
-			Status:             metav1.ConditionFalse,
-			Reason:             status.ISVCMissingCRDReason,
-			Message:            status.ISVCMissingCRDMessage,
-			ObservedGeneration: s.ObservedGeneration,
-		})
-		return odherrors.NewStopError("failed to find InferenceService CRD: %v", err)
+	if !isvc {
+		return odherrors.NewStopError(status.ISVCMissingCRDMessage)
 	}
+
 	return nil
 }
 

diff --git a/controllers/components/workbenches/workbenches_controller.go b/controllers/components/workbenches/workbenches_controller.go
@@ -61,9 +61,6 @@ func (s *componentHandler) NewComponentReconciler(ctx context.Context, mgr ctrl.
 			reconciler.WithPredicates(
 				component.ForLabel(labels.ODH.Component(LegacyComponentName), labels.True)),
 		).
-		// Detecting component status should be the first step as the
-		// subsequent action could fail for transient errors, but we
-		// should report the current component status if possible
 		WithAction(deployments.NewAction()).
 		WithAction(initialize).
 		WithAction(devFlags).