From 694394bbd53bbeca17b7f99dc3a635e422817d25 Mon Sep 17 00:00:00 2001
From: Vijay Venkatesh Kumar <vv770d@att.com>
Date: Thu, 20 Feb 2020 21:50:14 +0000
Subject: dcae sec updates for dashboard and inventory

- Dashboard switched to https + non-root + portal sdk 2.6.0
- InventoryAPI keystore pwd read from file and filebeat support

Change-Id: I40d2f6a8414f0a8fc8ed7b60ed0118e69cdbb2fd
Signed-off-by: Vijay Venkatesh Kumar <vv770d@att.com>
Issue-ID: DCAEGEN2-1592
Issue-ID: OJSI-159
Signed-off-by: Vijay Venkatesh Kumar <vv770d@att.com>
---
 .../dcae-inventory-api/templates/deployment.yaml   | 29 ++++++++++++++++++++++
 1 file changed, 29 insertions(+)

(limited to 'kubernetes/dcaegen2/components/dcae-inventory-api/templates/deployment.yaml')

diff --git a/kubernetes/dcaegen2/components/dcae-inventory-api/templates/deployment.yaml b/kubernetes/dcaegen2/components/dcae-inventory-api/templates/deployment.yaml
index 2bfb01d970..f056079fe4 100644
--- a/kubernetes/dcaegen2/components/dcae-inventory-api/templates/deployment.yaml
+++ b/kubernetes/dcaegen2/components/dcae-inventory-api/templates/deployment.yaml
@@ -101,10 +101,38 @@ spec:
               subPath: config.json
             - mountPath: /opt/cert/
               name: tls-info
+            - mountPath: /opt/logs/
+              name: component-log
           env:
             - name: CONSUL_HOST
               value: consul.{{ include "common.namespace" . }}
+        - name: {{ include "common.name" . }}-filebeat
+          env:
+            - name: POD_IP
+              valueFrom:
+                fieldRef:
+                  apiVersion: v1
+                  fieldPath: status.podIP
+          image: {{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}
+          imagePullPolicy: IfNotPresent
+          resources: {}
+          volumeMounts:
+          - mountPath: /var/log/onap/inventory
+            name: component-log
+          - mountPath: /usr/share/filebeat/data
+            name: filebeat-data
+          - mountPath: /usr/share/filebeat/filebeat.yml
+            name: filebeat-conf
+            subPath: filebeat.yml
       volumes:
+        - emptyDir: {}
+          name: component-log
+        - emptyDir: {}
+          name: filebeat-data
+        - configMap:
+            defaultMode: 420
+            name: {{ include "common.fullname" . }}-filebeat-configmap
+          name: filebeat-conf
         - name: {{ include "common.fullname" . }}-inv-config
           configMap:
             name: {{ include "common.fullname" . }}-configmap
@@ -112,3 +140,4 @@ spec:
           name: tls-info
       imagePullSecrets:
       - name: "{{ include "common.namespace" . }}-docker-registry-key"
+
-- 
cgit