[SDC] Fix MSB annotation for sdc-be service port

Currently sdc-be 8080(http) port is disabled and no longer used,
but the MSB annotation still points to that port so an issue
occurs when a client tries to communicate with SDC via MSB.

This will change the service port to 8443(https) in the annotation,
and also pass 'enable_ssl' param so that MSB will use https
scheme in proxying communication.

Issue-ID: SDC-3314
Signed-off-by: Satoshi Fujii <fujii-satoshi@jp.fujitsu.com>
Change-Id: I0f11fbe55fb21048571b657249b01065a2c0b443

diff --git a/kubernetes/common/common/templates/_service.tpl b/kubernetes/common/common/templates/_service.tpl
index 3d745ed..dddd634 100644 (file)
--- a/kubernetes/common/common/templates/_service.tpl
+++ b/kubernetes/common/common/templates/_service.tpl
@@ -94,6 +94,7 @@ annotations:
         "version": "{{ default "v1" $msb_information.version }}",
         "url": "{{ default "/" $msb_information.url }}",
         "protocol": "{{ default "REST" $msb_information.protocol }}",
+        "enable_ssl": {{ default false $msb_information.enable_ssl }},
         "port": "{{ $msb_information.port }}",
         "visualRange":"{{ default "1" $msb_information.visualRange }}"
       }

diff --git a/kubernetes/sdc/components/sdc-be/values.yaml b/kubernetes/sdc/components/sdc-be/values.yaml
index b825b70..03b6db0 100644 (file)
--- a/kubernetes/sdc/components/sdc-be/values.yaml
+++ b/kubernetes/sdc/components/sdc-be/values.yaml
@@ -104,12 +104,13 @@ service:
   name: sdc-be
   both_tls_and_plain: true
   msb:
-    - port: 8080
+    - port: 8443
       url: "/sdc/v1"
       version: "v1"
       protocol: "REST"
       visualRange: "1"
       serviceName: sdc
+      enable_ssl: true
     - port: 8080
       url: "/sdc/v1"
       version: "v1"