aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/policy/charts/pdp
diff options
context:
space:
mode:
authormayankg2703 <mayank.gupta@@amdocs.com>2018-03-29 14:24:23 +0000
committerMandeep Khinda <mandeep.khinda@amdocs.com>2018-03-29 17:31:59 +0000
commitc798546522e1b57bb989d09a9e08983e18ba4bf5 (patch)
treef57f2c3b7cf565b32180250c1055259ffcd5c25b /kubernetes/policy/charts/pdp
parent7963e804749c3e9aac77ad98baef80a3b8f9d018 (diff)
Correction in policy due to incorrect merge
removing cli package change from policy patch Change-Id: I673cfb90f76df877bd9e69f9a185ae7c77ee4b9b Issue-ID: OOM-844 Signed-off-by: mayankg2703 <mayank.gupta@amdocs.com> Signed-off-by: Mandeep Khinda <mandeep.khinda@amdocs.com>
Diffstat (limited to 'kubernetes/policy/charts/pdp')
-rw-r--r--kubernetes/policy/charts/pdp/Chart.yaml2
-rw-r--r--kubernetes/policy/charts/pdp/resources/config/pe/pdp.conf4
-rw-r--r--kubernetes/policy/charts/pdp/resources/config/pe/pdplp.conf2
-rw-r--r--kubernetes/policy/charts/pdp/templates/NOTES.txt2
-rw-r--r--kubernetes/policy/charts/pdp/templates/service.yaml3
-rw-r--r--kubernetes/policy/charts/pdp/values.yaml8
6 files changed, 9 insertions, 12 deletions
diff --git a/kubernetes/policy/charts/pdp/Chart.yaml b/kubernetes/policy/charts/pdp/Chart.yaml
index 09a65ead9d..b849e18b3a 100644
--- a/kubernetes/policy/charts/pdp/Chart.yaml
+++ b/kubernetes/policy/charts/pdp/Chart.yaml
@@ -13,6 +13,6 @@
# limitations under the License.
apiVersion: v1
-description: Policy PDP
+description: ONAP Policy PDP
name: pdp
version: 2.0.0
diff --git a/kubernetes/policy/charts/pdp/resources/config/pe/pdp.conf b/kubernetes/policy/charts/pdp/resources/config/pe/pdp.conf
index 9dae9f2552..8325d42ddf 100644
--- a/kubernetes/policy/charts/pdp/resources/config/pe/pdp.conf
+++ b/kubernetes/policy/charts/pdp/resources/config/pe/pdp.conf
@@ -29,8 +29,8 @@ TOMCAT_X_MX_MB=1024
UEB_CLUSTER=dmaap
-REST_PAP_URL=http://{{ .Release.Name }}-{{ .Values.global.pap.nameOverride }}:9091/pap/
-REST_PDP_ID=http://{{ include "common.fullname" . }}:8081/pdp/
+REST_PAP_URL=http://{{ .Release.Name }}-{{ .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
REST_PDP_REGISTER=true
diff --git a/kubernetes/policy/charts/pdp/resources/config/pe/pdplp.conf b/kubernetes/policy/charts/pdp/resources/config/pe/pdplp.conf
index 141eb28acd..2021c09439 100644
--- a/kubernetes/policy/charts/pdp/resources/config/pe/pdplp.conf
+++ b/kubernetes/policy/charts/pdp/resources/config/pe/pdplp.conf
@@ -17,7 +17,7 @@ LOGPARSER_JMX_PORT=9997
LOGPARSER_X_MS_MB=1024
LOGPARSER_X_MX_MB=1024
-SERVER=http://{{ include "common.fullname" . }}:8081/pdp/
+SERVER=http://{{ include "common.fullname" . }}:{{.Values.service.externalPort}}/pdp/
LOGPATH=/opt/app/policy/servers/pdp/logs/pdp-rest.log
PARSERLOGPATH=IntegrityMonitor.log
diff --git a/kubernetes/policy/charts/pdp/templates/NOTES.txt b/kubernetes/policy/charts/pdp/templates/NOTES.txt
index 91d8ed42f1..c60c745ca3 100644
--- a/kubernetes/policy/charts/pdp/templates/NOTES.txt
+++ b/kubernetes/policy/charts/pdp/templates/NOTES.txt
@@ -13,7 +13,7 @@
export SERVICE_IP=$(kubectl get svc --namespace {{ include "common.namespace" . }} {{ include "common.name" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
echo http://$SERVICE_IP:{{ .Values.service.externalPort }}
{{- else if contains "ClusterIP" .Values.service.type }}
- export POD_NAME=$(kubectl get pods --namespace {{ include "common.namespace" . }} -l "app={{ template "so.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+ export POD_NAME=$(kubectl get pods --namespace {{ include "common.namespace" . }} -l "app={{ include "common.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
echo "Visit http://127.0.0.1:8080 to use your application"
kubectl port-forward $POD_NAME 8080:{{ .Values.service.internalPort }}
{{- end }}
diff --git a/kubernetes/policy/charts/pdp/templates/service.yaml b/kubernetes/policy/charts/pdp/templates/service.yaml
index aed3fd1ae9..df63d38c54 100644
--- a/kubernetes/policy/charts/pdp/templates/service.yaml
+++ b/kubernetes/policy/charts/pdp/templates/service.yaml
@@ -29,7 +29,7 @@ metadata:
"version": "v1",
"url": "/pdp",
"protocol": "REST",
- "port": "8081",
+ "port": "{{ .Values.service.externalPort }}",
"visualRange":"1"
},
]'
@@ -49,4 +49,3 @@ spec:
app: {{ include "common.name" . }}
release: {{ .Release.Name }}
sessionAffinity: None
-
diff --git a/kubernetes/policy/charts/pdp/values.yaml b/kubernetes/policy/charts/pdp/values.yaml
index c2b7580347..1fdc56e85b 100644
--- a/kubernetes/policy/charts/pdp/values.yaml
+++ b/kubernetes/policy/charts/pdp/values.yaml
@@ -35,13 +35,11 @@ pullPolicy: Always
debugEnabled: false
# application configuration
-# Example:
-config: {}
-# username: myusername
-# password: mypassword
+config:
+ papPort: 9091
# default number of instances
-replicaCount: 1
+replicaCount: 2
nodeSelector: {}