aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/multicloud/components/multicloud-starlingx/resources/config
diff options
context:
space:
mode:
authorAndreas Geissler <andreas-geissler@telekom.de>2022-05-13 16:54:43 +0200
committerJack Lucas <jflos@sonoris.net>2022-09-14 13:22:29 +0000
commitdfa23c83cc8630915824968ba7b043ef968e38b6 (patch)
treee86e83dd0cbae293ce845ddb3d38bcb4ae40c448 /kubernetes/multicloud/components/multicloud-starlingx/resources/config
parent8cd7e264e2a8d7f6686065f882b3b2f0663a6690 (diff)
[MULTICLOUD] Service mesh compatibility
Patch on MC charts dedicated to make http/https calls depending on configuration for TLS. Include an updated version of the framework-artifactbroker Issue-ID: OOM-3015 Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de> Change-Id: I03deae9dcea703540fe6e3a81ddba20505f246f1
Diffstat (limited to 'kubernetes/multicloud/components/multicloud-starlingx/resources/config')
-rw-r--r--kubernetes/multicloud/components/multicloud-starlingx/resources/config/log/config.json11
1 files changed, 8 insertions, 3 deletions
diff --git a/kubernetes/multicloud/components/multicloud-starlingx/resources/config/log/config.json b/kubernetes/multicloud/components/multicloud-starlingx/resources/config/log/config.json
index da0727c3a7..ebc53849d6 100644
--- a/kubernetes/multicloud/components/multicloud-starlingx/resources/config/log/config.json
+++ b/kubernetes/multicloud/components/multicloud-starlingx/resources/config/log/config.json
@@ -5,7 +5,7 @@
"port":9014,
"userName":"healthcheck",
"password":"zb!XztG34",
- "https":true
+ "https":{{ (eq "true" (include "common.needTLS" .)) | ternary true false }}
},
"receptionHandlerParameters":{
"SDCReceptionHandler":{
@@ -27,7 +27,7 @@
"sdcConfiguration":{
"parameterClassName":"org.onap.policy.distribution.reception.handling.sdc.SdcReceptionHandlerConfigurationParameterGroup",
"parameters":{
- "asdcAddress": "sdc-be.{{ include "common.namespace" . }}:8443",
+ "asdcAddress": "sdc-be.{{ include "common.namespace" . }}:{{ (eq "true" (include "common.needTLS" .)) | ternary 8443 8080 }}",
"messageBusAddress": [
"message-router.{{ include "common.namespace" . }}"
],
@@ -53,7 +53,12 @@
"keystorePassword": "null",
"activeserverTlsAuth": false,
"isFilterinEmptyResources": true,
- "isUseHttpsWithDmaap": false
+ "isUseHttpsWithDmaap": false,
+ "isUseHttpsWithSDC": {{ (eq "true" (include "common.needTLS" .)) | ternary true false }},
+ "httpsproxyHost": "null",
+ "httpproxyHost": "null",
+ "httpsproxyPort": 8181,
+ "httpproxyPort": 8080
}
}
},