From 3b0fd44a144b5918fe326df2db44487789936257 Mon Sep 17 00:00:00 2001
From: Wen Zhou <wenzhou@redhat.com>
Date: Sat, 21 Oct 2023 09:06:53 +0200
Subject: [PATCH 1/2] update(kserve): manifests path from in-repo

---
 components/kserve/kserve.go | 4 ++--
 get_all_manifests.sh        | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/components/kserve/kserve.go b/components/kserve/kserve.go
index cc90815565d..3180c1ef242 100644
--- a/components/kserve/kserve.go
+++ b/components/kserve/kserve.go
@@ -18,7 +18,7 @@ import (
 
 var (
 	ComponentName          = "kserve"
-	Path                   = deploy.DefaultManifestPath + "/" + ComponentName + "/base"
+	Path                   = deploy.DefaultManifestPath + "/" + ComponentName + "/overlays/odh"
 	DependentComponentName = "odh-model-controller"
 	DependentPath          = deploy.DefaultManifestPath + "/" + DependentComponentName + "/base"
 	ServiceMeshOperator    = "servicemeshoperator"
@@ -53,7 +53,7 @@ func (k *Kserve) OverrideManifests(_ string) error {
 					return err
 				}
 				// If overlay is defined, update paths
-				defaultKustomizePath := "base"
+				defaultKustomizePath := "overlays/odh"
 				if subcomponent.SourcePath != "" {
 					defaultKustomizePath = subcomponent.SourcePath
 				}
diff --git a/get_all_manifests.sh b/get_all_manifests.sh
index fce24ad2aa7..0e7fb5c4a5a 100755
--- a/get_all_manifests.sh
+++ b/get_all_manifests.sh
@@ -9,7 +9,7 @@ MANIFEST_RELEASE="master"
 MANIFESTS_TARBALL_URL="${GITHUB_URL}/${MANIFEST_ORG}/odh-manifests/tarball/${MANIFEST_RELEASE}"
 
 # component: dsp, kserve, dashbaord, cf/ray. in the format of "repo-org:repo-name:branch-name:source-folder:target-folder"
-# TODO: workbench, modelmesh, monitoring, etc
+# 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"
@@ -21,6 +21,7 @@ declare -A COMPONENT_MANIFESTS=(
     ["trustyai"]="trustyai-explainability:trustyai-service-operator:release/1.10.2:config:trustyai-service-operator"
     ["model-mesh"]="opendatahub-io:modelmesh-serving:release-0.11.0:config:model-mesh"
     ["odh-model-controller"]="opendatahub-io:odh-model-controller:release-0.11.0:config:odh-model-controller"
+    ["kserve"]="opendatahub-io:kserve:release-v0.11.0:config:kserve"
 )
 
 # Allow overwriting repo using flags component=repo

From ec3bd4c7572b4d8fb84882760069983da669cc8e Mon Sep 17 00:00:00 2001
From: Wen Zhou <wenzhou@redhat.com>
Date: Thu, 26 Oct 2023 16:29:05 +0200
Subject: [PATCH 2/2] update: no more odh-manifests in ODH build

- remove modelmesh-monitoring which only for downstream monitoring
- add kserve

Signed-off-by: Wen Zhou <wenzhou@redhat.com>
---
 get_all_manifests.sh | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/get_all_manifests.sh b/get_all_manifests.sh
index 0e7fb5c4a5a..b3b2a5b6fe4 100755
--- a/get_all_manifests.sh
+++ b/get_all_manifests.sh
@@ -48,14 +48,7 @@ if [ "$#" -ge 1 ]; then
     done
 fi
 
-# pre-cleanup local env
-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
-cp -r ./.odh-manifests-tmp/modelmesh-monitoring/ ./odh-manifests
-cp -r ./.odh-manifests-tmp/kserve/ ./odh-manifests
-rm -rf ${MANIFEST_RELEASE}.tar.gz ./.odh-manifests-tmp/
+# R.I.P, odh-manifests
 
 for key in "${!COMPONENT_MANIFESTS[@]}"; do
     echo "Cloning repo ${key}: ${COMPONENT_MANIFESTS[$key]}"