aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/policy/charts/drools
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/drools
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/drools')
-rw-r--r--kubernetes/policy/charts/drools/Chart.yaml2
-rw-r--r--kubernetes/policy/charts/drools/charts/nexus/Chart.yaml2
-rw-r--r--kubernetes/policy/charts/drools/charts/nexus/values.yaml3
-rwxr-xr-xkubernetes/policy/charts/drools/resources/config/drools/settings.xml4
-rw-r--r--kubernetes/policy/charts/drools/resources/config/opt/policy/config/drools/base.conf4
-rw-r--r--kubernetes/policy/charts/drools/templates/NOTES.txt2
-rw-r--r--kubernetes/policy/charts/drools/templates/statefulset.yaml (renamed from kubernetes/policy/charts/drools/templates/deployment.yaml)10
-rw-r--r--kubernetes/policy/charts/drools/values.yaml10
8 files changed, 18 insertions, 19 deletions
diff --git a/kubernetes/policy/charts/drools/Chart.yaml b/kubernetes/policy/charts/drools/Chart.yaml
index 4f753c07f4..15ad44b6a3 100644
--- a/kubernetes/policy/charts/drools/Chart.yaml
+++ b/kubernetes/policy/charts/drools/Chart.yaml
@@ -13,6 +13,6 @@
# limitations under the License.
apiVersion: v1
-description: Drools Policy Engine
+description: ONAP Drools Policy Engine
name: drools
version: 2.0.0
diff --git a/kubernetes/policy/charts/drools/charts/nexus/Chart.yaml b/kubernetes/policy/charts/drools/charts/nexus/Chart.yaml
index 65916b652c..c16f6450a4 100644
--- a/kubernetes/policy/charts/drools/charts/nexus/Chart.yaml
+++ b/kubernetes/policy/charts/drools/charts/nexus/Chart.yaml
@@ -13,6 +13,6 @@
# limitations under the License.
apiVersion: v1
-description: Policy Nexus
+description: ONAP Policy Nexus
name: nexus
version: 2.0.0
diff --git a/kubernetes/policy/charts/drools/charts/nexus/values.yaml b/kubernetes/policy/charts/drools/charts/nexus/values.yaml
index f8d80b0fca..2ed55ef3bd 100644
--- a/kubernetes/policy/charts/drools/charts/nexus/values.yaml
+++ b/kubernetes/policy/charts/drools/charts/nexus/values.yaml
@@ -33,10 +33,7 @@ pullPolicy: Always
debugEnabled: false
# application configuration
-# Example:
config: {}
-# username: myusername
-# password: mypassword
# default number of instances
replicaCount: 1
diff --git a/kubernetes/policy/charts/drools/resources/config/drools/settings.xml b/kubernetes/policy/charts/drools/resources/config/drools/settings.xml
index e899a004da..8b110bddd3 100755
--- a/kubernetes/policy/charts/drools/resources/config/drools/settings.xml
+++ b/kubernetes/policy/charts/drools/resources/config/drools/settings.xml
@@ -47,7 +47,7 @@
<repositories>
<repository>
<id>policy-nexus-snapshots</id>
- <url>http://{{.Release.Name}}-{{.Values.global.nexus.nameOverride}}:8081/nexus/content/repositories/snapshots/</url>
+ <url>http://{{.Release.Name}}-{{.Values.global.nexus.nameOverride}}:{{.Values.config.nexusPort}}/nexus/content/repositories/snapshots/</url>
<releases>
<enabled>false</enabled>
<updatePolicy>always</updatePolicy>
@@ -60,7 +60,7 @@
<repository>
<id>policy-nexus-releases</id>
- <url>http://{{.Release.Name}}-{{.Values.global.nexus.nameOverride}}:8081/nexus/content/repositories/releases/</url>
+ <url>http://{{.Release.Name}}-{{.Values.global.nexus.nameOverride}}:{{.Values.config.nexusPort}}/nexus/content/repositories/releases/</url>
<releases>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
diff --git a/kubernetes/policy/charts/drools/resources/config/opt/policy/config/drools/base.conf b/kubernetes/policy/charts/drools/resources/config/opt/policy/config/drools/base.conf
index aec7bf20ee..127a483da5 100644
--- a/kubernetes/policy/charts/drools/resources/config/opt/policy/config/drools/base.conf
+++ b/kubernetes/policy/charts/drools/resources/config/opt/policy/config/drools/base.conf
@@ -29,9 +29,9 @@ ENGINE_MANAGEMENT_PASSWORD=31nst31n
# nexus repository
snapshotRepositoryID=policy-nexus-snapshots
-snapshotRepositoryUrl=http://{{.Release.Name}}-{{.Values.global.nexus.nameOverride}}:8081/nexus/content/repositories/snapshots/
+snapshotRepositoryUrl=http://{{.Release.Name}}-{{.Values.global.nexus.nameOverride}}:{{.Values.config.nexusPort}}/nexus/content/repositories/snapshots/
releaseRepositoryID=policy-nexus-releases
-releaseRepositoryUrl=http://{{.Release.Name}}-{{.Values.global.nexus.nameOverride}}:8081/nexus/content/repositories/releases/
+releaseRepositoryUrl=http://{{.Release.Name}}-{{.Values.global.nexus.nameOverride}}:{{.Values.config.nexusPort}}/nexus/content/repositories/releases/
repositoryUsername=admin
repositoryPassword=admin123
diff --git a/kubernetes/policy/charts/drools/templates/NOTES.txt b/kubernetes/policy/charts/drools/templates/NOTES.txt
index 91d8ed42f1..c60c745ca3 100644
--- a/kubernetes/policy/charts/drools/templates/NOTES.txt
+++ b/kubernetes/policy/charts/drools/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/drools/templates/deployment.yaml b/kubernetes/policy/charts/drools/templates/statefulset.yaml
index 349f88245e..edff99a7cd 100644
--- a/kubernetes/policy/charts/drools/templates/deployment.yaml
+++ b/kubernetes/policy/charts/drools/templates/statefulset.yaml
@@ -12,8 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: extensions/v1beta1
-kind: Deployment
+apiVersion: apps/v1beta1
+kind: StatefulSet
metadata:
name: {{ include "common.fullname" . }}
namespace: {{ include "common.namespace" . }}
@@ -23,7 +23,11 @@ metadata:
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
spec:
+ serviceName: {{ include "common.fullname" . }}
replicas: {{ .Values.replicaCount }}
+ selector:
+ matchLabels:
+ app: {{ include "common.name" . }}
template:
metadata:
labels:
@@ -48,7 +52,7 @@ spec:
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-readiness
hostAliases:
- - ip: "{{ .Values.aaiServiceClusterIp }}"
+ - ip: "{{ .Values.config.aaiServiceClusterIp }}"
hostnames:
- "aai.api.simpledemo.openecomp.org"
containers:
diff --git a/kubernetes/policy/charts/drools/values.yaml b/kubernetes/policy/charts/drools/values.yaml
index 14ebe31be2..07499cd362 100644
--- a/kubernetes/policy/charts/drools/values.yaml
+++ b/kubernetes/policy/charts/drools/values.yaml
@@ -34,15 +34,13 @@ pullPolicy: Always
# flag to enable debugging - application support required
debugEnabled: false
-aaiServiceClusterIp: 10.43.255.254
# application configuration
-# Example:
-config: {}
-# username: myusername
-# password: mypassword
+config:
+ nexusPort: 8081
+ aaiServiceClusterIp: 10.43.255.254
# default number of instances
-replicaCount: 1
+replicaCount: 4
nodeSelector: {}