cleanup: modelmesh monitoring logic (#703)

Signed-off-by: Wen Zhou <wenzhou@redhat.com>
opendatahub-io · Nov 6, 2023 · 023d6c4 · 023d6c4
1 parent 9ff16dd
commit 023d6c4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 15 deletions.
diff --git a/components/modelmeshserving/modelmeshserving.go b/components/modelmeshserving/modelmeshserving.go
@@ -17,9 +17,8 @@ import (
 )
 
 var (
-	ComponentName = "model-mesh"
-	Path          = deploy.DefaultManifestPath + "/" + ComponentName + "/overlays/odh"
-	// monitoringPath         = deploy.DefaultManifestPath + "/" + "modelmesh-monitoring/base"
+	ComponentName          = "model-mesh"
+	Path                   = deploy.DefaultManifestPath + "/" + ComponentName + "/overlays/odh"
 	DependentComponentName = "odh-model-controller"
 	DependentPath          = deploy.DefaultManifestPath + "/" + DependentComponentName + "/base"
 )
@@ -143,15 +142,6 @@ func (m *ModelMeshServing) ReconcileComponent(cli client.Client, owner metav1.Ob
 	if err != nil {
 		return err
 	}
-	// var monitoringNamespace string
-	// if dscInit.Spec.Monitoring.Namespace != "" {
-	// 	monitoringNamespace = dscInit.Spec.Monitoring.Namespace
-	// } else {
-	// 	monitoringNamespace = dscispec.ApplicationsNamespace
-	// }
-
-	//// If modelmesh is deployed successfully, deploy modelmesh-monitoring
-	// err = deploy.DeployManifestsFromPath(cli, owner, monitoringPath, monitoringNamespace, ComponentName, enabled)
 
 	return err
 }

diff --git a/controllers/dscinitialization/utils.go b/controllers/dscinitialization/utils.go
@@ -216,7 +216,7 @@ func (r *DSCInitializationReconciler) reconcileDefaultNetworkPolicy(ctx context.
 				},
 				{ // OR logic for ROSA
 					From: []netv1.NetworkPolicyPeer{
-						{ // need this for access dashboard
+						{ // need this to access dashboard
 							NamespaceSelector: &metav1.LabelSelector{
 								MatchLabels: map[string]string{
 									"kubernetes.io/metadata.name": "openshift-ingress",
@@ -227,7 +227,7 @@ func (r *DSCInitializationReconciler) reconcileDefaultNetworkPolicy(ctx context.
 				},
 				{ // OR logic for PSI
 					From: []netv1.NetworkPolicyPeer{
-						{ // need this for access dashboard
+						{ // need this to access dashboard
 							NamespaceSelector: &metav1.LabelSelector{
 								MatchLabels: map[string]string{
 									"kubernetes.io/metadata.name": "openshift-host-network",

diff --git a/get_all_manifests.sh b/get_all_manifests.sh
@@ -4,7 +4,6 @@ set -e
 GITHUB_URL="https://github.com/"
 
 # component: dsp, kserve, dashbaord, cf/ray. in the format of "repo-org:repo-name:branch-name:source-folder:target-folder"
-# TODO: odh-mm-monitoring, etc
 declare -A COMPONENT_MANIFESTS=(
     ["codeflare"]="opendatahub-io:codeflare-operator:main:config:codeflare"
     ["ray"]="opendatahub-io:kuberay:master:ray-operator/config:ray"