From 45221713772167a6d9703b878bd1399e21298e2c Mon Sep 17 00:00:00 2001
From: Dushyanth Chickabasapa <dushyanthsc@google.com>
Date: Wed, 4 Sep 2019 16:53:23 -0700
Subject: [PATCH] manifests/metadata: Metadata server invocation change

Change to update invocation to use command line parameters as against
using proto text.
---
 .../base/metadata/kustomization.yaml          |  2 --
 .../base/metadata/metadata-deployment.yaml    | 29 ++++++++++++-------
 .../base/metadata/mlmd-server-configmap.yaml  | 17 -----------
 3 files changed, 18 insertions(+), 30 deletions(-)
 delete mode 100644 manifests/kustomize/base/metadata/mlmd-server-configmap.yaml

diff --git a/manifests/kustomize/base/metadata/kustomization.yaml b/manifests/kustomize/base/metadata/kustomization.yaml
index 93aa93f8de0..cf651b47ab0 100644
--- a/manifests/kustomize/base/metadata/kustomization.yaml
+++ b/manifests/kustomize/base/metadata/kustomization.yaml
@@ -6,5 +6,3 @@ resources:
   - metadata-service.yaml
   - metadata-envoy-deployment.yaml
   - metadata-envoy-service.yaml
-  - mlmd-server-configmap.yaml
-
diff --git a/manifests/kustomize/base/metadata/metadata-deployment.yaml b/manifests/kustomize/base/metadata/metadata-deployment.yaml
index f6f622ec9fe..305b2794332 100644
--- a/manifests/kustomize/base/metadata/metadata-deployment.yaml
+++ b/manifests/kustomize/base/metadata/metadata-deployment.yaml
@@ -18,17 +18,24 @@ spec:
       - name: container
         image: gcr.io/tfx-oss-public/ml_metadata_store_server:0.14.0
         env:
-        - name: GRPC_PORT
-          value: "8080"
-        - name: METADATA_STORE_SERVER_CONFIG_FILE
-          value: "/etc/config/mlmd_config.prototxt"
+        - name: DBCONFIG_USER
+          valueFrom:
+            secretKeyRef:
+              name: mysql-credential
+              key: username
+        - name: DBCONFIG_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: mysql-credential
+              key: password
+        command: ["/bin/metadata_store_server"]
+        args: ["--grpc_port=8080",
+               "--mysql_config_host=mysql",
+               "--mysql_config_database=metadb",
+               "--mysql_config_port=3306",
+               "--mysql_config_user=$(DBCONFIG_USER)",
+               "--mysql_config_password=$(DBCONFIG_PASSWORD)"
+               ]
         ports:
         - name: md-backendapi
           containerPort: 8080
-        volumeMounts:
-        - name: mlmd-server-config-volume
-          mountPath: /etc/config
-      volumes:
-        - name: mlmd-server-config-volume
-          configMap:
-            name: mlmd-service-configmap
diff --git a/manifests/kustomize/base/metadata/mlmd-server-configmap.yaml b/manifests/kustomize/base/metadata/mlmd-server-configmap.yaml
deleted file mode 100644
index 5bc9972244b..00000000000
--- a/manifests/kustomize/base/metadata/mlmd-server-configmap.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: mlmd-service-configmap
-  labels:
-    component: metadata-server
-data:
-  mlmd_config.prototxt: |
-    connection_config: <
-      mysql: <
-        host: "mysql"
-        port: 3306
-        database: "metadb"
-        user: "root"
-        password: ""
-      >
-    >