From d96b7fe4a95d306acc36387151947b27ea023a96 Mon Sep 17 00:00:00 2001
From: James Liu <37026441+zijianjoy@users.noreply.github.com>
Date: Thu, 10 Mar 2022 14:01:54 -0800
Subject: [PATCH] (manifests): Upgrade to kubeflow v1.5.0 and fix kserve
 integration (#356)

---
 kubeflow/apps/pipelines/pull-upstream.sh   |  2 +-
 kubeflow/contrib/kserve/kustomization.yaml | 10 +++++-----
 kubeflow/pull-upstream.sh                  |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/kubeflow/apps/pipelines/pull-upstream.sh b/kubeflow/apps/pipelines/pull-upstream.sh
index 89fd7bb7..3086b19b 100755
--- a/kubeflow/apps/pipelines/pull-upstream.sh
+++ b/kubeflow/apps/pipelines/pull-upstream.sh
@@ -17,7 +17,7 @@
 set -ex
 
 # TODO: Use kubeflow/pipelines once /~https://github.com/kubeflow/pipelines/pull/6595 is resolved.
-export KUBEFLOW_PIPELINES_VERSION=1.8.1-rc.0
+export KUBEFLOW_PIPELINES_VERSION=1.8.1
 export KUBEFLOW_PIPELINES_REPO=/~https://github.com/kubeflow/pipelines.git
 # export KUBEFLOW_PIPELINES_VERSION=upgradekpt # Other attempted branches: krmignore, kubeflow14
 # export KUBEFLOW_PIPELINES_REPO=/~https://github.com/zijianjoy/pipelines.git
diff --git a/kubeflow/contrib/kserve/kustomization.yaml b/kubeflow/contrib/kserve/kustomization.yaml
index 4a08c529..6dc8a3fb 100644
--- a/kubeflow/contrib/kserve/kustomization.yaml
+++ b/kubeflow/contrib/kserve/kustomization.yaml
@@ -41,17 +41,17 @@ generatorOptions:
 # To make namespace for standalone installation kustomizable,
 # variabalize ingress gateway, webhook service name and
 # kserve namespace in webhook configurations
-configMapGenerator:
+# configMapGenerator:
 # Copied from kfserving, but converted to patches/config-param.yaml
 # becuase it cannot detect the kserve-config file by kustomize.
 # - name: kserve-config
 #   behavior: replace
 #   literals:
 #   - ingressGateway=kubeflow/kubeflow-gateway
-- name: kserve-models-web-app-config
-  behavior: replace
-  literals:
-  - USERID_HEADER=kubeflow-userid
+# - name: kserve-models-web-app-config
+#   behavior: replace
+#   literals:
+#   - USERID_HEADER=kubeflow-userid
 configurations:
 - params.yaml
 - kserve-params.yaml
diff --git a/kubeflow/pull-upstream.sh b/kubeflow/pull-upstream.sh
index 818670f6..ee8f53a7 100755
--- a/kubeflow/pull-upstream.sh
+++ b/kubeflow/pull-upstream.sh
@@ -16,7 +16,7 @@
 
 set -ex
 
-export KUBEFLOW_MANIFESTS_VERSION=v1.5.0-rc.1
+export KUBEFLOW_MANIFESTS_VERSION=v1.5.0
 export KUBEFLOW_MANIFESTS_REPO=/~https://github.com/kubeflow/manifests.git
 
 # Pull Kubeflow Pipelines upstream manifests.