Moving dev back to LF Gerrit

[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 41751f3..3ddcd61 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
@@ -18,7 +18,7 @@
 
 
 kind: Deployment
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 metadata:
   name: {{ include "common.deploymentname.ves" . }}
   generation: 1
@@ -45,9 +45,12 @@ spec:
       volumes:
       - name: component-log
         emptyDir: {}
-      - name: dmaap-config-file
+      - name: ves-config-mount
         configMap:
           name: {{ include "common.configmapname.ves" . }}
+      - name: ves-config-mount-properties
+        configMap:
+          name: {{ include "common.configmapname.ves" . }}-properties
       imagePullSecrets:
       - name: onap-docker-registry-key
       containers:
@@ -55,20 +58,23 @@ spec:
         image: {{ .Values.ves.onapRepository }}/{{ .Values.ves.image.name }}:{{ .Values.ves.image.tag }}
         imagePullPolicy: {{ include "common.pullPolicy" . }}
         ports:
-        - containerPort: {{ include "common.serviceport.ves.http.container" . }}
+        - containerPort: {{ include "common.serviceport.ves.http" . }}
           protocol: TCP
-        - containerPort: {{ include "common.serviceport.ves.https.container" . }}
+        - containerPort: {{ include "common.serviceport.ves.https" . }}
           protocol: TCP
         volumeMounts:
         - name: component-log
           mountPath: "/opt/app/VESCollector/logs/ecomp"
-        - name: dmaap-config-file
+        - name: ves-config-mount
           mountPath: "/opt/app/VESCollector/etc/DmaapConfig.json"
-          subPath: DMaapConfig.json
+          subPath: DmaapConfig.json
+        - name: ves-config-mount-properties
+          mountPath: "/opt/app/VESCollector/etc/collector.properties"
+          subPath: collector.properties
         readinessProbe:
           httpGet:
             path: "/healthcheck"
-            port: {{ include "common.serviceport.ves.http.container" . }}
+            port: {{ include "common.serviceport.ves.http" . }}
             scheme: HTTP
           initialDelaySeconds: 5
           timeoutSeconds: 1
@@ -77,4 +83,4 @@ spec:
           failureThreshold: 1
         terminationMessagePath: "/dev/termination-log"
         terminationMessagePolicy: File
-      restartPolicy: Always
\ No newline at end of file
+      restartPolicy: Always