From 7bf6c2ef594faf4d5e1d6f2ce009c9c95aed2a0e Mon Sep 17 00:00:00 2001
From: Dushyanth Chickabasapa <dushyanthsc@google.com>
Date: Wed, 11 Dec 2019 15:27:02 -0800
Subject: [PATCH] Metadata: Adding metadata-grpc config map

This change adds the necessary config-map related to gRPC MLMD server.

To make the names more clear, this change also modifies the existing
'metadata-configmap' which provides mysql configurations to
'metadata-mysql-configmap'
---
 .../templates/metadata.yaml                   | 39 ++++++++++++++++---
 .../base/metadata/metadata-configmap.yaml     | 22 +++++++++++
 .../base/metadata/metadata-deployment.yaml    | 12 +++---
 3 files changed, 61 insertions(+), 12 deletions(-)

diff --git a/manifests/gcp_marketplace/chart/kubeflow-pipelines/templates/metadata.yaml b/manifests/gcp_marketplace/chart/kubeflow-pipelines/templates/metadata.yaml
index 6a4497c8f98..43b35891b7a 100644
--- a/manifests/gcp_marketplace/chart/kubeflow-pipelines/templates/metadata.yaml
+++ b/manifests/gcp_marketplace/chart/kubeflow-pipelines/templates/metadata.yaml
@@ -58,18 +58,18 @@ spec:
         - name: MYSQL_DATABASE
           valueFrom:
             configMapKeyRef:
-              name: metadata-configmap
-              key: mysql_database
+              name: metadata-mysql-configmap
+              key: MYSQL_DATABASE
         - name: MYSQL_HOST
           valueFrom:
             configMapKeyRef:
-              name: metadata-configmap
-              key: mysql_host
+              name: metadata-mysql-configmap
+              key: MYSQL_HOST
         - name: MYSQL_PORT
           valueFrom:
             configMapKeyRef:
-              name: metadata-configmap
-              key: mysql_port
+              name: metadata-mysql-configmap
+              key: MYSQL_PORT
         command: ["/bin/metadata_store_server"]
         args: ["--grpc_port=8080",
                  "--mysql_config_database=$(MYSQL_DATABASE)",
@@ -140,3 +140,30 @@ data:
   mysql_port: "3306"
   username: "root"
   password: ""
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: metadata-mysql-configmap
+  labels:
+    component: metadata-server
+data:
+  {{ if .Values.managedstorage.databaseNamePrefix }}
+  MYSQL_DATABASE: '{{ .Values.managedstorage.databaseNamePrefix }}_metadata'
+  {{ else }}
+  mysql_database: '{{ .Release.Name | replace "-" "_" | replace "." "_"}}_metadata'
+  {{ end }}
+  MYSQL_HOST: "mysql"
+  MYSQL_PORT: "3306"
+  username: "root"
+  password: ""
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: metadata-grpc-configmap
+  labels:
+    component: metadata-server
+data:
+  METADATA_GRPC_SERVICE_HOST: "metadata-service"
+  METADATA_GRPC_SERVICE_PORT: "8080"
diff --git a/manifests/kustomize/base/metadata/metadata-configmap.yaml b/manifests/kustomize/base/metadata/metadata-configmap.yaml
index 27841b4e591..687026be1c4 100644
--- a/manifests/kustomize/base/metadata/metadata-configmap.yaml
+++ b/manifests/kustomize/base/metadata/metadata-configmap.yaml
@@ -1,3 +1,4 @@
+# metadata-config is retained for backward compatibility reasons.
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -8,3 +9,24 @@ data:
   mysql_database: "metadb"
   mysql_host: "mysql"
   mysql_port: "3306"
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: metadata-mysql-configmap
+  labels:
+    component: metadata-server
+data:
+  MYSQL_DATABASE: "metadb"
+  MYSQL_HOST: "mysql"
+  MYSQL_PORT: "3306"
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: metadata-grpc-configmap
+  labels:
+    component: metadata-server
+data:
+  METADATA_GRPC_SERVICE_HOST: "metadata-service"
+  METADATA_GRPC_SERVICE_PORT: "8080"
diff --git a/manifests/kustomize/base/metadata/metadata-deployment.yaml b/manifests/kustomize/base/metadata/metadata-deployment.yaml
index 4d52188b1c4..97dcdc64826 100644
--- a/manifests/kustomize/base/metadata/metadata-deployment.yaml
+++ b/manifests/kustomize/base/metadata/metadata-deployment.yaml
@@ -31,18 +31,18 @@ spec:
         - name: MYSQL_DATABASE
           valueFrom:
             configMapKeyRef:
-              name: metadata-configmap
-              key: mysql_database
+              name: metadata-mysql-configmap
+              key: MYSQL_DATABASE
         - name: MYSQL_HOST
           valueFrom:
             configMapKeyRef:
-              name: metadata-configmap
-              key: mysql_host
+              name: metadata-mysql-configmap
+              key: MYSQL_HOST
         - name: MYSQL_PORT
           valueFrom:
             configMapKeyRef:
-              name: metadata-configmap
-              key: mysql_port
+              name: metadata-mysql-configmap
+              key: MYSQL_PORT
         command: ["/bin/metadata_store_server"]
         args: ["--grpc_port=8080",
                "--mysql_config_database=$(MYSQL_DATABASE)",