synching up SO 1.1

[oom.git] / kubernetes / mso / templates / db-deployment.yaml

diff --git a/kubernetes/mso/templates/db-deployment.yaml b/kubernetes/mso/templates/db-deployment.yaml
index ff1cf75..d105744 100644 (file)
--- a/kubernetes/mso/templates/db-deployment.yaml
+++ b/kubernetes/mso/templates/db-deployment.yaml
@@ -2,9 +2,8 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: mariadb
-  namespace: {{ .Values.NS }}
+  namespace: "{{ .Values.nsPrefix }}-mso"
 spec:
-  replicas: 1
   selector:
     matchLabels:
       app: mariadb
@@ -23,15 +22,16 @@ spec:
         env:
           - name: MYSQL_ROOT_PASSWORD
             value: password
-          - name: MARIADB_MAJOR
-            value: "10.1"
-          - name: MARIADB_VERSION
-            value: "10.1.11+maria-1~jessie"
         volumeMounts:
+        - mountPath: /etc/localtime
+          name: localtime
+          readOnly: true
         - mountPath: /etc/mysql/conf.d
           name: mso-mariadb-conf
         - mountPath: /docker-entrypoint-initdb.d
           name: mso-mariadb-docker-entrypoint-initdb
+        - mountPath: /var/lib/mysql
+          name: mso-mariadb-data
         ports:
         - containerPort: 3306
           name: mariadb
@@ -41,11 +41,17 @@ spec:
           initialDelaySeconds: 5
           periodSeconds: 10
       volumes:
+        - name: localtime
+          hostPath:
+            path: /etc/localtime
         - name: mso-mariadb-conf
           hostPath:
-            path: /dockerdata-nfs/onap/mso/mariadb/conf.d
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/mso/mariadb/conf.d
         - name: mso-mariadb-docker-entrypoint-initdb
           hostPath:
-            path: /dockerdata-nfs/onap/mso/mariadb/docker-entrypoint-initdb.d
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/mso/mariadb/docker-entrypoint-initdb.d
+        - name: mso-mariadb-data
+          persistentVolumeClaim:
+            claimName: mso-db
       imagePullSecrets:
-      - name: onap-docker-registry-key
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"