Revert "Update defaults for modelmesh" (#146)

(cherry picked from commit e5a27c4)
opendatahub-io · Nov 29, 2023 · 7389619 · 7389619
1 parent 81433ba
commit 7389619
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 30 deletions.
diff --git a/bundle/manifests/rhods-operator.clusterserviceversion.yaml b/bundle/manifests/rhods-operator.clusterserviceversion.yaml
@@ -32,7 +32,7 @@ metadata:
                 "managementState": "Managed"
               },
               "modelmeshserving": {
-                "managementState": "Managed"
+                "managementState": "Removed"
               },
               "ray": {
                 "managementState": "Removed"
@@ -64,14 +64,6 @@ metadata:
             "monitoring": {
               "managementState": "Managed",
               "namespace": "redhat-ods-monitoring"
-            },
-            "serviceMesh": {
-              "controlPlane": {
-                "metricsCollection": "Istio",
-                "name": "data-science-smcp",
-                "namespace": "istio-system"
-              },
-              "managementState": "Managed"
             }
           }
         },

diff --git a/config/samples/datasciencecluster_v1_datasciencecluster.yaml b/config/samples/datasciencecluster_v1_datasciencecluster.yaml
@@ -19,7 +19,7 @@ spec:
     kserve:
       managementState: "Managed"
     modelmeshserving:
-      managementState: "Managed"
+      managementState: "Removed"
     ray:
       managementState: "Removed"
     workbenches:

diff --git a/config/samples/dscinitialization_v1_dscinitialization.yaml b/config/samples/dscinitialization_v1_dscinitialization.yaml
@@ -13,10 +13,4 @@ spec:
     managementState: "Managed"
     namespace: 'redhat-ods-monitoring'
   applicationsNamespace: 'redhat-ods-applications'
-  serviceMesh:
-    controlPlane:
-      metricsCollection: Istio
-      name: data-science-smcp
-      namespace: istio-system
-    managementState: Managed
 
diff --git a/pkg/upgrade/upgrade.go b/pkg/upgrade/upgrade.go
@@ -35,7 +35,6 @@ import (
 	"github.com/opendatahub-io/opendatahub-operator/v2/components/ray"
 	"github.com/opendatahub-io/opendatahub-operator/v2/components/trustyai"
 	"github.com/opendatahub-io/opendatahub-operator/v2/components/workbenches"
-	infrav1 "github.com/opendatahub-io/opendatahub-operator/v2/infrastructure/v1"
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/cluster"
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/deploy"
 )
@@ -164,24 +163,13 @@ func CreateDefaultDSC(cli client.Client, platform deploy.Platform) error {
 					Component: components.Component{ManagementState: operatorv1.Managed},
 				},
 				ModelMeshServing: modelmeshserving.ModelMeshServing{
-					Component: components.Component{ManagementState: operatorv1.Managed},
+					Component: components.Component{ManagementState: operatorv1.Removed},
 				},
 				DataSciencePipelines: datasciencepipelines.DataSciencePipelines{
 					Component: components.Component{ManagementState: operatorv1.Managed},
 				},
 				Kserve: kserve.Kserve{
-					Component: components.Component{
-						ManagementState: operatorv1.Managed,
-					},
-					Serving: infrav1.ServingSpec{
-						ManagementState: operatorv1.Managed,
-						Name:            "knative-serving",
-						IngressGateway: infrav1.IngressGatewaySpec{
-							Certificate: infrav1.CertificateSpec{
-								Type: "SelfSigned",
-							},
-						},
-					},
+					Component: components.Component{ManagementState: operatorv1.Managed},
 				},
 				CodeFlare: codeflare.CodeFlare{
 					Component: components.Component{ManagementState: operatorv1.Removed},