aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
authorAndreas Geissler <andreas-geissler@telekom.de>2022-09-22 13:40:07 +0200
committerFiachra Corcoran <fiachra.corcoran@est.tech>2022-10-17 08:10:31 +0000
commitb3a380653c2b1604c6774aab561f20d471d574df (patch)
treeff37a428f1c7f741242b5ab71e9c0b5acf4bd0f7 /kubernetes
parent9a51e07a2164c9be42d9d329559f4d2081b8f3fc (diff)
[SO] Port corrections for SM compatibility
AAI service port corrected to 80 and set the spring server forward-headers-strategy, as sidecars do not preserve the original sender URL and port. Issue-ID: OOM-2493 Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de> Change-Id: Ie08abce0b60301dd18261f12d8d848447d11d3e5
Diffstat (limited to 'kubernetes')
-rw-r--r--kubernetes/so/components/so-admin-cockpit/resources/config/overrides/override.yaml3
-rw-r--r--kubernetes/so/components/so-appc-orchestrator/resources/config/overrides/override.yaml3
-rwxr-xr-xkubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml5
-rwxr-xr-xkubernetes/so/components/so-catalog-db-adapter/resources/config/overrides/override.yaml3
-rwxr-xr-xkubernetes/so/components/so-cnf-adapter/resources/config/overrides/override.yaml5
-rw-r--r--kubernetes/so/components/so-etsi-nfvo-ns-lcm/resources/config/overrides/override.yaml5
-rwxr-xr-xkubernetes/so/components/so-etsi-sol003-adapter/resources/config/overrides/override.yaml5
-rwxr-xr-xkubernetes/so/components/so-etsi-sol005-adapter/resources/config/overrides/override.yaml3
-rwxr-xr-xkubernetes/so/components/so-nssmf-adapter/resources/config/overrides/override.yaml5
-rwxr-xr-xkubernetes/so/components/so-oof-adapter/resources/config/overrides/override.yaml3
-rwxr-xr-xkubernetes/so/components/so-openstack-adapter/resources/config/overrides/override.yaml10
-rwxr-xr-xkubernetes/so/components/so-request-db-adapter/resources/config/overrides/override.yaml3
-rwxr-xr-xkubernetes/so/components/so-sdc-controller/resources/config/overrides/override.yaml5
-rwxr-xr-xkubernetes/so/components/so-sdnc-adapter/resources/config/overrides/override.yaml3
-rwxr-xr-xkubernetes/so/components/so-ve-vnfm-adapter/resources/config/overrides/override.yaml5
-rwxr-xr-xkubernetes/so/resources/config/overrides/override.yaml4
16 files changed, 58 insertions, 12 deletions
diff --git a/kubernetes/so/components/so-admin-cockpit/resources/config/overrides/override.yaml b/kubernetes/so/components/so-admin-cockpit/resources/config/overrides/override.yaml
index e1bac69fe3..348609b8da 100644
--- a/kubernetes/so/components/so-admin-cockpit/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-admin-cockpit/resources/config/overrides/override.yaml
@@ -1,4 +1,7 @@
server:
+ {{- if include "common.onServiceMesh" . }}
+ forward-headers-strategy: none
+ {{- end }}
port: {{ index .Values.containerPort }}
{{- if .Values.global.aafEnabled }}
ssl:
diff --git a/kubernetes/so/components/so-appc-orchestrator/resources/config/overrides/override.yaml b/kubernetes/so/components/so-appc-orchestrator/resources/config/overrides/override.yaml
index 661ed64b0e..061d8f0847 100644
--- a/kubernetes/so/components/so-appc-orchestrator/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-appc-orchestrator/resources/config/overrides/override.yaml
@@ -15,6 +15,9 @@
*/}}
server:
+ {{- if include "common.onServiceMesh" . }}
+ forward-headers-strategy: none
+ {{- end }}
port: {{ index .Values.containerPort }}
tomcat:
max-threads: 50
diff --git a/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml b/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml
index ddff9c1dea..77e553bd67 100755
--- a/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml
@@ -20,7 +20,7 @@ aai:
{{ if (include "common.needTLS" .) }}
endpoint: https://aai.{{ include "common.namespace" . }}:8443
{{ else }}
- endpoint: http://aai.{{ include "common.namespace" . }}:8080
+ endpoint: http://aai.{{ include "common.namespace" . }}:80
{{ end }}
workflowAaiDistributionDelay: PT30S
pnfEntryNotificationTimeout: P14D
@@ -358,6 +358,9 @@ sniro:
headers.minorVersion: 1
headers.latestVersion: 2
server:
+ {{- if include "common.onServiceMesh" . }}
+ forward-headers-strategy: none
+ {{- end }}
port: {{ index .Values.containerPort }}
tomcat:
max-threads: 50
diff --git a/kubernetes/so/components/so-catalog-db-adapter/resources/config/overrides/override.yaml b/kubernetes/so/components/so-catalog-db-adapter/resources/config/overrides/override.yaml
index 7aa5984403..c82a0d29d4 100755
--- a/kubernetes/so/components/so-catalog-db-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-catalog-db-adapter/resources/config/overrides/override.yaml
@@ -14,6 +14,9 @@
# limitations under the License.
*/}}
server:
+ {{- if include "common.onServiceMesh" . }}
+ forward-headers-strategy: none
+ {{- end }}
port: {{ index .Values.containerPort }}
tomcat:
max-threads: 50
diff --git a/kubernetes/so/components/so-cnf-adapter/resources/config/overrides/override.yaml b/kubernetes/so/components/so-cnf-adapter/resources/config/overrides/override.yaml
index 0c2f679082..d667cb5c60 100755
--- a/kubernetes/so/components/so-cnf-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-cnf-adapter/resources/config/overrides/override.yaml
@@ -19,7 +19,7 @@ aai:
{{ if (include "common.needTLS" .) }}
endpoint: https://aai.{{ include "common.namespace" . }}:8443
{{ else }}
- endpoint: http://aai.{{ include "common.namespace" . }}:8080
+ endpoint: http://aai.{{ include "common.namespace" . }}:80
{{ end }}
enabled: {{ .Values.global.aai.enabled }}
logging:
@@ -31,6 +31,9 @@ spring:
password: ${ACTUATOR_PASSWORD}
role: ACTUATOR
server:
+ {{- if include "common.onServiceMesh" . }}
+ forward-headers-strategy: none
+ {{- end }}
port: {{ index .Values.containerPort }}
tomcat:
max-threads: 50
diff --git a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/resources/config/overrides/override.yaml b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/resources/config/overrides/override.yaml
index 7c1cb1b3c4..df47c0a5fd 100644
--- a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/resources/config/overrides/override.yaml
@@ -20,7 +20,7 @@ aai:
{{ if (include "common.needTLS" .) }}
endpoint: https://aai.{{ include "common.namespace" . }}:8443
{{ else }}
- endpoint: http://aai.{{ include "common.namespace" . }}:8080
+ endpoint: http://aai.{{ include "common.namespace" . }}:80
{{ end }}
spring:
datasource:
@@ -45,6 +45,9 @@ spring:
password: ${ETSI_NFVO_PASSWORD}
role: ETSI-NFVO-Client
server:
+ {{- if include "common.onServiceMesh" . }}
+ forward-headers-strategy: none
+ {{- end }}
port: {{ .Values.containerPort }}
tomcat:
max-threads: 50
diff --git a/kubernetes/so/components/so-etsi-sol003-adapter/resources/config/overrides/override.yaml b/kubernetes/so/components/so-etsi-sol003-adapter/resources/config/overrides/override.yaml
index 33b38add57..fed38f7592 100755
--- a/kubernetes/so/components/so-etsi-sol003-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-etsi-sol003-adapter/resources/config/overrides/override.yaml
@@ -19,7 +19,7 @@ aai:
{{ if (include "common.needTLS" .) }}
endpoint: https://aai.{{ include "common.namespace" . }}:8443
{{ else }}
- endpoint: http://aai.{{ include "common.namespace" . }}:8080
+ endpoint: http://aai.{{ include "common.namespace" . }}:80
{{ end }}
spring:
security:
@@ -31,6 +31,9 @@ spring:
password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
role: ACTUATOR
server:
+ {{- if include "common.onServiceMesh" . }}
+ forward-headers-strategy: none
+ {{- end }}
port: {{ index .Values.containerPort }}
ssl:
enabled: false
diff --git a/kubernetes/so/components/so-etsi-sol005-adapter/resources/config/overrides/override.yaml b/kubernetes/so/components/so-etsi-sol005-adapter/resources/config/overrides/override.yaml
index e1e2fc23c6..189a02bf73 100755
--- a/kubernetes/so/components/so-etsi-sol005-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-etsi-sol005-adapter/resources/config/overrides/override.yaml
@@ -33,6 +33,9 @@ spring:
password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
role: ACTUATOR
server:
+ {{- if include "common.onServiceMesh" . }}
+ forward-headers-strategy: none
+ {{- end }}
port: {{ index .Values.containerPort }}
tomcat:
max-threads: 50
diff --git a/kubernetes/so/components/so-nssmf-adapter/resources/config/overrides/override.yaml b/kubernetes/so/components/so-nssmf-adapter/resources/config/overrides/override.yaml
index 1d8a97c028..016b3f534f 100755
--- a/kubernetes/so/components/so-nssmf-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-nssmf-adapter/resources/config/overrides/override.yaml
@@ -18,7 +18,7 @@ aai:
{{ if (include "common.needTLS" .) }}
endpoint: https://aai.{{ include "common.namespace" . }}:8443
{{ else }}
- endpoint: http://aai.{{ include "common.namespace" . }}:8080
+ endpoint: http://aai.{{ include "common.namespace" . }}:80
{{ end }}
logging:
path: logs
@@ -44,6 +44,9 @@ spring:
password: ${ACTUATOR_PASSWORD}
role: ACTUATOR
server:
+ {{- if include "common.onServiceMesh" . }}
+ forward-headers-strategy: none
+ {{- end }}
port: {{ index .Values.containerPort }}
tomcat:
max-threads: 50
diff --git a/kubernetes/so/components/so-oof-adapter/resources/config/overrides/override.yaml b/kubernetes/so/components/so-oof-adapter/resources/config/overrides/override.yaml
index 8db5d26788..2d645bebf2 100755
--- a/kubernetes/so/components/so-oof-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-oof-adapter/resources/config/overrides/override.yaml
@@ -25,6 +25,9 @@ spring:
password: ${ACTUATOR_PASSWORD}
role: ACTUATOR
server:
+ {{- if include "common.onServiceMesh" . }}
+ forward-headers-strategy: none
+ {{- end }}
port: {{ index .Values.containerPort }}
tomcat:
max-threads: 50
diff --git a/kubernetes/so/components/so-openstack-adapter/resources/config/overrides/override.yaml b/kubernetes/so/components/so-openstack-adapter/resources/config/overrides/override.yaml
index 487e93132d..7dc22c3536 100755
--- a/kubernetes/so/components/so-openstack-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-openstack-adapter/resources/config/overrides/override.yaml
@@ -18,10 +18,14 @@ aai:
{{ if (include "common.needTLS" .) }}
endpoint: https://aai.{{ include "common.namespace" . }}:8443
{{ else }}
- endpoint: http://aai.{{ include "common.namespace" . }}:8080
+ endpoint: http://aai.{{ include "common.namespace" . }}:80
{{ end }}
server:
+ {{- if include "common.onServiceMesh" . }}
+ forward-headers-strategy: none
+ {{- end }}
port: {{ index .Values.containerPort }}
+SW port: {{ index .Values.containerPort }}
spring:
datasource:
hikari:
@@ -117,8 +121,8 @@ mso:
auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.aaf.auth.encrypted "value2" .Values.mso.auth )}}
logPath: ./logs/openstack
msb-ip: msb-iag
- msb-port: 443
- msb-scheme: https
+ msb-port: 80
+ msb-scheme: http
workflow:
endpoint: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081/sobpmnengine
msoKey: {{ .Values.mso.msoKey }}
diff --git a/kubernetes/so/components/so-request-db-adapter/resources/config/overrides/override.yaml b/kubernetes/so/components/so-request-db-adapter/resources/config/overrides/override.yaml
index 9b70ddcb5d..86e02d638a 100755
--- a/kubernetes/so/components/so-request-db-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-request-db-adapter/resources/config/overrides/override.yaml
@@ -15,6 +15,9 @@
# will be used as entry in DB to say SITE OFF/ON for healthcheck
*/}}
server:
+ {{- if include "common.onServiceMesh" . }}
+ forward-headers-strategy: none
+ {{- end }}
port: {{ index .Values.containerPort }}
tomcat:
max-threads: 50
diff --git a/kubernetes/so/components/so-sdc-controller/resources/config/overrides/override.yaml b/kubernetes/so/components/so-sdc-controller/resources/config/overrides/override.yaml
index ffa66e9d78..29a1cf7443 100755
--- a/kubernetes/so/components/so-sdc-controller/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-sdc-controller/resources/config/overrides/override.yaml
@@ -16,6 +16,9 @@
aai:
auth: {{.Values.aai.auth}}
server:
+ {{- if include "common.onServiceMesh" . }}
+ forward-headers-strategy: none
+ {{- end }}
port: {{ index .Values.containerPort }}
spring:
datasource:
@@ -66,7 +69,7 @@ mso:
{{ if (include "common.needTLS" .) }}
endpoint: https://aai.{{ include "common.namespace" . }}:8443
{{ else }}
- endpoint: http://aai.{{ include "common.namespace" . }}:8080
+ endpoint: http://aai.{{ include "common.namespace" . }}:80
{{ end }}
asdc-connections:
asdc-controller1:
diff --git a/kubernetes/so/components/so-sdnc-adapter/resources/config/overrides/override.yaml b/kubernetes/so/components/so-sdnc-adapter/resources/config/overrides/override.yaml
index 5c7a9af467..119236b1b2 100755
--- a/kubernetes/so/components/so-sdnc-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-sdnc-adapter/resources/config/overrides/override.yaml
@@ -14,6 +14,9 @@
# limitations under the License.
*/}}
server:
+ {{- if include "common.onServiceMesh" . }}
+ forward-headers-strategy: none
+ {{- end }}
port: {{ index .Values.containerPort }}
mso:
msoKey: ${MSO_KEY}
diff --git a/kubernetes/so/components/so-ve-vnfm-adapter/resources/config/overrides/override.yaml b/kubernetes/so/components/so-ve-vnfm-adapter/resources/config/overrides/override.yaml
index 8471540011..1a96abf9cb 100755
--- a/kubernetes/so/components/so-ve-vnfm-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-ve-vnfm-adapter/resources/config/overrides/override.yaml
@@ -15,6 +15,9 @@
*/}}
server:
+ {{- if include "common.onServiceMesh" . }}
+ forward-headers-strategy: none
+ {{- end }}
port: {{ include "common.getPort" (dict "global" . "name" "http") }}
vevnfmadapter:
@@ -28,7 +31,7 @@ aai:
{{ if (include "common.needTLS" .) }}
endpoint: https://aai.{{ include "common.namespace" . }}:8443
{{ else }}
- endpoint: http://aai.{{ include "common.namespace" . }}:8080
+ endpoint: http://aai.{{ include "common.namespace" . }}:80
{{ end }}
dmaap:
diff --git a/kubernetes/so/resources/config/overrides/override.yaml b/kubernetes/so/resources/config/overrides/override.yaml
index 6933607827..48b75c72e9 100755
--- a/kubernetes/so/resources/config/overrides/override.yaml
+++ b/kubernetes/so/resources/config/overrides/override.yaml
@@ -2,7 +2,7 @@ aai:
{{ if (include "common.needTLS" .) }}
endpoint: https://aai.{{ include "common.namespace" . }}:8443
{{ else }}
- endpoint: http://aai.{{ include "common.namespace" . }}:8080
+ endpoint: http://aai.{{ include "common.namespace" . }}:80
{{ end }}
auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.encrypted "value2" .Values.mso.aai.auth )}}
server:
@@ -62,7 +62,7 @@ mso:
{{ if (include "common.needTLS" .) }}
endpoint: https://aai.{{ include "common.namespace" . }}:8443
{{ else }}
- endpoint: http://aai.{{ include "common.namespace" . }}:8080
+ endpoint: http://aai.{{ include "common.namespace" . }}:80
{{ end }}
auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.encrypted "value2" .Values.mso.aai.auth )}}