aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/multicloud/charts/multicloud-starlingx
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2020-02-05 07:31:50 +0000
committerGerrit Code Review <gerrit@onap.org>2020-02-05 07:31:50 +0000
commit00fd764cb5bdfd020e05a2391639857f6181f0cb (patch)
tree5964791a1dcce49670eb7227157f2b2b8a8a6a87 /kubernetes/multicloud/charts/multicloud-starlingx
parentd622ece51e323fe4586a85d81bf014bfa61bca40 (diff)
parent842a484256b8bf39dc00a70f389914ef733f990f (diff)
Merge "Enable multicloud openstack https endpoints"
Diffstat (limited to 'kubernetes/multicloud/charts/multicloud-starlingx')
-rw-r--r--kubernetes/multicloud/charts/multicloud-starlingx/templates/deployment.yaml6
-rw-r--r--kubernetes/multicloud/charts/multicloud-starlingx/templates/service.yaml2
-rw-r--r--kubernetes/multicloud/charts/multicloud-starlingx/values.yaml6
3 files changed, 11 insertions, 3 deletions
diff --git a/kubernetes/multicloud/charts/multicloud-starlingx/templates/deployment.yaml b/kubernetes/multicloud/charts/multicloud-starlingx/templates/deployment.yaml
index 1ee8172ae2..e800c81cce 100644
--- a/kubernetes/multicloud/charts/multicloud-starlingx/templates/deployment.yaml
+++ b/kubernetes/multicloud/charts/multicloud-starlingx/templates/deployment.yaml
@@ -40,6 +40,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
@@ -54,6 +56,8 @@ spec:
value: "{{ .Values.config.aai.username }}"
- name: AAI_PASSWORD
value: "{{ .Values.config.aai.password }}"
+ - name: SSL_ENABLED
+ value: "{{ .Values.config.ssl_enabled }}"
name: {{ include "common.name" . }}
volumeMounts:
- mountPath: /var/log/onap
@@ -76,7 +80,7 @@ spec:
httpGet:
path: /api/multicloud-starlingx/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/charts/multicloud-starlingx/templates/service.yaml b/kubernetes/multicloud/charts/multicloud-starlingx/templates/service.yaml
index 7e01150e31..cf67f106ee 100644
--- a/kubernetes/multicloud/charts/multicloud-starlingx/templates/service.yaml
+++ b/kubernetes/multicloud/charts/multicloud-starlingx/templates/service.yaml
@@ -32,6 +32,7 @@ metadata:
"url": "/api/multicloud-starlingx/v0",
"protocol": "REST",
"port": "{{ .Values.service.externalPort }}",
+ "enable_ssl": {{ .Values.config.ssl_enabled }},
"visualRange": "1"
},
{
@@ -40,6 +41,7 @@ metadata:
"url": "/api/multicloud-starlingx/v1",
"protocol": "REST",
"port": "{{ .Values.service.externalPort }}",
+ "enable_ssl": {{ .Values.config.ssl_enabled }},
"visualRange": "1"
}
]'
diff --git a/kubernetes/multicloud/charts/multicloud-starlingx/values.yaml b/kubernetes/multicloud/charts/multicloud-starlingx/values.yaml
index 26ecf93367..2dffd1c959 100644
--- a/kubernetes/multicloud/charts/multicloud-starlingx/values.yaml
+++ b/kubernetes/multicloud/charts/multicloud-starlingx/values.yaml
@@ -23,7 +23,7 @@ global:
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/multicloud/openstack-starlingx:1.4.1
+image: onap/multicloud/openstack-starlingx:1.5.3
pullPolicy: Always
#Istio sidecar injection policy
@@ -31,8 +31,10 @@ istioSidecar: false
# application configuration
config:
+ ssl_enabled: true
+ msbprotocol: https
msbgateway: msb-iag
- msbPort: 80
+ msbPort: 443
aai:
port: 8443
schemaVersion: v13