ves collector chart adapter to use common chart definitions

[it/dep.git] / ric-aux / 80-Auxiliary-Functions / helm / ves / templates / ves-deployment.yaml

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 6d79ac7..05040f8 100644 (file)
--- 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\r
 apiVersion: extensions/v1beta1\r
 metadata:\r
-  name: {{ include "vescollector.fullname" . }}\r
+  name: {{ include "common.deploymentname.ves" . }}\r
   generation: 1\r
   labels:\r
-    app: dcae-ves-collector\r
-    cfydeployment: ves\r
-    cfynode: ves\r
-    cfynodeinstance: ves_uj48fg\r
-    k8sdeployment: dep-dcae-ves-collector\r
+    app: {{ include "common.namespace.aux" . }}-{{ include "common.name.ves" . }}\r
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}\r
+    release: {{ .Release.Name }}\r
+    heritage: {{ .Release.Service }}\r
   annotations:\r
     deployment.kubernetes.io/revision: '1'\r
 spec:\r
   replicas: {{ .Values.ves.replicaCount }}\r
   selector:\r
     matchLabels:\r
-      app: dcae-ves-collector\r
-      cfydeployment: ves\r
-      cfynode: ves\r
-      cfynodeinstance: ves_uj48fg\r
-      k8sdeployment: dep-dcae-ves-collector\r
+      app: {{ include "common.namespace.aux" . }}-{{ include "common.name.ves" . }}\r
+      release: {{ .Release.Name }}\r
   template:\r
     metadata:\r
       labels:\r
-        app: dcae-ves-collector\r
-        cfydeployment: ves\r
-        cfynode: ves\r
-        cfynodeinstance: ves_uj48fg\r
-        k8sdeployment: dep-dcae-ves-collector\r
+        app: {{ include "common.namespace.aux" . }}-{{ include "common.name.ves" . }}\r
+        release: {{ .Release.Name }}\r
     spec:\r
+      hostname: {{ include "common.name.ves" . }}\r
       volumes:\r
       - name: component-log\r
         emptyDir: {}\r
       - name: dmaap-config-file\r
         configMap:\r
-          name: dmaap-configmap\r
+          name: {{ include "common.configmapname.ves" . }}\r
+        imagePullPolicy: {{ include "common.pullPolicy" . }}\r
+      imagePullSecrets:\r
+      - name: onap-docker-registry-key\r
       containers:\r
-      - name: {{ include "common.namespace" . }}-{{include "common.name" . }}\r
+      - name: {{ include "common.containername.ves" . }}\r
         image: {{ .Values.ves.onapRepository }}/{{ .Values.ves.image.name }}:{{ .Values.ves.image.tag }}\r
         ports:\r
         - containerPort: {{ include "common.serviceport.ves.http.container" . }}\r
           protocol: TCP\r
         - containerPort: {{ include "common.serviceport.ves.https.container" . }}\r
           protocol: TCP\r
-        env:\r
-        - name: CONSUL_HOST\r
-          value: consul-server.onap\r
-        - name: CONFIG_BINDING_SERVICE\r
-          value: config-binding-service\r
-        - name: POD_IP\r
-          valueFrom:\r
-            fieldRef:\r
-              apiVersion: v1\r
-              fieldPath: status.podIP\r
-        resources: {}\r
         volumeMounts:\r
         - name: component-log\r
           mountPath: "/opt/app/VESCollector/logs/ecomp"\r
@@ -91,19 +77,4 @@ spec:
           failureThreshold: 1\r
         terminationMessagePath: "/dev/termination-log"\r
         terminationMessagePolicy: File\r
-        imagePullPolicy: IfNotPresent\r
-      restartPolicy: Always\r
-      terminationGracePeriodSeconds: 30\r
-      dnsPolicy: ClusterFirst\r
-      securityContext: {}\r
-      imagePullSecrets:\r
-      - name: onap-docker-registry-key\r
-      hostname: dcae-ves-collector\r
-      schedulerName: default-scheduler\r
-  strategy:\r
-    type: RollingUpdate\r
-    rollingUpdate:\r
-      maxUnavailable: 1\r
-      maxSurge: 1\r
-  revisionHistoryLimit: 10\r
-  progressDeadlineSeconds: 600\r
+      restartPolicy: Always
\ No newline at end of file