aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
authorMandeep Khinda <Mandeep.Khinda@amdocs.com>2018-06-04 18:52:09 +0000
committerGerrit Code Review <gerrit@onap.org>2018-06-04 18:52:09 +0000
commite3e120109318c0f5c773dd5c6259284a0b2364fe (patch)
treeacf2b8498bb1070328faa78784d1099906813b75 /kubernetes
parent71e6b72212beb946305ca3e9c17b8898a5378923 (diff)
parentd9f7545d811c5243deda91d4269a6180ad46c0d8 (diff)
Merge "disable feature-pooling"
Diffstat (limited to 'kubernetes')
-rw-r--r--kubernetes/policy/charts/drools/resources/config/opt/policy/config/drools/drools-tweaks.sh11
-rw-r--r--kubernetes/policy/charts/drools/values.yaml6
-rw-r--r--kubernetes/policy/charts/pdp/values.yaml2
-rw-r--r--kubernetes/policy/resources/config/pe/push-policies.sh2
4 files changed, 10 insertions, 11 deletions
diff --git a/kubernetes/policy/charts/drools/resources/config/opt/policy/config/drools/drools-tweaks.sh b/kubernetes/policy/charts/drools/resources/config/opt/policy/config/drools/drools-tweaks.sh
index 218cd8aead..5f504e2c65 100644
--- a/kubernetes/policy/charts/drools/resources/config/opt/policy/config/drools/drools-tweaks.sh
+++ b/kubernetes/policy/charts/drools/resources/config/opt/policy/config/drools/drools-tweaks.sh
@@ -16,7 +16,6 @@
"${POLICY_HOME}"/bin/features enable healthcheck
-"${POLICY_HOME}"/bin/features enable pooling-dmaap
"${POLICY_HOME}"/bin/features enable distributed-locking
"${POLICY_HOME}"/bin/db-migrator -s pooling -o upgrade
@@ -25,16 +24,16 @@
# so not to lose any configuration updates
echo
-echo "creating PDPD-CONFIGURATION topic"
+echo "testing publish to PDPD-CONFIGURATION topic"
echo
-curl --silent --connect-timeout 60 -X POST --header "Content-Type: application/json" -d "{}" http://message-router:3904/events/PDPD-CONFIGURATION
+curl --silent --connect-timeout 15 -X POST --header "Content-Type: application/json" -d "{}" http://message-router:3904/events/PDPD-CONFIGURATION
echo
-echo "removing PDPD-CONFIGURATION topic dummy message"
+echo "testing subscribe to PDPD-CONFIGURATION topic "
echo
-curl --silent --connect-timeout 60 -X GET http://message-router:3904/events/PDPD-CONFIGURATION/1/1?timeout=15000
+curl --silent --connect-timeout 15 -X GET http://message-router:3904/events/PDPD-CONFIGURATION/1/1?timeout=5000
# for resiliency/scalability scenarios, check to see
# if there's an amsterdam artifact already deployed
@@ -47,7 +46,7 @@ echo
echo "checking if there are amsterdam policies already deployed .."
echo
-AMSTERDAM_VERSION=$(curl --silent --connect-timeout 60 -X GET "http://nexus:8081/nexus/service/local/artifact/maven/resolve?r=releases&g=org.onap.policy-engine.drools.amsterdam&a=policy-amsterdam-rules&v=RELEASE" | grep -Po "(?<=<version>).*(?=</version>)")
+AMSTERDAM_VERSION=$(curl --silent --connect-timeout 20 -X GET "http://nexus:8081/nexus/service/local/artifact/maven/resolve?r=releases&g=org.onap.policy-engine.drools.amsterdam&a=policy-amsterdam-rules&v=RELEASE" | grep -Po "(?<=<version>).*(?=</version>)")
if [[ -z ${AMSTERDAM_VERSION} ]]; then
echo "no amsterdam policies have been found .."
diff --git a/kubernetes/policy/charts/drools/values.yaml b/kubernetes/policy/charts/drools/values.yaml
index 1bc09a7d0b..5a8e936253 100644
--- a/kubernetes/policy/charts/drools/values.yaml
+++ b/kubernetes/policy/charts/drools/values.yaml
@@ -38,7 +38,7 @@ config:
nexusPort: 8081
# default number of instances
-replicaCount: 2
+replicaCount: 1
nodeSelector: {}
@@ -46,14 +46,14 @@ affinity: {}
# probe configuration parameters
liveness:
- initialDelaySeconds: 10
+ initialDelaySeconds: 60
periodSeconds: 10
# necessary to disable liveness probe when setting breakpoints
# in debugger so K8s doesn't restart unresponsive container
enabled: true
readiness:
- initialDelaySeconds: 10
+ initialDelaySeconds: 60
periodSeconds: 10
service:
diff --git a/kubernetes/policy/charts/pdp/values.yaml b/kubernetes/policy/charts/pdp/values.yaml
index 707b975726..45d8d60f5c 100644
--- a/kubernetes/policy/charts/pdp/values.yaml
+++ b/kubernetes/policy/charts/pdp/values.yaml
@@ -38,7 +38,7 @@ config:
papPort: 9091
# default number of instances
-replicaCount: 2
+replicaCount: 1
nodeSelector: {}
diff --git a/kubernetes/policy/resources/config/pe/push-policies.sh b/kubernetes/policy/resources/config/pe/push-policies.sh
index 5172086d8a..dcd3afb9ad 100644
--- a/kubernetes/policy/resources/config/pe/push-policies.sh
+++ b/kubernetes/policy/resources/config/pe/push-policies.sh
@@ -22,7 +22,7 @@ echo "Upload BRMS Param Template"
sleep 2
-wget -O cl-amsterdam-template.drl https://git.onap.org/policy/drools-applications/plain/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl
+wget -O cl-amsterdam-template.drl https://git.onap.org/policy/drools-applications/plain/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl?h=beijing
sleep 2