Add TLS server support for CM and CBS

Issue-ID: DCAEGEN2-909
Issue-ID: DCAEGEN2-904
Issue-ID: DCAEGEN2-1513
Issue-ID: DCAEGEN2-1550
Issue-ID: DCAEGEN2-1550
Change-Id: Ia59284e3ed786dcecd397482ca04b6b06c7e610d
Signed-off-by: Jack Lucas <jflucas@research.att.com>

3 files changed, 29 insertions, 4 deletions

diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-dashboard-inputs.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-dashboard-inputs.yaml
index e40a03068c..2718e1882f 100644
--- a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-dashboard-inputs.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-dashboard-inputs.yaml
@@ -24,7 +24,7 @@ external_tls_port: {{ .Values.config.address.dashboard.portSecure }}
 database_cluster_name: {{ .Values.postgres.service.name2 }}.{{ include "common.namespace" . }}
 database_cluster_fqdn: {{ .Values.postgres.service.name2 }}.{{ include "common.namespace" . }}.{{ .Values.postgres.suffix }}
 database_name: "dashboard_pg"
-cloudify_ip: {{ .Values.config.address.cm }}
+cloudify_ip: {{ .Values.config.address.cm.host }}
 cloudify_user: "admin"
 cloudify_password: "admin"
 consul_url:  {{ .Values.config.address.consul_ui }}
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"

diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml
index aec082fe15..882cf371e7 100644
--- a/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml
@@ -38,7 +38,10 @@ config:
       host: consul-server
       port: 8500
     consul_ui: consul-server-ui
-    cm: dcae-cloudify-manager
+    cm:
+      host: dcae-cloudify-manager
+      port: 443
+      proto: https
     dashboard:
       port: 30418
       portSecure: 30419
@@ -90,7 +93,7 @@ postgres:
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container:1.4.18
+image: onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container:1.6.0-STAGING-latest
 default_k8s_location: central
 
 # DCAE component images to be deployed via Cloudify Manager