From 7d002f14554d998ac733548f8ff9eac5a82f0bef Mon Sep 17 00:00:00 2001
From: Kimonas Sotirchos <kimwnasptd@arrikto.com>
Date: Fri, 4 Mar 2022 19:38:09 +0200
Subject: [PATCH] kserve: Update the Models web app

Update the app's manifests to:
1. Work under the /kserve-endpoints prefix
2. Use the correct gatway in the manifests
3. Use the correct namespace in for the app's ConfigMap

Signed-off-by: Kimonas Sotirchos <kimwnasptd@arrikto.com>
---
 contrib/kserve/models-web-app/base/istio.yaml                 | 2 +-
 contrib/kserve/models-web-app/base/kustomization.yaml         | 1 +
 .../models-web-app/overlays/kubeflow/kustomization.yaml       | 2 ++
 .../overlays/kubeflow/patches/web-app-vsvc.yaml               | 4 ++++
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/contrib/kserve/models-web-app/base/istio.yaml b/contrib/kserve/models-web-app/base/istio.yaml
index dcd3211efe..944eddba0f 100644
--- a/contrib/kserve/models-web-app/base/istio.yaml
+++ b/contrib/kserve/models-web-app/base/istio.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: kserve
 spec:
   gateways:
-  - $(ingressGateway)
+  - knative-serving/knative-ingress-gateway
   hosts:
   - '*'
   http:
diff --git a/contrib/kserve/models-web-app/base/kustomization.yaml b/contrib/kserve/models-web-app/base/kustomization.yaml
index 8398272cc4..95fda69a3f 100644
--- a/contrib/kserve/models-web-app/base/kustomization.yaml
+++ b/contrib/kserve/models-web-app/base/kustomization.yaml
@@ -12,5 +12,6 @@ images:
   newTag: v0.7.0
 configMapGenerator:
   - name: kserve-models-web-app-config
+    namespace: kserve
     literals:
     - APP_DISABLE_AUTH="True"
diff --git a/contrib/kserve/models-web-app/overlays/kubeflow/kustomization.yaml b/contrib/kserve/models-web-app/overlays/kubeflow/kustomization.yaml
index 985eb83505..ddbf501269 100644
--- a/contrib/kserve/models-web-app/overlays/kubeflow/kustomization.yaml
+++ b/contrib/kserve/models-web-app/overlays/kubeflow/kustomization.yaml
@@ -33,9 +33,11 @@ generatorOptions:
 # kserve namespace in webhook configurations
 configMapGenerator:
   - name: kserve-models-web-app-config
+    namespace: kserve
     behavior: replace
     literals:
     - USERID_HEADER=kubeflow-userid
+    - APP_PREFIX=/kserve-endpoints
 
 configurations:
 - params.yaml
diff --git a/contrib/kserve/models-web-app/overlays/kubeflow/patches/web-app-vsvc.yaml b/contrib/kserve/models-web-app/overlays/kubeflow/patches/web-app-vsvc.yaml
index f35fed042e..979f66126e 100644
--- a/contrib/kserve/models-web-app/overlays/kubeflow/patches/web-app-vsvc.yaml
+++ b/contrib/kserve/models-web-app/overlays/kubeflow/patches/web-app-vsvc.yaml
@@ -1,3 +1,7 @@
+- op: replace
+  path: /spec/gateways
+  value:
+    - kubeflow/kubeflow-gateway
 - op: replace
   path: /spec/http/0/route/0/destination
   value: