From: Radoslaw Chmiel <r.chmiel@partner.samsung.com>
Date: Thu, 2 Jun 2022 17:28:13 +0000 (+0200)
Subject: [COMMON] Network-name-gen and dgbuilder ServiceMesh compatibility
X-Git-Tag: 11.0.0~119^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=oom.git;a=commitdiff_plain;h=96397bc43da6d39d8cc85767974d7c8fc9d08467

[COMMON] Network-name-gen and dgbuilder ServiceMesh compatibility

Network-name-gen and dgbuilder charts changes to make it work with servicemesh

Issue-ID: OOM-2982
Signed-off-by: Radoslaw Chmiel <r.chmiel@partner.samsung.com>
Change-Id: I23bffe3f2de6196dbad1bbb03ea0c2fc46313865
---

diff --git a/kubernetes/common/dgbuilder/values.yaml b/kubernetes/common/dgbuilder/values.yaml
index 9257dc89f9..d77d471767 100644
--- a/kubernetes/common/dgbuilder/values.yaml
+++ b/kubernetes/common/dgbuilder/values.yaml
@@ -130,7 +130,7 @@ readiness:
 service:
   type: NodePort
   name: dgbuilder
-  portName: dgbuilder
+  portName: http
   externalPort: 3000
   internalPort: 3100
   nodePort: 28
diff --git a/kubernetes/common/network-name-gen/templates/deployment.yaml b/kubernetes/common/network-name-gen/templates/deployment.yaml
index 9bdf19c7ec..97fece8a54 100644
--- a/kubernetes/common/network-name-gen/templates/deployment.yaml
+++ b/kubernetes/common/network-name-gen/templates/deployment.yaml
@@ -80,7 +80,11 @@ spec:
         - name: POL_BASIC_AUTH_PASSWORD
           {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "pol-basic-auth-secret" "key" "password") | indent 10}}
         - name: POL_URL
-          value: "{{ .Values.config.polUrl }}"
+          {{- if (include "common.needTLS" .) }}
+          value: "{{ .Values.config.polUrl.https }}"
+          {{- else }}
+          value: "{{ .Values.config.polUrl.http }}"
+          {{- end }}
         - name: POL_ENV
           value: "{{ .Values.config.polEnv }}"
         - name: POL_REQ_ID
@@ -90,7 +94,11 @@ spec:
         - name: AAI_CERT_PATH
           value: "{{ .Values.config.aaiCertPath }}"
         - name: AAI_URI
-          value: "{{ .Values.config.aaiUri }}"
+          {{- if (include "common.needTLS" .) }}
+          value: "{{ .Values.config.aaiUri.https }}"
+          {{- else }}
+          value: "{{ .Values.config.aaiUri.http }}"
+          {{- end }}
         - name: AAI_AUTH
           value: "{{ .Values.config.aaiAuth }}"
         - name: DISABLE_HOST_VERIFICATION
diff --git a/kubernetes/common/network-name-gen/values.yaml b/kubernetes/common/network-name-gen/values.yaml
index 5f864a6555..e5e2a7a338 100644
--- a/kubernetes/common/network-name-gen/values.yaml
+++ b/kubernetes/common/network-name-gen/values.yaml
@@ -87,14 +87,18 @@ config:
   polClientAuth: cHl0aG9uOnRlc3Q=
   polBasicAuthUser: healthcheck
   polBasicAuthPassword: zb!XztG34
-  polUrl: https://policy-xacml-pdp:6969/policy/pdpx/v1/decision
+  polUrl:
+    https: https://policy-xacml-pdp:6969/policy/pdpx/v1/decision
+    http: http://policy-xacml-pdp:8080/policy/pdpx/v1/decision
   polEnv: TEST
   polReqId: xx
   disableHostVerification: true
   aaiCertPass: changeit
   aaiCertPath: /opt/etc/config/aai_keystore
   aaiAuth: QUFJOkFBSQ==
-  aaiUri: https://aai:8443/aai/v14/
+  aaiUri:
+    https: https://aai:8443/aai/v14/
+    http: http://aai:8080/aai/v14/
 
 # default number of instances
 replicaCount: 1
@@ -118,7 +122,7 @@ readiness:
 service:
   type: ClusterIP
   name: neng-serv
-  portName: neng-serv-port
+  portName: http
   internalPort: 8080
   externalPort: 8080