X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fsdnc%2Fsdnc-prom%2Ftemplates%2Fdeployment.yaml;h=7492b5501e219e1b73ff4b4bd013d29a975f5a66;hb=160e971bb432d7ef9e2237c5e71c9d6af62144df;hp=d457bd8f9802097c9dd2b85a49c01a281c120fe1;hpb=dac3964c79b4f203a60fa6da34d110c45242fb1e;p=oom.git

diff --git a/kubernetes/sdnc/sdnc-prom/templates/deployment.yaml b/kubernetes/sdnc/sdnc-prom/templates/deployment.yaml
index d457bd8f98..7492b5501e 100644
--- a/kubernetes/sdnc/sdnc-prom/templates/deployment.yaml
+++ b/kubernetes/sdnc/sdnc-prom/templates/deployment.yaml
@@ -1,3 +1,4 @@
+{{/*
 # Copyright © 2018 Amdocs
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,6 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+*/}}
 
 apiVersion: extensions/v1beta1
 kind: Deployment
@@ -20,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: 1
@@ -28,7 +30,7 @@ spec:
     metadata:
       labels:
         app: {{ include "common.name" . }}
-        release: {{ .Release.Name }}
+        release: {{ include "common.release" . }}
     spec:
       initContainers:
       - command:
@@ -53,7 +55,7 @@ spec:
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         envFrom:
           - configMapRef:
-              name: {{ .Release.Name }}-sdnc-env
+              name: {{ include "common.release" . }}-sdnc-env
         workingDir: "/app"
         command: [ "bin/prom.sh" ]
         volumeMounts:
@@ -89,7 +91,11 @@ spec:
             name: {{ include "common.fullname" . }}-scripts
             defaultMode: 0755
         - name: core-dns-keyfile
-          hostPath:
-            path: {{ .Values.global.persistence.mountPath | default .Values.persistence.mountPath }}/{{ .Release.Name }}/{{ .Values.persistence.mountSubPath }}
+        {{- if .Values.persistence.enabled }}
+          persistentVolumeClaim:
+            claimName: {{ include "common.fullname" . }}
+        {{- else }}
+          emptyDir: {}
+        {{- end }}
       imagePullSecrets:
         - name: {{ include "common.namespace" . }}-docker-registry-key"