From a4535c94d838cd0d784fd14ff8497be878c81176 Mon Sep 17 00:00:00 2001
From: Vijay Venkatesh Kumar <vv770d@att.com>
Date: Fri, 2 Aug 2019 01:45:23 +0000
Subject: dcae el-alto earlydrop updates with released tag

Following patches into staging are included with corresponding released image tag
https://gerrit.onap.org/r/#/c/oom/+/91759/
https://gerrit.onap.org/r/#/c/oom/+/91832/
https://gerrit.onap.org/r/#/c/oom/+/90603/
https://gerrit.onap.org/r/#/c/oom/+/92569/

Change-Id: I369b8a3cb25476e466e61b6b23d3034f17a461b6
Signed-off-by: Vijay Venkatesh Kumar <vv770d@att.com>
Issue-ID: DCAEGEN2-1318
Issue-ID: DCAEGEN2-913
Issue-ID: DCAEGEN2-1685
Issue-ID: DCAEGEN2-1597
Issue-ID: DCAEGEN2-909
Issue-ID: DCAEGEN2-904
Issue-ID: DCAEGEN2-1513
Issue-ID: DCAEGEN2-1550
Issue-ID: DCAEGEN2-1701
Issue-ID: DCAEGEN2-1694
Issue-ID: DCAEGEN2-1695
Issue-ID: DCAEGEN2-1718
Signed-off-by: Vijay Venkatesh Kumar <vv770d@att.com>
---
 .../charts/dcae-bootstrap/templates/configmap.yaml |  9 +++++++-
 .../dcae-bootstrap/templates/deployment.yaml       | 24 +++++++++++++++++++++-
 2 files changed, 31 insertions(+), 2 deletions(-)

(limited to 'kubernetes/dcaegen2/charts/dcae-bootstrap/templates')

diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/templates/configmap.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/templates/configmap.yaml
index 878d94bfc6..21134ada9f 100644
--- a/kubernetes/dcaegen2/charts/dcae-bootstrap/templates/configmap.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/templates/configmap.yaml
@@ -31,4 +31,11 @@ metadata:
   namespace: {{ include "common.namespace" . }}
 data:
 {{ tpl (.Files.Glob "resources/inputs/*").AsConfig . | indent 2 }}
-
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "common.fullname" . }}-dcae-cacert
+  namespace: {{ include "common.namespace" . }}
+data:
+{{ tpl (.Files.Glob "resources/certs/*").AsConfig . | indent 2 }}
diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/templates/deployment.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/templates/deployment.yaml
index 0463655c79..be5a769a37 100644
--- a/kubernetes/dcaegen2/charts/dcae-bootstrap/templates/deployment.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/templates/deployment.yaml
@@ -61,6 +61,19 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: metadata.namespace
+      - name: init-tls
+        env:
+        - name: POD_IP
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: status.podIP
+        image: {{ .Values.global.tlsRepository }}/{{ .Values.global.tlsImage }}
+        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+        resources: {}
+        volumeMounts:
+        - mountPath: /opt/tls/shared
+          name: tls-info
       containers:
         - name: {{ include "common.name" . }}
           image: "{{ include "common.repository" . }}/{{ .Values.image }}"
@@ -75,14 +88,21 @@ spec:
             - mountPath: /etc/localtime
               name: localtime
               readOnly: true
+            - mountPath: /certs
+              name: tls-info
+              readOnly: true
           env:
             - name: CMADDR
-              value: {{ .Values.config.address.cm }}
+              value: {{ .Values.config.address.cm.host }}
             - name: CMPASS
               valueFrom:
                 secretKeyRef:
                   name: {{ include "common.name" . }}-cmpass
                   key: password
+            - name: CMPROTO
+              value: {{ .Values.config.address.cm.proto }}
+            - name: CMPORT
+              value: !!string {{ .Values.config.address.cm.port }}
             - name: CONSUL
               value: {{ .Values.config.address.consul.host }}:{{ .Values.config.address.consul.port }}
             - name: DCAE_NAMESPACE
@@ -99,5 +119,7 @@ spec:
         - name: localtime
           hostPath:
             path: /etc/localtime
+        - name: tls-info
+          emptyDir: {}
       imagePullSecrets:
         - name: "{{ include "common.namespace" . }}-docker-registry-key"
-- 
cgit 1.2.3-korg