Revert "Update defaults for modelmesh" (opendatahub-io#146)

(cherry picked from commit e5a27c4) (cherry picked from commit 7389619)
VaishnaviHire · Dec 11, 2023 · 9c1cca0 · 9c1cca0
1 parent 1c6f95c
commit 9c1cca0
Show file tree

Hide file tree

Showing 3 changed files with 1,847 additions and 14 deletions.
diff --git a/bundle/manifests/rhods-operator.clusterserviceversion.yaml b/bundle/manifests/rhods-operator.clusterserviceversion.yaml
diff --git a/config/samples/dscinitialization_v1_dscinitialization.yaml b/config/samples/dscinitialization_v1_dscinitialization.yaml
@@ -13,3 +13,4 @@ spec:
     managementState: "Managed"
     namespace: 'opendatahub'
   applicationsNamespace: 'opendatahub'
+
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"
 )
@@ -157,24 +156,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},
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,3 +13,4 @@ spec:
		managementState: "Managed"
		namespace: 'opendatahub'
		applicationsNamespace: 'opendatahub'