From 736bf37d0369fd88154f228efa4d94dd37156486 Mon Sep 17 00:00:00 2001
From: amatthews <adrian.matthews@est.tech>
Date: Tue, 14 Dec 2021 16:04:15 +0000
Subject: [POLICY] Service Mesh Compliance for Policy

Updating the basic requirements for Service Mesh Compliance within Policy.
Changing the DB jobs and updating the configuration files to use HTTP

Issue-ID: OOM-2253
Change-Id: If1aed68f0ed2f00d6a5cf06e5f95837f9405f65b
Signed-off-by: amatthews <adrian.matthews@est.tech>
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
---
 .../components/policy-xacml-pdp/resources/config/config.json      | 8 ++++----
 .../policy/components/policy-xacml-pdp/templates/service.yaml     | 2 +-
 kubernetes/policy/components/policy-xacml-pdp/values.yaml         | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'kubernetes/policy/components/policy-xacml-pdp')

diff --git a/kubernetes/policy/components/policy-xacml-pdp/resources/config/config.json b/kubernetes/policy/components/policy-xacml-pdp/resources/config/config.json
index 19b4d9c03b..0f1744a9e4 100755
--- a/kubernetes/policy/components/policy-xacml-pdp/resources/config/config.json
+++ b/kubernetes/policy/components/policy-xacml-pdp/resources/config/config.json
@@ -26,7 +26,7 @@
         "port": 6969,
         "userName": "${RESTSERVER_USER}",
         "password": "${RESTSERVER_PASSWORD}",
-        "https": true,
+        "https": {{ (eq "true" (include "common.needTLS" .)) | ternary "true" "false" }},
         "aaf": false,
         "prometheus": true
     },
@@ -35,7 +35,7 @@
         "port": 6969,
         "userName": "${API_USER}",
         "password": "${API_PASSWORD}",
-        "useHttps": true,
+        "useHttps": {{ (eq "true" (include "common.needTLS" .)) | ternary "true" "false" }},
         "aaf": false
     },
     "applicationParameters": {
@@ -45,14 +45,14 @@
         "topicSources" : [{
             "topic" : "POLICY-PDP-PAP",
             "servers" : [ "message-router" ],
-            "useHttps" : true,
+            "useHttps" : {{ (eq "true" (include "common.needTLS" .)) | ternary "true" "false" }},
             "fetchTimeout" : 15000,
             "topicCommInfrastructure" : "dmaap"
         }],
         "topicSinks" : [{
             "topic" : "POLICY-PDP-PAP",
             "servers" : [ "message-router" ],
-            "useHttps" : true,
+            "useHttps" : {{ (eq "true" (include "common.needTLS" .)) | ternary "true" "false" }},
             "topicCommInfrastructure" : "dmaap"
         }]
     }
diff --git a/kubernetes/policy/components/policy-xacml-pdp/templates/service.yaml b/kubernetes/policy/components/policy-xacml-pdp/templates/service.yaml
index 123ae66432..42995c8985 100755
--- a/kubernetes/policy/components/policy-xacml-pdp/templates/service.yaml
+++ b/kubernetes/policy/components/policy-xacml-pdp/templates/service.yaml
@@ -33,7 +33,7 @@ spec:
   ports:
     - port: {{ .Values.service.externalPort }}
       targetPort: {{ .Values.service.internalPort }}
-      name: {{ .Values.service.portName }}
+      name: {{ .Values.service.portName }}{{ (eq "true" (include "common.needTLS" .)) | ternary "s" "" }}
   selector:
     app: {{ include "common.name" . }}
     release: {{ include "common.release" . }}
diff --git a/kubernetes/policy/components/policy-xacml-pdp/values.yaml b/kubernetes/policy/components/policy-xacml-pdp/values.yaml
index 3a44719727..c29e0303fd 100755
--- a/kubernetes/policy/components/policy-xacml-pdp/values.yaml
+++ b/kubernetes/policy/components/policy-xacml-pdp/values.yaml
@@ -128,7 +128,7 @@ readiness:
 service:
   type: ClusterIP
   name: policy-xacml-pdp
-  portName: policy-xacml-pdp
+  portName: http
   externalPort: 6969
   internalPort: 6969
 
-- 
cgit 1.2.3-korg