[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

diff --git a/kubernetes/a1policymanagement/resources/config/application.yaml b/kubernetes/a1policymanagement/resources/config/application.yaml
index 37754ca..05fddb2 100644 (file)
--- 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 6b8ebfb..757ee04 100644 (file)
--- 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 0114b30..89d131e 100644 (file)
--- 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 17fa320..71d8852 100644 (file)
--- 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.