metadata db in overlay (kubeflow#673)

* move metadata-db from base to separate overlay use parameter files for db configuration * kfdef files use db overlay for metadata component * update metadata tests * disable namesuffixhash for generated resources * add prefix to generated resources * update unit test
surajkota · Dec 17, 2019 · fde69d7 · fde69d7
1 parent 980d9e6
commit fde69d7
Show file tree

Hide file tree

Showing 23 changed files with 651 additions and 735 deletions.
diff --git a/kfdef/kfctl_anthos.yaml b/kfdef/kfctl_anthos.yaml
@@ -91,6 +91,7 @@ spec:
       overlays:
       - istio
       - application
+      - db
       repoRef:
         name: manifests
         path: metadata

diff --git a/kfdef/kfctl_aws.yaml b/kfdef/kfctl_aws.yaml
@@ -103,6 +103,7 @@ spec:
       overlays:
       - istio
       - application
+      - db
       repoRef:
         name: manifests
         path: metadata

diff --git a/kfdef/kfctl_aws_cognito.yaml b/kfdef/kfctl_aws_cognito.yaml
@@ -103,6 +103,7 @@ spec:
       overlays:
       - istio
       - application
+      - db
       repoRef:
         name: manifests
         path: metadata

diff --git a/kfdef/kfctl_gcp_basic_auth.yaml b/kfdef/kfctl_gcp_basic_auth.yaml
@@ -105,6 +105,7 @@ spec:
       overlays:
       - istio
       - application
+      - db
       repoRef:
         name: manifests
         path: metadata

diff --git a/kfdef/kfctl_gcp_iap.yaml b/kfdef/kfctl_gcp_iap.yaml
@@ -115,6 +115,7 @@ spec:
       overlays:
       - istio
       - application
+      - db
       repoRef:
         name: manifests
         path: metadata

diff --git a/kfdef/kfctl_istio_dex.yaml b/kfdef/kfctl_istio_dex.yaml
@@ -170,6 +170,7 @@ spec:
       overlays:
       - istio
       - application
+      - db
       repoRef:
         name: manifests
         path: metadata

diff --git a/kfdef/kfctl_k8s_istio.yaml b/kfdef/kfctl_k8s_istio.yaml
@@ -105,6 +105,7 @@ spec:
       overlays:
       - istio
       - application
+      - db
       repoRef:
         name: manifests
         path: metadata

diff --git a/metadata/base/kustomization.yaml b/metadata/base/kustomization.yaml
@@ -7,11 +7,6 @@ configMapGenerator:
 - name: ui-parameters
   env: params.env
 resources:
-- metadata-db-pvc.yaml
-- metadata-db-configmap.yaml
-- metadata-db-secret.yaml
-- metadata-db-deployment.yaml
-- metadata-db-service.yaml
 - metadata-deployment.yaml
 - metadata-service.yaml
 - metadata-ui-deployment.yaml

diff --git a/metadata/base/metadata-db-configmap.yaml b/metadata/base/metadata-db-configmap.yaml
diff --git a/metadata/base/metadata-db-secret.yaml b/metadata/base/metadata-db-secret.yaml
diff --git a/metadata/base/metadata-deployment.yaml b/metadata/base/metadata-deployment.yaml
@@ -17,34 +17,8 @@ spec:
       containers:
       - name: container
         image: gcr.io/kubeflow-images-public/metadata:v0.1.11
-        env:
-        - name: MYSQL_ROOT_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: metadata-db-secrets
-              key: password
-        - name: MYSQL_USER_NAME
-          valueFrom:
-            secretKeyRef:
-              name: metadata-db-secrets
-              key: username
-        - name: MYSQL_DATABASE
-          valueFrom:
-            configMapKeyRef:
-              name: metadata-db-configmap
-              key: mysql_database
-        - name: MYSQL_PORT
-          valueFrom:
-            configMapKeyRef:
-              name: metadata-db-configmap
-              key: mysql_port
         command: ["./server/server",
-                  "--http_port=8080",
-                  "--mysql_service_host=metadata-db.kubeflow",
-                  "--mysql_service_port=$(MYSQL_PORT)",
-                  "--mysql_service_user=$(MYSQL_USER_NAME)",
-                  "--mysql_service_password=$(MYSQL_ROOT_PASSWORD)",
-                  "--mlmd_db_name=$(MYSQL_DATABASE)"]
+                  "--http_port=8080"]
         ports:
         - name: backendapi
           containerPort: 8080
@@ -79,35 +53,8 @@ spec:
       containers:
         - name: container
           image: gcr.io/tfx-oss-public/ml_metadata_store_server:0.15.1
-          env:
-          - name: MYSQL_ROOT_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: metadata-db-secrets
-                key: password
-          - name: MYSQL_USER_NAME
-            valueFrom:
-              secretKeyRef:
-                name: metadata-db-secrets
-                key: username
-          - name: MYSQL_DATABASE
-            valueFrom:
-              configMapKeyRef:
-                name: metadata-db-configmap
-                key: mysql_database
-          - name: MYSQL_PORT
-            valueFrom:
-              configMapKeyRef:
-                name: metadata-db-configmap
-                key: mysql_port
           command: ["/bin/metadata_store_server"]
-          args: ["--grpc_port=8080",
-                 "--mysql_config_host=metadata-db.kubeflow",
-                 "--mysql_config_database=$(MYSQL_DATABASE)",
-                 "--mysql_config_port=$(MYSQL_PORT)",
-                 "--mysql_config_user=$(MYSQL_USER_NAME)",
-                 "--mysql_config_password=$(MYSQL_ROOT_PASSWORD)"
-          ]
+          args: ["--grpc_port=8080"]
           ports:
             - name: grpc-backendapi
               containerPort: 8080
diff --git a/metadata/overlays/db/kustomization.yaml b/metadata/overlays/db/kustomization.yaml
@@ -0,0 +1,34 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+commonLabels:
+  kustomize.component: metadata
+namespace: kubeflow
+generatorOptions:
+  # name suffix hash is not propagated correctly to base resources
+  disableNameSuffixHash: true
+configMapGenerator:
+- name: metadata-db-parameters
+  env: params.env
+secretGenerator:
+- name: metadata-db-secrets
+  env: secrets.env
+bases:
+- ../../base
+resources:
+- metadata-db-pvc.yaml
+- metadata-db-deployment.yaml
+- metadata-db-service.yaml
+patchesStrategicMerge:
+- metadata-deployment.yaml
+images:
+- name: mysql
+  newName: mysql
+  newTag: 8.0.3
+vars:
+- name: metadata-db-service
+  objref:
+    kind: Service
+    name: metadata-db
+    apiVersion: v1
+  fieldref:
+    fieldpath: metadata.name
diff --git a/metadata/base/metadata-db-deployment.yaml → ...a/overlays/db/metadata-db-deployment.yaml b/metadata/base/metadata-db-deployment.yaml → ...a/overlays/db/metadata-db-deployment.yaml
@@ -1,10 +1,13 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: db
+  name: metadata-db
   labels:
     component: db
 spec:
+  selector:
+    matchLabels:
+      component: db
   replicas: 1
   template:
     metadata:
@@ -18,19 +21,11 @@ spec:
         args:
         - --datadir
         - /var/lib/mysql/datadir
-        env:
-          - name: MYSQL_ROOT_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: metadata-db-secrets
-                key: password
-          - name: MYSQL_ALLOW_EMPTY_PASSWORD
-            value: "true"
-          - name: MYSQL_DATABASE
-            valueFrom:
-              configMapKeyRef:
-                name: metadata-db-configmap
-                key: mysql_database
+        envFrom:
+        - configMapRef:
+            name: metadata-db-parameters
+        - secretRef:
+            name: metadata-db-secrets
         ports:
         - name: dbapi
           containerPort: 3306

diff --git a/metadata/base/metadata-db-pvc.yaml → metadata/overlays/db/metadata-db-pvc.yaml b/metadata/base/metadata-db-pvc.yaml → metadata/overlays/db/metadata-db-pvc.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: mysql
+  name: metadata-mysql
 spec:
   accessModes:
     - ReadWriteOnce

diff --git a/metadata/base/metadata-db-service.yaml → ...data/overlays/db/metadata-db-service.yaml b/metadata/base/metadata-db-service.yaml → ...data/overlays/db/metadata-db-service.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: db
+  name: metadata-db
   labels:
     component: db
 spec:

diff --git a/metadata/overlays/db/metadata-deployment.yaml b/metadata/overlays/db/metadata-deployment.yaml
@@ -0,0 +1,61 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: deployment
+  labels:
+    component: server
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      component: server
+  template:
+    metadata:
+      labels:
+        component: server
+    spec:
+      containers:
+      - name: container
+        envFrom:
+          - configMapRef:
+              name: metadata-db-parameters
+          - secretRef:
+              name: metadata-db-secrets
+        command: ["./server/server",
+                  "--http_port=8080",
+                  "--mysql_service_host=$(metadata-db-service)",
+                  "--mysql_service_port=$(MYSQL_PORT)",
+                  "--mysql_service_user=$(MYSQL_USER_NAME)",
+                  "--mysql_service_password=$(MYSQL_ROOT_PASSWORD)",
+                  "--mlmd_db_name=$(MYSQL_DATABASE)"]
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: grpc-deployment
+  labels:
+    component: grpc-server
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      component: grpc-server
+  template:
+    metadata:
+      labels:
+        component: grpc-server
+    spec:
+      containers:
+        - name: container
+          envFrom:
+          - configMapRef:
+              name: metadata-db-parameters
+          - secretRef:
+              name: metadata-db-secrets
+          args: ["--grpc_port=8080",
+                 "--mysql_config_host=$(metadata-db-service)",
+                 "--mysql_config_database=$(MYSQL_DATABASE)",
+                 "--mysql_config_port=$(MYSQL_PORT)",
+                 "--mysql_config_user=$(MYSQL_USER_NAME)",
+                 "--mysql_config_password=$(MYSQL_ROOT_PASSWORD)"
+          ]
diff --git a/metadata/overlays/db/params.env b/metadata/overlays/db/params.env
@@ -0,0 +1,3 @@
+MYSQL_DATABASE=metadb
+MYSQL_PORT=3306
+MYSQL_ALLOW_EMPTY_PASSWORD=true
diff --git a/metadata/overlays/db/secrets.env b/metadata/overlays/db/secrets.env
@@ -0,0 +1,2 @@
+MYSQL_USER_NAME=root
+MYSQL_ROOT_PASSWORD=test