dcae el-alto earlydrop updates with released tag

[oom.git] / kubernetes / dcaegen2 / charts / dcae-bootstrap / templates / deployment.yaml

diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/templates/deployment.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/templates/deployment.yaml
index 801c132..be5a769 100644 (file)
--- a/kubernetes/dcaegen2/charts/dcae-bootstrap/templates/deployment.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/templates/deployment.yaml
@@ -1,6 +1,6 @@
 #============LICENSE_START========================================================\r
 # ================================================================================\r
-# Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved.\r
+# Copyright (c) 2017-2019 AT&T Intellectual Property. All rights reserved.\r
 # Modifications Copyright © 2018 Amdocs, Bell Canada\r
 # ================================================================================\r
 # Licensed under the Apache License, Version 2.0 (the "License");\r
@@ -49,6 +49,10 @@ spec:
           - msb-discovery\r
           - --container-name\r
           - kube2msb\r
+          - --container-name\r
+          - dcae-config-binding-service\r
+          - --container-name\r
+          - dcae-db\r
           - "-t"\r
           - "15"\r
         env:\r
@@ -57,10 +61,25 @@ spec:
             fieldRef:\r
               apiVersion: v1\r
               fieldPath: metadata.namespace\r
+      - name: init-tls\r
+        env:\r
+        - name: POD_IP\r
+          valueFrom:\r
+            fieldRef:\r
+              apiVersion: v1\r
+              fieldPath: status.podIP\r
+        image: {{ .Values.global.tlsRepository }}/{{ .Values.global.tlsImage }}\r
+        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}\r
+        resources: {}\r
+        volumeMounts:\r
+        - mountPath: /opt/tls/shared\r
+          name: tls-info\r
       containers:\r
         - name: {{ include "common.name" . }}\r
           image: "{{ include "common.repository" . }}/{{ .Values.image }}"\r
           imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}\r
+          resources:\r
+{{ include "common.resources" . | indent 12 }}\r
           volumeMounts:\r
             - mountPath: /inputs\r
               name: {{ include "common.fullname" . }}-dcae-inputs\r
@@ -69,14 +88,21 @@ spec:
             - mountPath: /etc/localtime\r
               name: localtime\r
               readOnly: true\r
+            - mountPath: /certs\r
+              name: tls-info\r
+              readOnly: true\r
           env:\r
             - name: CMADDR\r
-              value: {{ .Values.config.address.cm }}\r
+              value: {{ .Values.config.address.cm.host }}\r
             - name: CMPASS\r
               valueFrom:\r
                 secretKeyRef:\r
                   name: {{ include "common.name" . }}-cmpass\r
                   key: password\r
+            - name: CMPROTO\r
+              value: {{ .Values.config.address.cm.proto }}\r
+            - name: CMPORT\r
+              value: !!string {{ .Values.config.address.cm.port }}\r
             - name: CONSUL\r
               value: {{ .Values.config.address.consul.host }}:{{ .Values.config.address.consul.port }}\r
             - name: DCAE_NAMESPACE\r
@@ -93,5 +119,7 @@ spec:
         - name: localtime\r
           hostPath:\r
             path: /etc/localtime\r
+        - name: tls-info\r
+          emptyDir: {}\r
       imagePullSecrets:\r
-        - name: "{{ include "common.namespace" . }}-docker-registry-key"
\ No newline at end of file
+        - name: "{{ include "common.namespace" . }}-docker-registry-key"\r