summaryrefslogtreecommitdiffstats
path: root/kubernetes/multicloud/components/multicloud-windriver
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-windriver
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-windriver')
-rw-r--r--kubernetes/multicloud/components/multicloud-windriver/resources/config/log/config.json11
-rw-r--r--kubernetes/multicloud/components/multicloud-windriver/templates/deployment.yaml12
-rw-r--r--kubernetes/multicloud/components/multicloud-windriver/templates/service.yaml6
-rw-r--r--kubernetes/multicloud/components/multicloud-windriver/values.yaml7
4 files changed, 21 insertions, 15 deletions
diff --git a/kubernetes/multicloud/components/multicloud-windriver/resources/config/log/config.json b/kubernetes/multicloud/components/multicloud-windriver/resources/config/log/config.json
index 655076a901..e34637666f 100644
--- a/kubernetes/multicloud/components/multicloud-windriver/resources/config/log/config.json
+++ b/kubernetes/multicloud/components/multicloud-windriver/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
}
}
},
diff --git a/kubernetes/multicloud/components/multicloud-windriver/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-windriver/templates/deployment.yaml
index 7656632737..8eadcf689d 100644
--- a/kubernetes/multicloud/components/multicloud-windriver/templates/deployment.yaml
+++ b/kubernetes/multicloud/components/multicloud-windriver/templates/deployment.yaml
@@ -50,15 +50,15 @@ spec:
containers:
- env:
- name: MSB_PROTO
- value: {{ .Values.config.msbprotocol }}
+ value: "{{ if (include "common.needTLS" .) }}https{{ else }}http{{ end }}"
- name: MSB_ADDR
value: "{{ .Values.config.msbgateway }}.{{ include "common.namespace" . }}"
- name: MSB_PORT
- value: "{{ .Values.config.msbPort }}"
+ value: "{{- if (include "common.needTLS" .) }}{{ .Values.config.msbPort }}{{ else }}{{ .Values.config.msbPlainPort }}{{ end }}"
- name: AAI_ADDR
- value: aai.{{ include "common.namespace" . }}
+ value: "aai.{{ include "common.namespace" . }}"
- name: AAI_PORT
- value: "{{ .Values.config.aai.port }}"
+ value: "{{- if (include "common.needTLS" .) }}{{ .Values.config.aai.aaiPort }}{{ else }}{{ .Values.config.aai.aaiPlainPort }}{{ end }}"
- name: AAI_SCHEMA_VERSION
value: "{{ .Values.config.aai.schemaVersion }}"
- name: AAI_USERNAME
@@ -66,7 +66,7 @@ spec:
- name: AAI_PASSWORD
value: "{{ .Values.config.aai.password }}"
- name: SSL_ENABLED
- value: "{{ .Values.config.ssl_enabled }}"
+ value: "{{- if (include "common.needTLS" .) }}{{ .Values.config.ssl_enabled }}{{ else }}false{{ end }}"
name: {{ include "common.name" . }}
volumeMounts:
- mountPath: "{{ .Values.log.path }}"
@@ -88,7 +88,7 @@ spec:
httpGet:
path: /api/multicloud-titaniumcloud/v1/swagger.json
port: {{ .Values.service.internalPort }}
- scheme: HTTPS
+ scheme: {{ if (include "common.needTLS" .) }}HTTPS{{ else }}HTTP{{ end }}
initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
periodSeconds: {{ .Values.liveness.periodSeconds }}
timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}
diff --git a/kubernetes/multicloud/components/multicloud-windriver/templates/service.yaml b/kubernetes/multicloud/components/multicloud-windriver/templates/service.yaml
index 5a555b3222..f71306740f 100644
--- a/kubernetes/multicloud/components/multicloud-windriver/templates/service.yaml
+++ b/kubernetes/multicloud/components/multicloud-windriver/templates/service.yaml
@@ -33,7 +33,7 @@ metadata:
"url": "/api/multicloud-titanium_cloud/v0",
"protocol": "REST",
"port": "{{ .Values.service.externalPort }}",
- "enable_ssl": {{ .Values.config.ssl_enabled }},
+ "enable_ssl": {{ if (include "common.needTLS" .) }}{{ .Values.config.ssl_enabled }}{{ else }}false{{ end }},
"visualRange": "1"
},
{
@@ -42,7 +42,7 @@ metadata:
"url": "/api/multicloud-titaniumcloud/v0",
"protocol": "REST",
"port": "{{ .Values.service.externalPort }}",
- "enable_ssl": {{ .Values.config.ssl_enabled }},
+ "enable_ssl": {{ if (include "common.needTLS" .) }}{{ .Values.config.ssl_enabled }}{{ else }}false{{ end }},
"visualRange": "1"
},
{
@@ -51,7 +51,7 @@ metadata:
"url": "/api/multicloud-titaniumcloud/v1",
"protocol": "REST",
"port": "{{ .Values.service.externalPort }}",
- "enable_ssl": {{ .Values.config.ssl_enabled }},
+ "enable_ssl": {{ if (include "common.needTLS" .) }}{{ .Values.config.ssl_enabled }}{{ else }}false{{ end }},
"visualRange": "1"
}
]'
diff --git a/kubernetes/multicloud/components/multicloud-windriver/values.yaml b/kubernetes/multicloud/components/multicloud-windriver/values.yaml
index 1a6527b4cb..33802937cd 100644
--- a/kubernetes/multicloud/components/multicloud-windriver/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-windriver/values.yaml
@@ -18,7 +18,7 @@
#################################################################
global:
nodePortPrefix: 302
- artifactImage: onap/multicloud/framework-artifactbroker:1.7.3
+ artifactImage: onap/multicloud/framework-artifactbroker:1.8.1
persistence: {}
#################################################################
@@ -34,11 +34,12 @@ istioSidecar: true
# application configuration
config:
ssl_enabled: true
- msbprotocol: https
msbgateway: msb-iag
msbPort: 443
+ msbPlainPort: 80
aai:
- port: 8443
+ aaiPort: 8443
+ aaiPlainPort: 8080
schemaVersion: v13
username: AAI
password: AAI