From: Alexis de Talhouët <alexis.de_talhouet@bell.ca>
Date: Mon, 12 Mar 2018 18:17:25 +0000 (+0000)
Subject: Merge "  Sidecar filebeat container and ConfigMap"
X-Git-Tag: 2.0.0-ONAP~392
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=oom.git;a=commitdiff_plain;h=420dc067b7b4608fc840b3062d5369adff7deadd;hp=-c

Merge "  Sidecar filebeat container and ConfigMap"
---

420dc067b7b4608fc840b3062d5369adff7deadd
diff --combined kubernetes/multicloud/templates/framework-deployment.yaml
index 4f96fbf457,f0c886506f..b9b130c90f
--- a/kubernetes/multicloud/templates/framework-deployment.yaml
+++ b/kubernetes/multicloud/templates/framework-deployment.yaml
@@@ -5,7 -5,6 +5,7 @@@ metadata
    name: multicloud-framework
    namespace: "{{ .Values.nsPrefix }}"
  spec:
 +  replicas: {{ .Values.frameworkReplicas }}
    selector:
      matchLabels:
        app: framework
@@@ -15,7 -14,6 +15,6 @@@
          app: framework
        name: multicloud-framework
      spec:
-      hostname: framework
       containers:
       - env:
         - name: MSB_ADDR
@@@ -32,12 -30,15 +31,15 @@@
           value: "AAI"
         - name: AAI_PASSWORD
           value: "AAI"
+        image: {{ .Values.image.framework }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
         name: framework
         volumeMounts:
-        - mountPath: /service/multivimbroker/logs
+        - mountPath: /var/log/onap
           name: framework-log
-        image: {{ .Values.image.framework }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
+        - mountPath: /opt/multivimbroker/multivimbroker/pub/config/log.yml
+          name: framework-logconfig
+          subPath: log.yml
         ports:
         - containerPort: 9001
         livenessProbe:
@@@ -50,11 -51,29 +52,29 @@@
           timeoutSeconds: 10
           successThreshold: 1
           failureThreshold: 5
-      restartPolicy: Always
+      - image: {{ .Values.image.filebeat }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        name: filebeat-onap
+        volumeMounts:
+        - mountPath: /usr/share/filebeat/filebeat.yml
+          name: filebeat-conf
+          subPath: filebeat.yml
+        - mountPath: /var/log/onap
+          name: framework-log
+        - mountPath: /usr/share/filebeat/data
+          name: framework-data-filebeat
       volumes:
       - name: framework-log
-        hostPath:
-          path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/multicloud/framework/logs
+        emptyDir: {}
+      - name: framework-data-filebeat
+        emptyDir: {}
+      - name: filebeat-conf
+        configMap:
+          name: multicloud-filebeat-configmap
+      - name: framework-logconfig
+        configMap:
+          name: multicloud-framework-log-configmap
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+      restartPolicy: Always
  #{{ end }}
diff --combined kubernetes/multicloud/templates/multicloud-vio-deployment.yaml
index 7919bc89f5,30413af245..579f8a8cf3
--- a/kubernetes/multicloud/templates/multicloud-vio-deployment.yaml
+++ b/kubernetes/multicloud/templates/multicloud-vio-deployment.yaml
@@@ -5,7 -5,6 +5,7 @@@ metadata
    name: multicloud-vio
    namespace: "{{ .Values.nsPrefix }}"
  spec:
 +  replicas: {{ .Values.vioReplicas }}
    selector:
      matchLabels:
        app: multicloud-vio
@@@ -15,7 -14,6 +15,6 @@@
          app: multicloud-vio
        name: multicloud-vio
      spec:
-      hostname: multicloud-vio
       containers:
       - env:
         - name: MSB_ADDR
@@@ -34,8 -32,11 +33,11 @@@
           value: "AAI"
         name: multicloud-vio
         volumeMounts:
-        - mountPath: /service/vio/logs
+        - mountPath: /var/log/onap
           name: vio-log
+        - mountPath: /opt/vio/vio/pub/config/log.yml
+          name: vio-logconfig
+          subPath: log.yml
         image: {{ .Values.image.vio }}
         imagePullPolicy: {{ .Values.pullPolicy }}
         ports:
@@@ -50,11 -51,29 +52,29 @@@
           timeoutSeconds: 10
           successThreshold: 1
           failureThreshold: 5
-      restartPolicy: Always
+      - image: {{ .Values.image.filebeat }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        name: filebeat-onap
+        volumeMounts:
+        - mountPath: /usr/share/filebeat/filebeat.yml
+          name: filebeat-conf
+          subPath: filebeat.yml
+        - mountPath: /var/log/onap
+          name: vio-log
+        - mountPath: /usr/share/filebeat/data
+          name: vio-data-filebeat
       volumes:
       - name: vio-log
-        hostPath:
-          path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/multicloud/vio/logs
+        emptyDir: {}
+      - name: vio-data-filebeat
+        emptyDir: {}
+      - name: filebeat-conf
+        configMap:
+          name: multicloud-filebeat-configmap
+      - name: vio-logconfig
+        configMap:
+          name: multicloud-vio-log-configmap
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+      restartPolicy: Always
  #{{ end }}
diff --combined kubernetes/multicloud/values.yaml
index a903bae1c3,704f0250b0..9f49096b5f
--- a/kubernetes/multicloud/values.yaml
+++ b/kubernetes/multicloud/values.yaml
@@@ -2,17 -2,13 +2,17 @@@ nsPrefix: ona
  pullPolicy: Always
  nodePortPrefix: 302
  dataRootDir: /dockerdata-nfs
 +frameworkReplicas: 1
 +ocataReplicas: 1
 +vioReplicas: 1
 +windRiverReplicas: 1
  image:
    readiness: oomk8s/readiness-check:1.1.0
-   framework: nexus3.onap.org:10001/onap/multicloud/framework:v1.0.0
-   vio: nexus3.onap.org:10001/onap/multicloud/vio:v1.0.0
+   framework: nexus3.onap.org:10001/onap/multicloud/framework:latest
+   vio: nexus3.onap.org:10001/onap/multicloud/vio:latest
    ocata: nexus3.onap.org:10001/onap/multicloud/openstack-ocata:v1.0.0
    windriver: nexus3.onap.org:10001/onap/multicloud/openstack-windriver:v1.0.0
- 
+   filebeat: docker.elastic.co/beats/filebeat:5.5.0
  # domain name of msb gateway
  msbgateway: msb-iag.{{ .Values.nsPrefix }}
  msbPort: 80