update: make TrustyAI GA

Signed-off-by: Wen Zhou <wenzhou@redhat.com>
opendatahub-io · Oct 23, 2024 · a2c1973 · a2c1973
1 parent 7c72759
commit a2c1973
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/bundle/manifests/rhods-operator.clusterserviceversion.yaml b/bundle/manifests/rhods-operator.clusterserviceversion.yaml
@@ -57,7 +57,7 @@ metadata:
                 "managementState": "Removed"
               },
               "trustyai": {
-                "managementState": "Removed"
+                "managementState": "Managed"
               },
               "workbenches": {
                 "managementState": "Managed"
@@ -170,7 +170,7 @@ metadata:
               "managementState": "Removed"
             },
             "trustyai": {
-              "managementState": "Removed"
+              "managementState": "Managed"
             }
           }
         }

diff --git a/config/manifests/bases/rhods-operator.clusterserviceversion.yaml b/config/manifests/bases/rhods-operator.clusterserviceversion.yaml
@@ -74,7 +74,7 @@ metadata:
               "managementState": "Removed"
             },
             "trustyai": {
-              "managementState": "Removed"
+              "managementState": "Managed"
             }
           }
         }

diff --git a/config/samples/datasciencecluster_v1_datasciencecluster.yaml b/config/samples/datasciencecluster_v1_datasciencecluster.yaml
@@ -39,7 +39,7 @@ spec:
     workbenches:
       managementState: "Managed"
     trustyai:
-      managementState: "Removed"      
+      managementState: "Managed"
     modelregistry:
       managementState: "Removed"
       registriesNamespace: "rhoai-model-registries"
diff --git a/docs/DESIGN.md b/docs/DESIGN.md
@@ -71,10 +71,10 @@ To deploy ODH components seamlessly, ODH operator will watch two CRDs:
             managementState: Managed
           trainingoperator:
             managementState: Removed
+          trustyai:
+            managementState: Managed
           workbenches:
             managementState: Managed
-          trustyai:
-            managementState: Removed
     ```
 
 2. Enable only Dashboard and Workbenches(Jupyter Notebooks)

diff --git a/docs/upgrade-testing.md b/docs/upgrade-testing.md
@@ -148,6 +148,6 @@ spec:
     workbenches:
       managementState: Managed
     trustyai:
-      managementState: Removed
+      managementState: Managed
 EOF
 ```
diff --git a/get_all_manifests.sh b/get_all_manifests.sh
@@ -15,8 +15,8 @@ declare -A COMPONENT_MANIFESTS=(
     ["odh-notebook-controller"]="red-hat-data-services:kubeflow:rhoai-2.15::components/odh-notebook-controller/config:odh-notebook-controller/odh-notebook-controller"
     ["notebooks"]="red-hat-data-services:notebooks:rhoai-2.15:manifests:notebooks"
     ["trustyai"]="trustyai-explainability:trustyai-service-operator:rhoai-2.15:config:trustyai-service-operator"
-    ["model-mesh"]="red-hat-data-services:modelmesh-serving:rrhoai-2.15::config:model-mesh"
-    ["odh-model-controller"]="red-hat-data-services:odh-model-controller:rrhoai-2.15::config:odh-model-controller"
+    ["model-mesh"]="red-hat-data-services:modelmesh-serving:rhoai-2.15::config:model-mesh"
+    ["odh-model-controller"]="red-hat-data-services:odh-model-controller:rhoai-2.15::config:odh-model-controller"
     ["kserve"]="red-hat-data-services:kserve:rhoai-2.15::config:kserve"
     ["modelregistry"]="red-hat-data-services:model-registry-operator:rhoai-2.15:config:model-registry-operator"
     ["trainingoperator"]="red-hat-data-services:training-operator:rhoai-2.15:manifests:trainingoperator"

diff --git a/pkg/upgrade/upgrade.go b/pkg/upgrade/upgrade.go
@@ -96,7 +96,7 @@ func CreateDefaultDSC(ctx context.Context, cli client.Client) error {
 					Component: components.Component{ManagementState: operatorv1.Removed},
 				},
 				TrustyAI: trustyai.TrustyAI{
-					Component: components.Component{ManagementState: operatorv1.Removed},
+					Component: components.Component{ManagementState: operatorv1.Managed},
 				},
 				ModelRegistry: modelregistry.ModelRegistry{
 					Component: components.Component{ManagementState: operatorv1.Removed},

diff --git a/tests/e2e/helper_test.go b/tests/e2e/helper_test.go
@@ -160,7 +160,7 @@ func setupDSCInstance(name string) *dscv1.DataScienceCluster {
 				},
 				TrustyAI: trustyai.TrustyAI{
 					Component: components.Component{
-						ManagementState: operatorv1.Removed,
+						ManagementState: operatorv1.Managed,
 					},
 				},
 				ModelRegistry: modelregistry.ModelRegistry{