manifests: Upload to Kubeflow 1.5.0-rc.1 and KFP 1.8.0 (#348)

* manifests: Upload to Kubeflow 1.5.0-rc.1 and KFP 1.8.0 * fix path issue
GoogleCloudPlatform · Feb 18, 2022 · f3702ea · f3702ea
1 parent 270213f
commit f3702ea
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/kubeflow/apps/pipelines/pull-upstream.sh b/kubeflow/apps/pipelines/pull-upstream.sh
@@ -17,10 +17,10 @@
 set -ex
 
 # TODO: Use kubeflow/pipelines once https://github.com/kubeflow/pipelines/pull/6595 is resolved.
-# export KUBEFLOW_PIPELINES_VERSION=1.7.0
-# 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
+export KUBEFLOW_PIPELINES_VERSION=1.8.0
+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
 DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null && pwd)"
 
 cd "${DIR}"

diff --git a/kubeflow/common/iap-ingress/Makefile b/kubeflow/common/iap-ingress/Makefile
@@ -1,7 +1,7 @@
 build_dir?=./build
 PACKAGE_DIR?=$(shell pwd)/../..
 YQ=docker run --rm -v "$(PACKAGE_DIR)/":/workdir mikefarah/yq:4
-NAME=$(shell $(YQ) e '.data.name' ../../kptconfig/kpt-setter-config.yaml)
+NAME=$(shell $(YQ) e '.data.name' kptconfig/kpt-setter-config.yaml)
 # The kubectl context for your Kubeflow cluster
 KFCTXT=$(NAME)
 

diff --git a/kubeflow/pull-upstream.sh b/kubeflow/pull-upstream.sh
@@ -16,7 +16,7 @@
 
 set -ex
 
-export KUBEFLOW_MANIFESTS_VERSION=v1.4.1
+export KUBEFLOW_MANIFESTS_VERSION=v1.5.0-rc.1
 export KUBEFLOW_MANIFESTS_REPO=https://github.com/kubeflow/manifests.git
 
 # Pull Kubeflow Pipelines upstream manifests.