From ebc3a0be1e7b2fd2293fb48a7d805eb15a1cf511 Mon Sep 17 00:00:00 2001 From: Andreas Geissler Date: Thu, 22 Sep 2022 15:35:46 +0200 Subject: [A1POLICYMANAGEMENT] Make A1P ServiceMesh compatible Update the application config to run in Istio SM by using HTTP instead of HTTPS and disable AAF dependency Issue-ID: OOM-3008 Signed-off-by: Andreas Geissler Change-Id: I3882912d98b05861114848902f35d254fa49c9d8 --- kubernetes/a1policymanagement/resources/config/application.yaml | 1 + .../a1policymanagement/resources/config/application_configuration.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'kubernetes/a1policymanagement/resources/config') diff --git a/kubernetes/a1policymanagement/resources/config/application.yaml b/kubernetes/a1policymanagement/resources/config/application.yaml index 37754ca00c..05fddb2628 100644 --- a/kubernetes/a1policymanagement/resources/config/application.yaml +++ b/kubernetes/a1policymanagement/resources/config/application.yaml @@ -52,6 +52,7 @@ server: port: 8433 http-port: 8081 ssl: + enabled: {{ (eq "true" (include "common.needTLS" .)) | ternary true false }} key-store-type: PKCS12 key-store-password: ${KEYSTORE_PASSWORD} key-store: {{ .Values.certInitializer.credsPath }}/{{ .Values.certInitializer.fqi_namespace }}.p12 diff --git a/kubernetes/a1policymanagement/resources/config/application_configuration.json b/kubernetes/a1policymanagement/resources/config/application_configuration.json index 6b8ebfb35e..757ee04f35 100644 --- a/kubernetes/a1policymanagement/resources/config/application_configuration.json +++ b/kubernetes/a1policymanagement/resources/config/application_configuration.json @@ -3,7 +3,7 @@ "controller": [ { "name": "controller1", - "baseUrl": "{{ .Values.sdncLink }}", + "baseUrl": "{{ (eq "true" (include "common.needTLS" .)) | ternary .Values.sdncLink .Values.sdncLinkHttp }}", "userName": "${A1CONTROLLER_USER}", "password": "${A1CONTROLLER_PASSWORD}" } -- cgit 1.2.3-korg