From e8f84f4b40d5bab2fb81f24985ae81e6384336f4 Mon Sep 17 00:00:00 2001
From: Suraj Kota <surakota@amazon.com>
Date: Fri, 1 Jul 2022 02:44:25 +0000
Subject: [PATCH] update readme and kustomization

---
 README.md                                |  2 +-
 contrib/kserve/kserve/kustomization.yaml | 17 +++++++++++++----
 contrib/kserve/kserve/params.env         |  1 +
 hack/sync-kserve-manifests.sh            | 11 +++++++----
 4 files changed, 22 insertions(+), 9 deletions(-)
 create mode 100644 contrib/kserve/kserve/params.env

diff --git a/README.md b/README.md
index 3a36475c56..b82298eb1d 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ This repo periodically syncs all official Kubeflow components from their respect
 | Tensorboards Web App | apps/tensorboard/tensorboards-web-app/upstream | [v1.5.0](https://github.com/kubeflow/kubeflow/tree/v1.5.0/components/crud-web-apps/tensorboards/manifests) |
 | Volumes Web App | apps/volumes-web-app/upstream | [v1.5.0](https://github.com/kubeflow/kubeflow/tree/v1.5.0/components/crud-web-apps/volumes/manifests) |
 | Katib | apps/katib/upstream | [v0.14.0-rc.0](https://github.com/kubeflow/katib/tree/v0.14.0-rc.0/manifests/v1beta1) |
-| KServe | contrib/kserve/kserve | [8079f375cbcedc4d45a1b4aade2e2308ea6f9ae8](https://github.com/kserve/kserve/tree/8079f375cbcedc4d45a1b4aade2e2308ea6f9ae8/install/v0.8.0) |
+| KServe | contrib/kserve/kserve | [release-0.8](https://github.com/kserve/kserve/tree/8079f375cbcedc4d45a1b4aade2e2308ea6f9ae8/install/v0.8.0) |
 | KServe Models Web App | contrib/kserve/models-web-app | [v0.8.0](https://github.com/kserve/models-web-app/tree/v0.8.0/config) |
 | Kubeflow Pipelines | apps/pipeline/upstream | [1.8.2](https://github.com/kubeflow/pipelines/tree/1.8.2/manifests/kustomize) |
 | Kubeflow Tekton Pipelines | apps/kfp-tekton/upstream | [v1.2.1](https://github.com/kubeflow/kfp-tekton/tree/v1.2.1/manifests/kustomize) |
diff --git a/contrib/kserve/kserve/kustomization.yaml b/contrib/kserve/kserve/kustomization.yaml
index 1aebb746f8..3e4f20907c 100644
--- a/contrib/kserve/kserve/kustomization.yaml
+++ b/contrib/kserve/kserve/kustomization.yaml
@@ -1,8 +1,17 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- kserve.yaml
-- aggregated-roles.yaml
-# For KF 1.5 we are including both KFServing and KServe. Thus we install the
+# Install Kserve in kubeflow namespace
+- kserve_kubeflow.yaml
+
+# If you want to install both KFServing and KServe, install the
 # standalone kserve manifests, to avoid conflicts with 0.6.1 KFServing.
-#- kserve_kubeflow.yaml
+# - kserve.yaml
+# - aggregated-roles.yaml
+# - kserve-runtimes.yaml
+# configMapGenerator:
+#   - name: kserve-config
+#     namespace: kserve
+#     behavior: merge
+#     envs:
+#     - params.env
\ No newline at end of file
diff --git a/contrib/kserve/kserve/params.env b/contrib/kserve/kserve/params.env
new file mode 100644
index 0000000000..74936391b5
--- /dev/null
+++ b/contrib/kserve/kserve/params.env
@@ -0,0 +1 @@
+ingressGateway=kubeflow/kubeflow-gateway
\ No newline at end of file
diff --git a/hack/sync-kserve-manifests.sh b/hack/sync-kserve-manifests.sh
index c45b96b4fc..70df1931b4 100755
--- a/hack/sync-kserve-manifests.sh
+++ b/hack/sync-kserve-manifests.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # This script aims at helping create a PR to update the manifests of the
-# kubeflow/pipelines repo.
+# kserve/kserve and kserve/models-web-app repo.
 # This script:
 # 1. Checks out a new branch
 # 2. Copies files to the correct places
@@ -10,6 +10,9 @@
 # Afterwards the developers can submit the PR to the kubeflow/manifests
 # repo, based on that local branch
 
+# Run this script form the root of kubeflow/manifests repository
+# ./hack/sync-kserve-manifests.sh
+
 # strict mode http://redsymbol.net/articles/unofficial-bash-strict-mode/
 set -euo pipefail
 IFS=$'\n\t'
@@ -18,7 +21,7 @@ CLONE_DIR=${CLONE_DIR:=/tmp}
 KSERVE_DIR="${CLONE_DIR?}/kserve"
 WEBAPP_DIR="${CLONE_DIR?}/models-web-app"
 BRANCH=${BRANCH:=sync-kserve-manifests-${KSERVE_COMMIT?}}
-# required only if commit does not match the tag
+# *_VERSION vars are required only if COMMIT does not match a tag
 KSERVE_VERSION=${KSERVE_VERSION:=${KSERVE_COMMIT?}}
 WEBAPP_VERSION=${WEBAPP_VERSION:=${WEBAPP_COMMIT?}}
 
@@ -31,7 +34,7 @@ echo "Creating branch: ${BRANCH}"
 if [ -n "$(git status --porcelain)" ]; then
   # Uncommitted changes
   echo "WARNING: You have uncommitted changes, exiting..."
-#   exit 1
+  exit 1
 fi
 
 if [ "$(git branch --list "${BRANCH}")" ]
@@ -102,7 +105,7 @@ DST_DIR=$MANIFESTS_DIR/contrib/kserve/models-web-app
 rm -r "$DST_DIR"
 cp "$SRC_MANIFEST_PATH" "$DST_DIR" -r
 
-echo "Successfully copied kserve manifests."
+echo "Successfully copied kserve models web app manifests."
 
 echo "Updating README..."
 SRC_TXT="\[.*\](https://github.com/kserve/models-web-app/tree/.*)"