From 2e5ecc3ab726dc062623aac8d21aa7c79f08cfc6 Mon Sep 17 00:00:00 2001
From: Bin Yang <bin.yang@windriver.com>
Date: Thu, 23 Jan 2020 02:46:07 +0000
Subject: [PATCH] Expose multicloud endpoints in https

Make use of msb iag with https as well

Change-Id: I46320cb7a3012320091b8b802ed8531285b78b45
Issue-ID: MULTICLOUD-978
Signed-off-by: Bin Yang <bin.yang@windriver.com>
---
 kubernetes/multicloud/templates/deployment.yaml | 6 +++++-
 kubernetes/multicloud/templates/service.yaml    | 2 ++
 kubernetes/multicloud/values.yaml               | 8 +++++---
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/kubernetes/multicloud/templates/deployment.yaml b/kubernetes/multicloud/templates/deployment.yaml
index c3e6e5142e..5f645d4f4c 100644
--- a/kubernetes/multicloud/templates/deployment.yaml
+++ b/kubernetes/multicloud/templates/deployment.yaml
@@ -39,6 +39,8 @@ spec:
     spec:
      containers:
      - env:
+       - name: MSB_PROTO
+         value: {{ .Values.config.msbprotocol }}.{{ include "common.namespace" . }}
        - name: MSB_ADDR
          value: {{ .Values.config.msbgateway }}.{{ include "common.namespace" . }}
        - name: MSB_PORT
@@ -53,6 +55,8 @@ spec:
          value: "{{ .Values.config.aai.username }}"
        - name: AAI_PASSWORD
          value: "{{ .Values.config.aai.password }}"
+       - name: SSL_ENABLED
+         value: "{{ .Values.config.ssl_enabled }}"
        resources:
 {{ include "common.resources" . | indent 12 }}
        image: "{{ include "common.repository" . }}/{{ .Values.image }}"
@@ -76,7 +80,7 @@ spec:
          httpGet:
            path: /api/multicloud/v0/swagger.json
            port: {{ .Values.service.internalPort }}
-           scheme: HTTP
+           scheme: HTTPS
          initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
          periodSeconds: {{ .Values.liveness.periodSeconds }}
          timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}
diff --git a/kubernetes/multicloud/templates/service.yaml b/kubernetes/multicloud/templates/service.yaml
index e34bdf4502..64f9de031c 100644
--- a/kubernetes/multicloud/templates/service.yaml
+++ b/kubernetes/multicloud/templates/service.yaml
@@ -33,6 +33,7 @@ metadata:
       "url": "/api/multicloud/v0",
       "protocol": "REST",
       "port": "{{ .Values.service.externalPort }}",
+      "enable_ssl": "{{ .Values.config.ssl_enabled }}",
       "visualRange": "1"
     },
     {
@@ -41,6 +42,7 @@ metadata:
       "url": "/api/multicloud/v1",
       "protocol": "REST",
       "port": "{{ .Values.service.externalPort }}",
+      "enable_ssl": "{{ .Values.config.ssl_enabled }}",
       "visualRange": "1"
     }
     ]'
diff --git a/kubernetes/multicloud/values.yaml b/kubernetes/multicloud/values.yaml
index 645b826efb..d075291db2 100644
--- a/kubernetes/multicloud/values.yaml
+++ b/kubernetes/multicloud/values.yaml
@@ -20,7 +20,7 @@ global:
   nodePortPrefix: 302
   loggingRepository: docker.elastic.co
   loggingImage: beats/filebeat:5.5.0
-  artifactImage: onap/multicloud/framework-artifactbroker:1.4.2
+  artifactImage: onap/multicloud/framework-artifactbroker:1.5.1
   prometheus:
     enabled: false
   persistence: {}
@@ -30,7 +30,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/multicloud/framework:1.4.2
+image: onap/multicloud/framework:1.5.1
 pullPolicy: Always
 
 #Istio sidecar injection policy
@@ -38,8 +38,10 @@ istioSidecar: true
 
 # application configuration
 config:
+  ssl_enabled: true
+  msbprotocol: https
   msbgateway: msb-iag
-  msbPort: 80
+  msbPort: 443
   logstashServiceName: log-ls
   logstashPort: 5044
   aai:
-- 
2.16.6