Remove redundant filebeat from portal-db

[oom.git] / kubernetes / portal / templates / portal-mariadb-deployment.yaml

diff --git a/kubernetes/portal/templates/portal-mariadb-deployment.yaml b/kubernetes/portal/templates/portal-mariadb-deployment.yaml
index a31c6a2..fafcad2 100755 (executable)
--- a/kubernetes/portal/templates/portal-mariadb-deployment.yaml
+++ b/kubernetes/portal/templates/portal-mariadb-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disablePortalPortaldb }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -14,15 +15,18 @@ spec:
       name: portaldb
     spec:
       containers:
-      - image: {{ .Values.image.portaldb}} 
+      - image: {{ .Values.image.portaldb}}
         imagePullPolicy: {{ .Values.pullPolicy }}
         name: "portaldb"
         env:
         - name: MYSQL_HOST
           value: "portaldb.{{ .Values.nsPrefix }}-portal"
         - name: MYSQL_ROOT_PASSWORD
-          value: password
+          value: Aa123456
         volumeMounts:
+        - mountPath: /etc/localtime
+          name: localtime
+          readOnly: true
         - mountPath: /var/lib/mysql
           name: portal-mariadb-data
         ports:
@@ -34,8 +38,12 @@ spec:
           initialDelaySeconds: 5
           periodSeconds: 10
       volumes:
-      - name: portal-mariadb-data
+      - name: localtime
         hostPath:
-          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/mariadb/data
+          path: /etc/localtime
+      - name: portal-mariadb-data
+        persistentVolumeClaim:
+          claimName: portal-db
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}