summaryrefslogtreecommitdiffstats
path: root/kubernetes/policy/charts/pdp
diff options
context:
space:
mode:
authorBorislavG <Borislav.Glozman@amdocs.com>2018-04-24 07:56:27 +0000
committerBorislavG <Borislav.Glozman@amdocs.com>2018-04-24 13:23:19 +0000
commit1ffbd99a2757af8e10d0f6af46177c646364f91b (patch)
treeceb97b36e0e6ae50349f6495dc585b4ebd61d3f6 /kubernetes/policy/charts/pdp
parent23a95a751a002163f61cb7eafb4dc84465415daa (diff)
Make all services independent of helm Release.Name
Issue-ID: OOM-906 Change-Id: Ic65127d3981cb0a696c784392cab59fbf06b1e66 Signed-off-by: BorislavG <Borislav.Glozman@amdocs.com>
Diffstat (limited to 'kubernetes/policy/charts/pdp')
-rw-r--r--kubernetes/policy/charts/pdp/resources/config/pe/pdp.conf4
-rw-r--r--kubernetes/policy/charts/pdp/templates/service.yaml8
-rw-r--r--kubernetes/policy/charts/pdp/values.yaml1
3 files changed, 7 insertions, 6 deletions
diff --git a/kubernetes/policy/charts/pdp/resources/config/pe/pdp.conf b/kubernetes/policy/charts/pdp/resources/config/pe/pdp.conf
index 8325d42ddf..48fafcb45f 100644
--- a/kubernetes/policy/charts/pdp/resources/config/pe/pdp.conf
+++ b/kubernetes/policy/charts/pdp/resources/config/pe/pdp.conf
@@ -27,9 +27,9 @@ TOMCAT_X_MX_MB=1024
# pdp properties
-UEB_CLUSTER=dmaap
+UEB_CLUSTER=message-router
-REST_PAP_URL=http://{{ .Release.Name }}-{{ .Values.global.pap.nameOverride }}:{{.Values.config.papPort}}/pap/
+REST_PAP_URL=http://{{ .Values.global.pap.nameOverride }}:{{.Values.config.papPort}}/pap/
REST_PDP_ID=http://{{ include "common.fullname" . }}:{{.Values.service.externalPort}}/pdp/
REST_PDP_CONFIG=/opt/app/policy/servers/pdp/bin/config
REST_PDP_WEBAPPS=/opt/app/policy/servers/pdp/webapps
diff --git a/kubernetes/policy/charts/pdp/templates/service.yaml b/kubernetes/policy/charts/pdp/templates/service.yaml
index df63d38c54..fc608d5ab8 100644
--- a/kubernetes/policy/charts/pdp/templates/service.yaml
+++ b/kubernetes/policy/charts/pdp/templates/service.yaml
@@ -15,7 +15,7 @@
apiVersion: v1
kind: Service
metadata:
- name: {{ include "common.fullname" . }}
+ name: {{ include "common.servicename" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
@@ -25,7 +25,7 @@ metadata:
annotations:
msb.onap.org/service-info: '[
{
- "serviceName": "{{ include "common.fullname" . }}",
+ "serviceName": "{{ include "common.servicename" . }}",
"version": "v1",
"url": "/pdp",
"protocol": "REST",
@@ -39,11 +39,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.name }}
+ name: {{ .Values.service.portName }}
{{- else -}}
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
- name: {{ .Values.service.name }}
+ name: {{ .Values.service.portName }}
{{- end}}
selector:
app: {{ include "common.name" . }}
diff --git a/kubernetes/policy/charts/pdp/values.yaml b/kubernetes/policy/charts/pdp/values.yaml
index 9595b9d40c..4f63e3222f 100644
--- a/kubernetes/policy/charts/pdp/values.yaml
+++ b/kubernetes/policy/charts/pdp/values.yaml
@@ -60,6 +60,7 @@ readiness:
service:
type: NodePort
name: pdp
+ portName: pdp
externalPort: 8081
#Example internal target port if required
#internalPort: <80>