diff options
| author |   amatthews <adrian.matthews@est.tech> | 2021-12-14 16:04:15 +0000 |
|---|---|---|
| committer |   jhh <jorge.hernandez-herrero@att.com> | 2022-10-12 18:20:13 -0500 |
| commit | 736bf37d0369fd88154f228efa4d94dd37156486 (patch) | |
| tree | 3f5ff0031b8c2a1264a0543e0e9b556491c7486d /kubernetes/policy/components/policy-apex-pdp | |
| parent | 1712ea65fb6d28e88bcf579dad6b980ea002432e (diff) | |
[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>
Diffstat (limited to 'kubernetes/policy/components/policy-apex-pdp')
3 files changed, 6 insertions, 6 deletions
diff --git a/kubernetes/policy/components/policy-apex-pdp/resources/config/OnapPfConfig.json b/kubernetes/policy/components/policy-apex-pdp/resources/config/OnapPfConfig.json index 0c9d6a504f..7614a8c5b1 100755 --- a/kubernetes/policy/components/policy-apex-pdp/resources/config/OnapPfConfig.json +++ b/kubernetes/policy/components/policy-apex-pdp/resources/config/OnapPfConfig.json @@ -5,7 +5,7 @@ "port": 6969, "userName": "${RESTSERVER_USER}", "password": "${RESTSERVER_PASSWORD}", - "https": true, + "https": {{ (eq "true" (include "common.needTLS" .)) | ternary "true" "false" }}, "prometheus": true }, "pdpStatusParameters":{ @@ -28,14 +28,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-apex-pdp/templates/service.yaml b/kubernetes/policy/components/policy-apex-pdp/templates/service.yaml index e28331baca..6a4d28bc4b 100755 --- a/kubernetes/policy/components/policy-apex-pdp/templates/service.yaml +++ b/kubernetes/policy/components/policy-apex-pdp/templates/service.yaml @@ -34,11 +34,11 @@ spec: {{if eq .Values.service.type "NodePort" -}} - port: {{ .Values.service.externalPort }} nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }} - name: {{ .Values.service.portName }} + name: {{ .Values.service.portName }}{{ (eq "true" (include "common.needTLS" .)) | ternary "s" "" }} {{- else -}} - port: {{ .Values.service.externalPort }} targetPort: {{ .Values.service.internalPort }} - name: {{ .Values.service.portName }} + name: {{ .Values.service.portName }}{{ (eq "true" (include "common.needTLS" .)) | ternary "s" "" }} {{- end}} selector: app: {{ include "common.name" . }} diff --git a/kubernetes/policy/components/policy-apex-pdp/values.yaml b/kubernetes/policy/components/policy-apex-pdp/values.yaml index f0fa193281..09206dc8e9 100755 --- a/kubernetes/policy/components/policy-apex-pdp/values.yaml +++ b/kubernetes/policy/components/policy-apex-pdp/values.yaml @@ -114,7 +114,7 @@ readiness: service: type: ClusterIP name: policy-apex-pdp - portName: policy-apex-pdp + portName: http externalPort: 6969 internalPort: 6969 nodePort: 37 |