diff options
| author |   Andreas Geissler <andreas-geissler@telekom.de> | 2022-09-22 15:35:46 +0200 |
|---|---|---|
| committer | Andreas Geissler <andreas-geissler@telekom.de> | 2022-10-21 07:30:49 +0000 |
| commit | ebc3a0be1e7b2fd2293fb48a7d805eb15a1cf511 (patch) | |
| tree | 3beb152b26f81757419b2613bf27fcf683b5dae2 /kubernetes | |
| parent | fa32b08201cc407e22e7b75f3ea16be8d929c4f1 (diff) | |
[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 <andreas-geissler@telekom.de>
Change-Id: I3882912d98b05861114848902f35d254fa49c9d8
Diffstat (limited to 'kubernetes')
4 files changed, 5 insertions, 1 deletions
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}" } diff --git a/kubernetes/a1policymanagement/templates/statefulset.yaml b/kubernetes/a1policymanagement/templates/statefulset.yaml index 0114b30158..89d131e26c 100644 --- a/kubernetes/a1policymanagement/templates/statefulset.yaml +++ b/kubernetes/a1policymanagement/templates/statefulset.yaml @@ -39,8 +39,10 @@ spec: args: - -c - | + {{- if (include "common.needTLS" .) }} export $(cat {{ .Values.certInitializer.credsPath }}/mycreds.prop\ | xargs -0) + {{- end }} cd /config-input for PFILE in `ls -1` do diff --git a/kubernetes/a1policymanagement/values.yaml b/kubernetes/a1policymanagement/values.yaml index 17fa320472..71d8852b53 100644 --- a/kubernetes/a1policymanagement/values.yaml +++ b/kubernetes/a1policymanagement/values.yaml @@ -86,6 +86,7 @@ a1controller: password: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U sdncLink: https://sdnc.onap:8443 +sdncLinkHttp: http://sdnc.onap:8282 # The information about A1-Mediator/RICs can be added here. # The A1 policy management service supports both STD & OSC versions. # Alternatively, the A1 simulator from ORAN-SC can also be used. It provides STD & OSC versions for A1 termination. |