From 9a68c4779c9eeac91b5139fe0b534e5fe88da833 Mon Sep 17 00:00:00 2001
From: Dushyanth Chickabasapa <dushyanthsc@google.com>
Date: Wed, 22 Jan 2020 15:59:38 -0800
Subject: [PATCH] Metadata: Updating metadata server version from 0.14.0 to
 v0.21.0

Change to bump the metadata version to get the latest updates in MLMD.
---
 .release.cloudbuild.yaml                               | 10 +++++-----
 .../kustomize/base/metadata/metadata-deployment.yaml   |  2 +-
 test/deploy-cluster.sh                                 |  2 +-
 test/deploy-pipeline-mkp-cli.sh                        |  4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.release.cloudbuild.yaml b/.release.cloudbuild.yaml
index 1405f1dbac3b..04c245bae076 100644
--- a/.release.cloudbuild.yaml
+++ b/.release.cloudbuild.yaml
@@ -243,14 +243,14 @@ steps:
     docker push gcr.io/ml-pipeline/google/pipelines-test/visualizationserver:$(cat /workspace/mm.ver)
 
 - name: 'gcr.io/cloud-builders/docker'
-  args: ['pull', 'gcr.io/tfx-oss-public/ml_metadata_store_server:0.14.0']
+  args: ['pull', 'gcr.io/tfx-oss-public/ml_metadata_store_server:v0.21.0']
   id:   'pullMetadataServer'
 - name: 'gcr.io/cloud-builders/docker'
-  args: ['tag', 'gcr.io/tfx-oss-public/ml_metadata_store_server:0.14.0', 'gcr.io/ml-pipeline/google/pipelines/metadataserver:$TAG_NAME']
+  args: ['tag', 'gcr.io/tfx-oss-public/ml_metadata_store_server:v0.21.0', 'gcr.io/ml-pipeline/google/pipelines/metadataserver:$TAG_NAME']
   id:   'tagMetadataServerForMarketplace'
   waitFor: ['pullMetadataServer']
 - name: 'gcr.io/cloud-builders/docker'
-  args: ['tag', 'gcr.io/tfx-oss-public/ml_metadata_store_server:0.14.0', 'gcr.io/ml-pipeline/google/pipelines-test/metadataserver:$TAG_NAME']
+  args: ['tag', 'gcr.io/tfx-oss-public/ml_metadata_store_server:v0.21.0', 'gcr.io/ml-pipeline/google/pipelines-test/metadataserver:$TAG_NAME']
   id:   'tagMetadataServerForMarketplaceTest'
   waitFor: ['pullMetadataServer']
 - id:   'tagMetadataServerForMarketplaceMajorMinor'
@@ -260,8 +260,8 @@ steps:
   args:
   - -ceux
   - |
-    docker tag gcr.io/tfx-oss-public/ml_metadata_store_server:0.14.0 gcr.io/ml-pipeline/google/pipelines/metadataserver:$(cat /workspace/mm.ver)
-    docker tag gcr.io/tfx-oss-public/ml_metadata_store_server:0.14.0 gcr.io/ml-pipeline/google/pipelines-test/metadataserver:$(cat /workspace/mm.ver)
+    docker tag gcr.io/tfx-oss-public/ml_metadata_store_server:v0.21.0 gcr.io/ml-pipeline/google/pipelines/metadataserver:$(cat /workspace/mm.ver)
+    docker tag gcr.io/tfx-oss-public/ml_metadata_store_server:v0.21.0 gcr.io/ml-pipeline/google/pipelines-test/metadataserver:$(cat /workspace/mm.ver)
     docker push gcr.io/ml-pipeline/google/pipelines/metadataserver:$(cat /workspace/mm.ver)
     docker push gcr.io/ml-pipeline/google/pipelines-test/metadataserver:$(cat /workspace/mm.ver)
 
diff --git a/manifests/kustomize/base/metadata/metadata-deployment.yaml b/manifests/kustomize/base/metadata/metadata-deployment.yaml
index 97dcdc648267..730e3a099253 100644
--- a/manifests/kustomize/base/metadata/metadata-deployment.yaml
+++ b/manifests/kustomize/base/metadata/metadata-deployment.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
       - name: container
-        image: gcr.io/tfx-oss-public/ml_metadata_store_server:0.14.0
+        image: gcr.io/tfx-oss-public/ml_metadata_store_server:v0.21.0
         env:
         - name: DBCONFIG_USER
           valueFrom:
diff --git a/test/deploy-cluster.sh b/test/deploy-cluster.sh
index da463fc139dc..d19fd2239c86 100755
--- a/test/deploy-cluster.sh
+++ b/test/deploy-cluster.sh
@@ -69,7 +69,7 @@ else
   NODE_POOL_CONFIG_ARG="--num-nodes=2 --machine-type=n1-standard-8 \
     --enable-autoscaling --max-nodes=8 --min-nodes=2"
   # Use new kubernetes master to improve workload identity stability.
-  KUBERNETES_VERSION_ARG="--cluster-version=1.14.8-gke.17"
+  KUBERNETES_VERSION_ARG="--cluster-version=1.14"
   if [ "$ENABLE_WORKLOAD_IDENTITY" = true ]; then
     WI_ARG="--identity-namespace=$PROJECT.svc.id.goog"
     SCOPE_ARG=
diff --git a/test/deploy-pipeline-mkp-cli.sh b/test/deploy-pipeline-mkp-cli.sh
index 081cd73d601c..615997be14d6 100644
--- a/test/deploy-pipeline-mkp-cli.sh
+++ b/test/deploy-pipeline-mkp-cli.sh
@@ -73,7 +73,7 @@ echo MKP_VERSION:$MKP_VERSION, GCR_FOLDER:$GCR_FOLDER
 
 export ARGO_VERSION=v2.3.0-license-compliance
 export CLOUDSQL_PROXY_VERSION=1.14
-export MLMD_SERVER_VERSION=0.14.0
+export MLMD_SERVER_VERSION=v0.21.0
 export MLMD_ENVOY_VERSION=initial
 export MINIO_VERSION=RELEASE.2019-08-14T20-37-41Z-license-compliance
 export MYSQL_VERSION=5.6
@@ -101,4 +101,4 @@ kubectl get pods -n ${NAMESPACE}
 popd
 
 # Waiting for the KFP resources are ready. TODO: verification of KFP resources
-sleep 60
\ No newline at end of file
+sleep 60