X-Git-Url: https://gerrit.onap.org/r/gitweb?p=oom.git;a=blobdiff_plain;f=kubernetes%2Fsdc%2Fcharts%2Fsdc-dcae-dt%2Ftemplates%2Fdeployment.yaml;h=20a6194e99ac77f85a5fcadc9a863ee7aa7dfccc;hp=f91335e1fd4be2c80f635221979a340db3991086;hb=b137f7e426b7556a05d1222716d1870ce9dad72c;hpb=76d02071f00c04937e34905e93084f5ea1816cc1

diff --git a/kubernetes/sdc/charts/sdc-dcae-dt/templates/deployment.yaml b/kubernetes/sdc/charts/sdc-dcae-dt/templates/deployment.yaml
index f91335e1fd..20a6194e99 100644
--- a/kubernetes/sdc/charts/sdc-dcae-dt/templates/deployment.yaml
+++ b/kubernetes/sdc/charts/sdc-dcae-dt/templates/deployment.yaml
@@ -20,7 +20,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 }}
@@ -28,7 +28,7 @@ spec:
     metadata:
       labels:
         app: {{ include "common.name" . }}
-        release: {{ .Release.Name }}
+        release: {{ include "common.release" . }}
     spec:
       initContainers:
       - name: {{ include "common.name" . }}-readiness
@@ -52,7 +52,7 @@ spec:
         - /root/job_complete.py
         args:
         - --job-name
-        - {{ .Release.Name }}-sdc-dcae-be-tools
+        - {{ include "common.release" . }}-sdc-dcae-be-tools
         env:
         - name: NAMESPACE
           valueFrom:
@@ -69,14 +69,15 @@ spec:
           {{ if eq .Values.liveness.enabled true }}
           livenessProbe:
             tcpSocket:
-              port: {{ .Values.service.internalPort }}
+              port: {{ .Values.service.internalPort2 }}
             initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
             periodSeconds: {{ .Values.liveness.periodSeconds }}
           {{ end }}
           readinessProbe:
             httpGet:
               path: /dcae/healthCheckOld
-              port: {{ .Values.service.internalPort }}
+              port: {{ .Values.service.internalPort2 }}
+              scheme: HTTPS
             initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
             periodSeconds: {{ .Values.readiness.periodSeconds }}
           env:
@@ -90,12 +91,12 @@ spec:
                 fieldPath: status.podIP
           volumeMounts:
           - name: {{ include "common.fullname" . }}-environments
-            mountPath: /var/opt/dcae-dt/chef-solo/environments/
+            mountPath: /var/lib/jetty/chef-solo/environments/
           - name: {{ include "common.fullname" . }}-localtime
             mountPath: /etc/localtime
             readOnly: true
           - name: {{ include "common.fullname" . }}-logs
-            mountPath: /var/log/onap
+            mountPath: /var/lib/jetty/logs
           - name: {{ include "common.fullname" . }}-logback
             mountPath: /tmp/logback.xml
             subPath: logback.xml
@@ -128,7 +129,7 @@ spec:
             path: /etc/localtime
         - name: {{ include "common.fullname" . }}-filebeat-conf
           configMap:
-            name: {{ .Release.Name }}-sdc-filebeat-configmap
+            name: {{ include "common.release" . }}-sdc-filebeat-configmap
         - name: {{ include "common.fullname" . }}-data-filebeat
           emptyDir: {}
         - name: {{ include "common.fullname" . }}-logback
@@ -136,7 +137,7 @@ spec:
             name : {{ include "common.fullname" . }}-logging-configmap
         - name: {{ include "common.fullname" . }}-environments
           configMap:
-            name: {{ .Release.Name }}-sdc-environments-configmap
+            name: {{ include "common.release" . }}-sdc-environments-configmap
             defaultMode: 0755
         - name:  {{ include "common.fullname" . }}-logs
           emptyDir: {}