backport: from rhods-2.5

red-hat-data-services#157

Signed-off-by: Wen Zhou <wenzhou@redhat.com>

components/modelmeshserving/modelmeshserving.go

@@ -22,7 +22,6 @@ import (
 var (
 	ComponentName          = "model-mesh"
 	Path                   = deploy.DefaultManifestPath + "/" + ComponentName + "/overlays/odh"
-	monitoringPath         = deploy.DefaultManifestPath + "/" + "modelmesh-monitoring/base"
 	DependentComponentName = "odh-model-controller"
 	DependentPath          = deploy.DefaultManifestPath + "/" + DependentComponentName + "/base"
 )
@@ -147,19 +146,6 @@ func (m *ModelMeshServing) ReconcileComponent(ctx context.Context,
 		}
 	}
 
-	// Get monitoring namespace
-	var monitoringNamespace string
-	if dscispec.Monitoring.Namespace != "" {
-		monitoringNamespace = dscispec.Monitoring.Namespace
-	} else {
-		monitoringNamespace = dscispec.ApplicationsNamespace
-	}
-
-	// Ensure we do not deploy modelmesh-monitoring if it has been there from previous releases
-	if err = deploy.DeployManifestsFromPath(cli, owner, monitoringPath, monitoringNamespace, ComponentName, false); err != nil {
-		return err
-	}
-
 	// CloudService Monitoring handling
 	if platform == deploy.ManagedRhods {
 		if enabled {

get_all_manifests.sh

@@ -53,9 +53,6 @@ rm -fr ./odh-manifests/* ./.odh-manifests-tmp/
 mkdir -p ./.odh-manifests-tmp/ ./odh-manifests/
 wget -q -c ${MANIFESTS_TARBALL_URL} -O - | tar -zxv -C ./.odh-manifests-tmp/ --strip-components 1 > /dev/null
 
-# mm-monitroing
-cp -r ./.odh-manifests-tmp/modelmesh-monitoring/ ./odh-manifests
-
 # Dashboard
 cp -r ./.odh-manifests-tmp/odh-dashboard/ ./odh-manifests/dashboard