Merge "Expose multicloud endpoints in https"

diff --git a/kubernetes/multicloud/templates/deployment.yaml b/kubernetes/multicloud/templates/deployment.yaml
index c6d6897..ed74032 100644 (file)
--- 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 216ba04..12bbb29 100644 (file)
--- 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 645b826..d075291 100644 (file)
--- 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: