X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=ric-aux%2F80-Auxiliary-Functions%2Fhelm%2Fves%2Ftemplates%2Fves-deployment.yaml;h=05040f8d88344cfe69a2c54f7de15ec2079b02ca;hb=9af6b6ee209de8b09df1a19ea34e4c7d951006a1;hp=e730cf6680b4e5060122e60de12799447cacf982;hpb=88657efe9e96a83cda32bf8c642d1dd03013aad2;p=it%2Fdep.git

diff --git a/ric-aux/80-Auxiliary-Functions/helm/ves/templates/ves-deployment.yaml b/ric-aux/80-Auxiliary-Functions/helm/ves/templates/ves-deployment.yaml
index e730cf66..05040f8d 100644
--- a/ric-aux/80-Auxiliary-Functions/helm/ves/templates/ves-deployment.yaml
+++ b/ric-aux/80-Auxiliary-Functions/helm/ves/templates/ves-deployment.yaml
@@ -20,59 +20,45 @@
 kind: Deployment
 apiVersion: extensions/v1beta1
 metadata:
-  name: {{ include "vescollector.fullname" . }}
+  name: {{ include "common.deploymentname.ves" . }}
   generation: 1
   labels:
-    app: dcae-ves-collector
-    cfydeployment: ves
-    cfynode: ves
-    cfynodeinstance: ves_uj48fg
-    k8sdeployment: dep-dcae-ves-collector
+    app: {{ include "common.namespace.aux" . }}-{{ include "common.name.ves" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
   annotations:
     deployment.kubernetes.io/revision: '1'
 spec:
   replicas: {{ .Values.ves.replicaCount }}
   selector:
     matchLabels:
-      app: dcae-ves-collector
-      cfydeployment: ves
-      cfynode: ves
-      cfynodeinstance: ves_uj48fg
-      k8sdeployment: dep-dcae-ves-collector
+      app: {{ include "common.namespace.aux" . }}-{{ include "common.name.ves" . }}
+      release: {{ .Release.Name }}
   template:
     metadata:
       labels:
-        app: dcae-ves-collector
-        cfydeployment: ves
-        cfynode: ves
-        cfynodeinstance: ves_uj48fg
-        k8sdeployment: dep-dcae-ves-collector
+        app: {{ include "common.namespace.aux" . }}-{{ include "common.name.ves" . }}
+        release: {{ .Release.Name }}
     spec:
+      hostname: {{ include "common.name.ves" . }}
       volumes:
       - name: component-log
         emptyDir: {}
       - name: dmaap-config-file
         configMap:
-          name: dmaap-configmap
+          name: {{ include "common.configmapname.ves" . }}
+        imagePullPolicy: {{ include "common.pullPolicy" . }}
+      imagePullSecrets:
+      - name: onap-docker-registry-key
       containers:
-      - name: {{ include "common.namespace" . }}-{{include "common.name" . }}
+      - name: {{ include "common.containername.ves" . }}
         image: {{ .Values.ves.onapRepository }}/{{ .Values.ves.image.name }}:{{ .Values.ves.image.tag }}
         ports:
-        - containerPort: 8080
+        - containerPort: {{ include "common.serviceport.ves.http.container" . }}
           protocol: TCP
-        - containerPort: 8443
+        - containerPort: {{ include "common.serviceport.ves.https.container" . }}
           protocol: TCP
-        env:
-        - name: CONSUL_HOST
-          value: consul-server.onap
-        - name: CONFIG_BINDING_SERVICE
-          value: config-binding-service
-        - name: POD_IP
-          valueFrom:
-            fieldRef:
-              apiVersion: v1
-              fieldPath: status.podIP
-        resources: {}
         volumeMounts:
         - name: component-log
           mountPath: "/opt/app/VESCollector/logs/ecomp"
@@ -82,7 +68,7 @@ spec:
         readinessProbe:
           httpGet:
             path: "/healthcheck"
-            port: 8080
+            port: {{ include "common.serviceport.ves.http.container" . }}
             scheme: HTTP
           initialDelaySeconds: 5
           timeoutSeconds: 1
@@ -91,19 +77,4 @@ spec:
           failureThreshold: 1
         terminationMessagePath: "/dev/termination-log"
         terminationMessagePolicy: File
-        imagePullPolicy: IfNotPresent
-      restartPolicy: Always
-      terminationGracePeriodSeconds: 30
-      dnsPolicy: ClusterFirst
-      securityContext: {}
-      imagePullSecrets:
-      - name: onap-docker-registry-key
-      hostname: dcae-ves-collector
-      schedulerName: default-scheduler
-  strategy:
-    type: RollingUpdate
-    rollingUpdate:
-      maxUnavailable: 1
-      maxSurge: 1
-  revisionHistoryLimit: 10
-  progressDeadlineSeconds: 600
+      restartPolicy: Always
\ No newline at end of file