feat: re-enable TrustyAI in downstream but set to removed (T.P)

Revert "Remove Trustyai installation in downstream"
set version to 2.11.0

This reverts commit 9392209.

Signed-off-by: Wen Zhou <[email protected]>

Makefile

@@ -3,7 +3,7 @@
 # To re-generate a bundle for another specific version without changing the standard setup, you can:
 # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
 # - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
-VERSION ?= 2.9.0
+VERSION ?= 2.11.0
 # IMAGE_TAG_BASE defines the opendatahub.io namespace and part of the image name for remote images.
 # This variable is used to construct full image tags for bundle and catalog images.
 #

bundle/manifests/rhods-operator.clusterserviceversion.yaml

@@ -52,6 +52,9 @@ metadata:
               "trainingoperator": {
                 "managementState": "Removed"
               },
+              "trustyai": {
+                "managementState": "Removed"
+              },
               "workbenches": {
                 "managementState": "Managed"
               }
@@ -157,14 +160,17 @@ metadata:
             "trainingoperator": {
               "managementState": "Removed"
             },
+            "trustyai": {
+              "managementState": "Removed"
+            }
           }
         }
       }
     operators.operatorframework.io/builder: operator-sdk-v1.24.1
     operators.operatorframework.io/internal-objects: '[dscinitialization.opendatahub.io]'
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/red-hat-data-services/rhods-operator
-  name: rhods-operator.v2.9.0
+  name: rhods-operator.v2.11.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -238,6 +244,7 @@ spec:
     * Ability to use other runtimes for serving
     * Model Monitoring
     * Distributed workloads (KubeRay, CodeFlare, Kueue, Training Operator)
+    * XAI explanations of predictive models (TrustyAI)
   displayName: Red Hat OpenShift AI
   icon:
   - base64data: <?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 27.4.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
<svg version="1.1" id="Logos" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
	 viewBox="0 0 835.9 244" style="enable-background:new 0 0 835.9 244;" xml:space="preserve">
<style type="text/css">
	.st0{fill:#FFFFFF;}
	.st1{fill:#EE0000;}
</style>
<g>
	<g>
		<path d="M301.3,183.1c0,5.2-1,10.1-3,14.7c-2,4.6-4.7,8.6-8.1,12c-3.4,3.4-7.4,6-12.1,8c-4.6,1.9-9.6,2.9-14.9,2.9
			c-5.3,0-10.2-1-14.9-2.9c-4.6-1.9-8.7-4.6-12-8c-3.4-3.4-6-7.3-8-12c-2-4.6-3-9.5-3-14.7c0-5.2,1-10.1,3-14.7c2-4.6,4.6-8.6,8-12
			c3.4-3.4,7.4-6,12-8c4.6-1.9,9.6-2.9,14.9-2.9c5.3,0,10.2,1,14.9,2.9c4.6,1.9,8.7,4.6,12.1,8c3.4,3.4,6.1,7.4,8.1,12
			C300.4,173,301.3,177.9,301.3,183.1z M290.2,183.1c0-3.9-0.7-7.5-2.1-10.9c-1.4-3.4-3.3-6.3-5.7-8.7c-2.4-2.5-5.2-4.4-8.5-5.8
			c-3.3-1.4-6.8-2.1-10.6-2.1s-7.2,0.7-10.5,2.1c-3.3,1.4-6.1,3.3-8.5,5.8c-2.4,2.5-4.3,5.4-5.7,8.7c-1.4,3.4-2.1,7-2.1,10.9
			c0,3.9,0.7,7.5,2.1,10.9c1.4,3.4,3.3,6.3,5.7,8.7c2.4,2.4,5.2,4.4,8.5,5.8c3.3,1.4,6.8,2.1,10.5,2.1s7.3-0.7,10.6-2.1
			c3.3-1.4,6.1-3.3,8.5-5.8c2.4-2.4,4.3-5.3,5.7-8.7C289.5,190.6,290.2,187,290.2,183.1z"/>
		<path d="M311.6,241.1v-74.5h10.3v5c2.2-1.9,4.7-3.3,7.5-4.3c2.8-1,5.7-1.5,8.7-1.5c3.7,0,7.2,0.7,10.5,2.1
			c3.3,1.4,6.1,3.4,8.5,5.8c2.4,2.5,4.3,5.4,5.7,8.7c1.4,3.3,2.1,6.9,2.1,10.6c0,3.8-0.7,7.4-2.1,10.7c-1.4,3.3-3.3,6.2-5.7,8.7
			c-2.4,2.5-5.3,4.4-8.6,5.8c-3.3,1.4-6.9,2.1-10.7,2.1c-3,0-5.8-0.5-8.5-1.4c-2.7-0.9-5.1-2.2-7.3-3.8v25.9H311.6z M336.7,174.8
			c-3.1,0-5.8,0.6-8.3,1.7c-2.5,1.1-4.6,2.6-6.3,4.6v24.1c1.7,1.9,3.8,3.4,6.3,4.5c2.6,1.1,5.3,1.7,8.3,1.7c5.1,0,9.4-1.8,12.8-5.3
			c3.4-3.5,5.1-7.8,5.1-12.9c0-5.2-1.8-9.6-5.3-13.1C345.9,176.6,341.7,174.8,336.7,174.8z"/>
		<path d="M372.4,193c0-3.7,0.7-7.3,2-10.6c1.4-3.3,3.2-6.2,5.6-8.7c2.4-2.5,5.2-4.4,8.4-5.8c3.2-1.4,6.7-2.1,10.5-2.1
			c3.6,0,7,0.7,10.1,2.1c3.2,1.4,5.9,3.4,8.1,5.8c2.3,2.5,4,5.4,5.4,8.8c1.3,3.4,2,7,2,10.9v3h-41.8c0.7,4.4,2.7,8,6,10.9
			c3.3,2.9,7.3,4.3,11.9,4.3c2.6,0,5-0.4,7.4-1.2c2.4-0.8,4.4-2,6-3.4l6.7,6.6c-3.1,2.4-6.3,4.2-9.6,5.3c-3.3,1.1-6.9,1.7-10.9,1.7
			c-3.9,0-7.5-0.7-10.9-2.1c-3.4-1.4-6.3-3.3-8.8-5.8c-2.5-2.4-4.5-5.3-5.9-8.7C373.1,200.5,372.4,196.9,372.4,193z M398.7,174.5
			c-4,0-7.5,1.3-10.4,4c-2.9,2.6-4.8,6-5.5,10.2h31.4c-0.7-4-2.5-7.4-5.4-10.1C405.9,175.9,402.5,174.5,398.7,174.5z"/>
		<path d="M434.3,219.5v-52.9h10.4v5.3c2.1-2.1,4.5-3.7,7.1-4.7c2.7-1.1,5.6-1.6,8.8-1.6c6,0,11,1.9,14.8,5.8
			c3.8,3.9,5.8,8.8,5.8,14.9v33.3h-10.3V188c0-4.1-1.2-7.3-3.5-9.8c-2.4-2.4-5.6-3.6-9.7-3.6c-2.8,0-5.3,0.6-7.5,1.8
			c-2.2,1.2-4.1,2.9-5.5,5.1v38.1H434.3z"/>
		<path d="M488,207.5l6.7-7.7c3.9,3.8,7.9,6.7,12,8.6c4.1,1.9,8.5,2.9,13.1,2.9c5.3,0,9.5-1.1,12.8-3.4c3.3-2.3,4.9-5.2,4.9-8.7
			c0-3.2-1.1-5.7-3.3-7.4c-2.2-1.8-6-3.1-11.4-4l-12.2-2c-6.7-1.1-11.7-3.3-15-6.4c-3.3-3.2-4.9-7.3-4.9-12.5
			c0-6.2,2.4-11.3,7.3-15.1c4.9-3.8,11.4-5.8,19.5-5.8c5.1,0,10.3,0.8,15.4,2.5c5.1,1.7,9.8,4.1,13.9,7.3l-6,8.3
			c-4-3-7.9-5.2-11.9-6.7c-4-1.5-8-2.2-11.9-2.2c-4.7,0-8.5,1-11.4,3c-2.9,2-4.4,4.6-4.4,7.8c0,2.9,1,5.2,3,6.8
			c2,1.6,5.3,2.8,10,3.5l11.8,1.9c7.7,1.2,13.3,3.5,17,6.8c3.6,3.3,5.4,7.7,5.4,13.4c0,3.3-0.7,6.4-2.1,9.1
			c-1.4,2.7-3.3,5.1-5.9,7.1c-2.5,2-5.6,3.5-9.2,4.6c-3.6,1.1-7.6,1.6-11.9,1.6c-5.8,0-11.4-1.1-16.8-3.4
			C497,214.9,492.2,211.6,488,207.5z"/>
		<path d="M567.4,144.5v75.1H557v-72.8L567.4,144.5z M557,219.5v-52.9h10.4v5.3c2.1-2.1,4.5-3.7,7.1-4.7c2.7-1.1,5.6-1.6,8.8-1.6
			c6,0,11,1.9,14.8,5.8c3.8,3.9,5.8,8.8,5.8,14.9v33.3h-10.3V188c0-4.1-1.2-7.3-3.5-9.8c-2.4-2.4-5.6-3.6-9.7-3.6
			c-2.8,0-5.3,0.6-7.5,1.8c-2.2,1.2-4.1,2.9-5.5,5.1v38.1H557z"/>
		<path d="M621.1,158.1c-1.7,0-3.2-0.6-4.5-1.9c-1.3-1.3-1.9-2.8-1.9-4.5c0-1.7,0.6-3.2,1.9-4.5c1.3-1.3,2.8-1.9,4.5-1.9
			c1.7,0,3.2,0.6,4.5,1.9c1.2,1.3,1.9,2.8,1.9,4.5c0,1.7-0.6,3.2-1.9,4.5C624.4,157.4,622.9,158.1,621.1,158.1z M626.3,166.6v52.9
			h-10.4v-52.9H626.3z"/>
		<path d="M634.1,166.6h12.3v-8c0-5.3,1.5-9.5,4.6-12.5c3-3,7.5-4.5,13.4-4.5c1.3,0,2.6,0.1,3.9,0.3c1.3,0.2,2.5,0.4,3.6,0.7v9
			c-1.2-0.3-2.3-0.6-3.2-0.7c-1-0.1-2.1-0.2-3.3-0.2c-2.9,0-5.1,0.7-6.5,2c-1.4,1.3-2.1,3.4-2.1,6.2v7.8h15.2v8.7h-15.2v44.2h-10.3
			v-44.2h-12.3V166.6z"/>
		<path d="M687.7,206.4v-31.1h-11.2v-8.7h11.2v-13.5l10.3-2.5v16h15.6v8.7H698V204c0,2.7,0.6,4.6,1.8,5.7c1.2,1.1,3.2,1.7,6,1.7
			c1.5,0,2.8-0.1,4-0.3c1.1-0.2,2.3-0.5,3.6-1v8.7c-1.5,0.5-3.1,0.9-4.9,1.1c-1.8,0.3-3.5,0.4-5,0.4c-5.1,0-9-1.2-11.8-3.6
			S687.7,211,687.7,206.4z"/>
		<path d="M737,219.5l30.2-72.8h12.8l29.7,72.8h-11.9l-8.4-21.3h-32.6l-8.5,21.3H737z M760.5,189.2h25.4l-12.7-31.9L760.5,189.2z"/>
		<path d="M817.2,219.5v-72.8h10.9v72.8H817.2z"/>
	</g>
	<g>
		<g>
			<path class="st1" d="M129,85c12.5,0,30.6-2.6,30.6-17.5c0-1.2,0-2.3-0.3-3.4l-7.4-32.4c-1.7-7.1-3.2-10.3-15.7-16.6
				C126.4,10.2,105.3,2,99,2c-5.8,0-7.5,7.5-14.4,7.5c-6.7,0-11.6-5.6-17.9-5.6c-6,0-9.9,4.1-12.9,12.5c0,0-8.4,23.7-9.5,27.2
				C44,44.3,44,45,44,45.5C44,54.8,80.3,85,129,85 M161.5,73.6c1.7,8.2,1.7,9.1,1.7,10.1c0,14-15.7,21.8-36.4,21.8
				C80,105.5,39.1,78.1,39.1,60c0-2.8,0.6-5.4,1.5-7.3C23.8,53.5,2,56.5,2,75.7C2,107.2,76.6,146,135.7,146
				c45.3,0,56.7-20.5,56.7-36.6C192.3,96.6,181.4,82.2,161.5,73.6"/>
			<path d="M161.5,73.6c1.7,8.2,1.7,9.1,1.7,10.1c0,14-15.7,21.8-36.4,21.8C80,105.5,39.1,78.1,39.1,60c0-2.8,0.6-5.4,1.5-7.3
				l3.7-9.1C44,44.3,44,45,44,45.5C44,54.8,80.3,85,129,85c12.5,0,30.6-2.6,30.6-17.5c0-1.2,0-2.3-0.3-3.4L161.5,73.6z"/>
		</g>
		<path d="M581.2,94.3c0,11.9,7.2,17.7,20.2,17.7c3.2,0,8.6-0.7,11.9-1.7V96.5c-2.8,0.8-4.9,1.2-7.7,1.2c-5.4,0-7.4-1.7-7.4-6.7
			V69.8h15.6V55.6h-15.6v-18l-17,3.7v14.3H570v14.2h11.3V94.3z M528.3,94.6c0-3.7,3.7-5.5,9.3-5.5c3.7,0,7,0.5,10.1,1.3v7.2
			c-3.2,1.8-6.8,2.6-10.6,2.6C531.6,100.2,528.3,98.1,528.3,94.6 M533.5,112.2c6,0,10.8-1.3,15.4-4.3v3.4h16.8V75.6
			c0-13.6-9.1-21-24.4-21c-8.5,0-16.9,2-26,6.1l6.1,12.5c6.5-2.7,12-4.4,16.8-4.4c7,0,10.6,2.7,10.6,8.3v2.7
			c-4-1.1-8.2-1.6-12.6-1.6c-14.3,0-22.9,6-22.9,16.7C513.3,104.7,521.1,112.2,533.5,112.2 M441.1,111.2h18.1V82.4h30.3v28.8h18.1
			V37.6h-18.1v28.3h-30.3V37.6h-18.1V111.2z M372.1,83.4c0-8,6.3-14.1,14.6-14.1c4.6,0,8.8,1.6,11.8,4.3V93c-3,2.9-7,4.4-11.8,4.4
			C378.5,97.5,372.1,91.4,372.1,83.4 M398.7,111.2h16.8V33.9l-17,3.7v20.9c-4.2-2.4-9-3.7-14.2-3.7c-16.2,0-28.9,12.5-28.9,28.5
			c0,16,12.5,28.6,28.4,28.6c5.5,0,10.6-1.7,14.9-4.8V111.2z M321.5,68.5c5.4,0,9.9,3.5,11.7,8.8H310
			C311.7,71.8,315.9,68.5,321.5,68.5 M292.8,83.5c0,16.2,13.3,28.8,30.3,28.8c9.4,0,16.2-2.5,23.2-8.4l-11.3-10
			c-2.6,2.7-6.5,4.2-11.1,4.2c-6.3,0-11.5-3.5-13.7-8.8h39.6V85c0-17.7-11.9-30.4-28.1-30.4C305.6,54.7,292.8,67.3,292.8,83.5
			 M263.5,53.1c6,0,9.4,3.8,9.4,8.3s-3.4,8.3-9.4,8.3h-17.9V53.1H263.5z M227.5,111.2h18.1V84.4h13.8l13.9,26.8h20.2l-16.2-29.4
			c8.7-3.8,13.9-11.7,13.9-20.7c0-13.3-10.4-23.5-26-23.5h-37.7V111.2z"/>
	</g>
</g>
</svg>

@@ -1766,10 +1773,11 @@ spec:
   - training
   - kserve
   - distributed-workloads
+  - trustyai
   links:
   - name: Red Hat OpenShift AI
     url: https://www.redhat.com/en/technologies/cloud-computing/openshift/openshift-ai
   minKubeVersion: 1.22.0
   provider:
     name: Red Hat
-  version: 2.9.0
+  version: 2.11.0

components/component.go

@@ -132,6 +132,8 @@ func (c *Component) UpdatePrometheusConfig(_ client.Client, enable bool, compone
 			TrainingOperatorARules string `yaml:"trainingoperator-alerting.rules"`
 			WorkbenchesRRules      string `yaml:"workbenches-recording.rules"`
 			WorkbenchesARules      string `yaml:"workbenches-alerting.rules"`
+			TrustyAIRRules         string `yaml:"trustyai-recording.rules"`
+			TrustyAIARules         string `yaml:"trustyai-alerting.rules"`
 			KserveRRules           string `yaml:"kserve-recording.rules"`
 			KserveARules           string `yaml:"kserve-alerting.rules"`
 		} `yaml:"data"`

components/trustyai/trustyai.go

@@ -27,9 +27,6 @@ var (
 var _ components.ComponentInterface = (*TrustyAI)(nil)
 
 // TrustyAI struct holds the configuration for the TrustyAI component.
-// ## DEPRECATED ## : Installation of TrustyAI operator is deprecated in RHOAI.
-// If TrustyAI operator is installed, it will be removed
-// Changes in managemenstState are not supported.
 // +kubebuilder:object:generate=true
 type TrustyAI struct {
 	components.Component `json:""`
@@ -72,11 +69,6 @@ func (t *TrustyAI) ReconcileComponent(ctx context.Context, cli client.Client, lo
 		return err
 	}
 
-	// Return when platform is RHOAI
-	if platform == cluster.SelfManagedRhods || platform == cluster.ManagedRhods {
-		enabled = false
-	}
-
 	if enabled {
 		if t.DevFlags != nil {
 			// Download manifests and update paths

config/manifests/bases/rhods-operator.clusterserviceversion.yaml

@@ -68,6 +68,9 @@ metadata:
             "trainingoperator": {
               "managementState": "Removed"
             },
+            "trustyai": {
+              "managementState": "Removed"
+            }
           }
         }
       }
@@ -151,6 +154,7 @@ spec:
   - training
   - kserve
   - distributed-workloads
+  - trustyai
   links:
   - name: Red Hat OpenShift AI
     url: https://www.redhat.com/en/technologies/cloud-computing/openshift/openshift-ai

config/manifests/description-patch.yml

@@ -23,4 +23,5 @@ spec:
     * Model Serving using ModelMesh and Kserve.
     * Ability to use other runtimes for serving
     * Model Monitoring
-    * Distributed workloads (KubeRay, CodeFlare, Kueue)
+    * Distributed workloads (KubeRay, CodeFlare, Kueue, Training Operator)
+    * XAI explanations of predictive models (TrustyAI)

config/samples/datasciencecluster_v1_datasciencecluster.yaml

@@ -38,3 +38,5 @@ spec:
       managementState: "Managed"
     workbenches:
       managementState: "Managed"
+    trustyai:
+      managementState: "Removed"

controllers/datasciencecluster/datasciencecluster_controller.go

@@ -54,7 +54,6 @@ import (
 	dsci "github.com/opendatahub-io/opendatahub-operator/v2/apis/dscinitialization/v1"
 	"github.com/opendatahub-io/opendatahub-operator/v2/components"
 	"github.com/opendatahub-io/opendatahub-operator/v2/components/datasciencepipelines"
-	"github.com/opendatahub-io/opendatahub-operator/v2/components/trustyai"
 	"github.com/opendatahub-io/opendatahub-operator/v2/controllers/status"
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/cluster"
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/metadata/labels"
@@ -349,10 +348,6 @@ func (r *DataScienceClusterReconciler) reconcileSubComponent(ctx context.Context
 		}
 		saved.Status.InstalledComponents[componentName] = enabled
 		switch {
-		case enabled && componentName == trustyai.ComponentName:
-			saved.Status.InstalledComponents[componentName] = false
-			status.SetComponentCondition(&saved.Status.Conditions, componentName, status.ReconcileCompleted,
-				"TrustyAI is deprecated. Setting this field to Managed will not result in the deployment of TrustyAI.", corev1.ConditionTrue)
 		case enabled:
 			status.SetComponentCondition(&saved.Status.Conditions, componentName, status.ReconcileCompleted, "Component reconciled successfully", corev1.ConditionTrue)
 		default:

controllers/status/status.go

@@ -23,7 +23,6 @@ import (
 	corev1 "k8s.io/api/core/v1"
 
 	"github.com/opendatahub-io/opendatahub-operator/v2/components/datasciencepipelines"
-	"github.com/opendatahub-io/opendatahub-operator/v2/components/trustyai"
 )
 
 // These constants represent the overall Phase as used by .Status.Phase.
@@ -197,35 +196,18 @@ func SetCompleteCondition(conditions *[]conditionsv1.Condition, reason string, m
 // SetComponentCondition appends Condition Type with const ReadySuffix for given component
 // when component finished reconcile.
 func SetComponentCondition(conditions *[]conditionsv1.Condition, component string, reason string, message string, status corev1.ConditionStatus) {
-	var condtype string
-	if component == trustyai.ComponentName {
-		condtype = component + "Deprecated"
-		conditionsv1.SetStatusCondition(conditions, conditionsv1.Condition{
-			Type:    conditionsv1.ConditionType(condtype),
-			Status:  corev1.ConditionTrue,
-			Reason:  reason,
-			Message: message,
-		})
-	} else {
-		condtype = component + ReadySuffix
-
-		conditionsv1.SetStatusCondition(conditions, conditionsv1.Condition{
-			Type:    conditionsv1.ConditionType(condtype),
-			Status:  status,
-			Reason:  reason,
-			Message: message,
-		})
-	}
+	condtype := component + ReadySuffix
+	conditionsv1.SetStatusCondition(conditions, conditionsv1.Condition{
+		Type:    conditionsv1.ConditionType(condtype),
+		Status:  status,
+		Reason:  reason,
+		Message: message,
+	})
 }
 
 // RemoveComponentCondition remove Condition of giving component.
 func RemoveComponentCondition(conditions *[]conditionsv1.Condition, component string) {
-	var condType string
-	if component == trustyai.ComponentName {
-		condType = component + "Deprecated"
-	} else {
-		condType = component + ReadySuffix
-	}
+	condType := component + ReadySuffix
 	conditionsv1.RemoveStatusCondition(conditions, conditionsv1.ConditionType(condType))
 }
 

docs/api-overview.md

@@ -265,9 +265,6 @@ Package trustyai provides utility functions to config TrustyAI, a bias/fairness
 
 
 TrustyAI struct holds the configuration for the TrustyAI component.
-## DEPRECATED ## : Installation of TrustyAI operator is deprecated in RHOAI.
-If TrustyAI operator is installed, it will be removed
-Changes in managemenstState are not supported.
 
 
 

main.go

@@ -222,12 +222,6 @@ func main() {
 		}
 	}
 
-	// Remove TrustyAI for RHOAI
-	// TODO: Remove below check when trustyai manifests are removed in midstream
-	if err = upgrade.RemoveDeprecatedTrustyAI(setupClient, platform); err != nil {
-		setupLog.Error(err, "unable to remove trustyai from DSC")
-	}
-
 	var cleanExistingResourceFunc manager.RunnableFunc = func(ctx context.Context) error {
 		if err = upgrade.CleanupExistingResource(ctx, setupClient, platform, dscApplicationsNamespace, dscMonitoringNamespace); err != nil {
 			setupLog.Error(err, "unable to perform cleanup")

pkg/upgrade/upgrade.go

@@ -36,6 +36,7 @@ import (
 	"github.com/opendatahub-io/opendatahub-operator/v2/components/modelmeshserving"
 	"github.com/opendatahub-io/opendatahub-operator/v2/components/ray"
 	"github.com/opendatahub-io/opendatahub-operator/v2/components/trainingoperator"
+	"github.com/opendatahub-io/opendatahub-operator/v2/components/trustyai"
 	"github.com/opendatahub-io/opendatahub-operator/v2/components/workbenches"
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/cluster"
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/cluster/gvk"
@@ -91,6 +92,9 @@ func CreateDefaultDSC(ctx context.Context, cli client.Client) error {
 				TrainingOperator: trainingoperator.TrainingOperator{
 					Component: components.Component{ManagementState: operatorv1.Removed},
 				},
+				TrustyAI: trustyai.TrustyAI{
+					Component: components.Component{ManagementState: operatorv1.Removed},
+				},
 			},
 		},
 	}
@@ -427,31 +431,6 @@ func removOdhApplicationsCR(ctx context.Context, cli client.Client, gvk schema.G
 	return nil
 }
 
-func RemoveDeprecatedTrustyAI(cli client.Client, platform cluster.Platform) error {
-	existingDSCList := &dsc.DataScienceClusterList{}
-	err := cli.List(context.TODO(), existingDSCList)
-	if err != nil {
-		return fmt.Errorf("error getting existing DSC: %w", err)
-	}
-
-	switch len(existingDSCList.Items) {
-	case 0:
-		return nil
-	case 1:
-		existingDSC := existingDSCList.Items[0]
-		if platform == cluster.ManagedRhods || platform == cluster.SelfManagedRhods {
-			if existingDSC.Spec.Components.TrustyAI.ManagementState != operatorv1.Removed {
-				existingDSC.Spec.Components.TrustyAI.ManagementState = operatorv1.Removed
-				err := cli.Update(context.TODO(), &existingDSC)
-				if err != nil {
-					return fmt.Errorf("error updating TrustyAI component: %w", err)
-				}
-			}
-		}
-	}
-	return nil
-}
-
 func RemoveLabel(cli client.Client, objectName string, labelKey string) error {
 	foundNamespace := &corev1.Namespace{}
 	if err := cli.Get(context.TODO(), client.ObjectKey{Name: objectName}, foundNamespace); err != nil {

tests/e2e/helper_test.go

@@ -143,7 +143,7 @@ func setupDSCInstance() *dsc.DataScienceCluster {
 				},
 				TrustyAI: trustyai.TrustyAI{
 					Component: components.Component{
-						ManagementState: operatorv1.Managed,
+						ManagementState: operatorv1.Removed,
 					},
 				},
 				TrainingOperator: trainingoperator.TrainingOperator{