X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fclamp%2Fcharts%2Fmariadb%2Ftemplates%2Fdeployment.yaml;h=be46f894339e8e0aa47da2119577a10a89fcbfbd;hb=780c64a822838056411a7e0ddc584101726fc53a;hp=06c7cb72019d4ef1f33e92d939b54c25a818f962;hpb=c45fc016023a9dfc80677ed64b40abdf53015fbd;p=oom.git

diff --git a/kubernetes/clamp/charts/mariadb/templates/deployment.yaml b/kubernetes/clamp/charts/mariadb/templates/deployment.yaml
index 06c7cb7201..be46f89433 100644
--- a/kubernetes/clamp/charts/mariadb/templates/deployment.yaml
+++ b/kubernetes/clamp/charts/mariadb/templates/deployment.yaml
@@ -21,7 +21,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 spec:
   replicas: {{ .Values.replicaCount }}
@@ -29,7 +29,7 @@ spec:
     metadata:
       labels:
         app: {{ include "common.name" . }}
-        release: {{ .Release.Name }}
+        release: {{ include "common.release" . }}
     spec:
       containers:
         - name: {{ include "common.name" .  }}
@@ -58,14 +58,12 @@ spec:
                   name: {{ template "common.fullname" . }}
                   key: db-root-password
           volumeMounts:
-          - mountPath: /docker-entrypoint-initdb.d/load-sql-files-tests-automation.sh
+          - mountPath: /docker-entrypoint-initdb.d/bootstrap-database.sh
             name: docker-entrypoint-initdb
-            subPath: load-sql-files-tests-automation.sh
+            subPath: bootstrap-database.sh
           - mountPath: /etc/localtime
             name: localtime
             readOnly: true
-          - mountPath: /docker-entrypoint-initdb.d/drop/
-            name: docker-entrypoint-clds-drop
           - mountPath: /docker-entrypoint-initdb.d/bulkload/
             name: docker-entrypoint-bulkload
           - mountPath: /etc/mysql/conf.d/conf1/
@@ -73,7 +71,7 @@ spec:
           - mountPath: /var/lib/mysql
             name: clamp-mariadb-data
           resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
         {{- if .Values.nodeSelector }}
         nodeSelector:
 {{ toYaml .Values.nodeSelector | indent 10 }}
@@ -93,9 +91,6 @@ spec:
         - name: docker-entrypoint-initdb
           configMap:
             name: clamp-entrypoint-initdb-configmap
-        - name: docker-entrypoint-clds-drop
-          configMap:
-            name: clamp-entrypoint-drop-configmap
         - name: docker-entrypoint-bulkload
           configMap:
             name: clamp-entrypoint-bulkload-configmap