Merge "[COMMON] new logConfiguration chart"

[oom.git] / kubernetes / multicloud / charts / multicloud-pike / templates / deployment.yaml

diff --git a/kubernetes/multicloud/charts/multicloud-pike/templates/deployment.yaml b/kubernetes/multicloud/charts/multicloud-pike/templates/deployment.yaml
index 518ce8a..76f3e8c 100644 (file)
--- a/kubernetes/multicloud/charts/multicloud-pike/templates/deployment.yaml
+++ b/kubernetes/multicloud/charts/multicloud-pike/templates/deployment.yaml
@@ -14,7 +14,7 @@
 # limitations under the License.
 */}}
 
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "common.fullname" . }}
@@ -22,7 +22,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 }}
@@ -33,7 +33,7 @@ spec:
     metadata:
       labels:
         app: {{ include "common.name" . }}
-        release: {{ .Release.Name }}
+        release: {{ include "common.release" . }}
       name: {{ include "common.name" . }}
       annotations:
         sidecar.istio.io/inject: "{{.Values.istioSidecar}}"
@@ -92,7 +92,7 @@ spec:
        - mountPath: /var/log/onap
          name: pike-log
        - mountPath: /usr/share/filebeat/data
-         name: pike-pike-filebeat
+         name: pike-data-filebeat
 
      volumes:
      - name: pike-log