summaryrefslogtreecommitdiffstats
path: root/kubernetes/portal/charts/portal-sdk
diff options
context:
space:
mode:
authorMandeep Khinda <mandeep.khinda@amdocs.com>2018-04-06 03:03:24 +0000
committerMandeep Khinda <mandeep.khinda@amdocs.com>2018-04-06 03:03:24 +0000
commit454e2fd0872dfe433e3edacdf69fde523b32c5a0 (patch)
treed1573cac855e889528b8d03d9e60895213524a5f /kubernetes/portal/charts/portal-sdk
parent1db773e68e50f333369ccde727166805bce2b795 (diff)
Correcting portal k8s configmap service names
The service.name is really a port name and was being used wrong. Need a better way than this to get dependant chart names. This gets it working. Issue-ID: OOM-842 Change-Id: I6a78a5adb0e69524a90aa3386009a0d87ebed73c Signed-off-by: Mandeep Khinda <mandeep.khinda@amdocs.com>
Diffstat (limited to 'kubernetes/portal/charts/portal-sdk')
-rw-r--r--kubernetes/portal/charts/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/music.properties4
-rwxr-xr-xkubernetes/portal/charts/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/portal.properties2
-rwxr-xr-xkubernetes/portal/charts/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/system.properties2
-rw-r--r--kubernetes/portal/charts/portal-sdk/templates/deployment.yaml2
-rw-r--r--kubernetes/portal/charts/portal-sdk/values.yaml18
5 files changed, 15 insertions, 13 deletions
diff --git a/kubernetes/portal/charts/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/music.properties b/kubernetes/portal/charts/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/music.properties
index 742b5ea328..59d438a669 100644
--- a/kubernetes/portal/charts/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/music.properties
+++ b/kubernetes/portal/charts/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/music.properties
@@ -14,7 +14,7 @@ music.serialize.compress = true
music.atomic.get = false
music.atomic.put = true
-cassandra.host={{.Values.cassandra.service.name}}.{{.Release.Namespace}}
-zookeeper.host={{.Values.zookeeper.service.name}}.{{.Release.Namespace}}
+cassandra.host={{.Release.Name}}-{{.Values.cassandra.chart.name}}.{{.Release.Namespace}}
+zookeeper.host={{.Release.Name}}-{{.Values.zookeeper.chart.name}}.{{.Release.Namespace}}
cassandra.user={{.Values.cassandra.config.cassandraUsername}}
cassandra.password={{.Values.cassandra.config.cassandraPassword}} \ No newline at end of file
diff --git a/kubernetes/portal/charts/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/portal.properties b/kubernetes/portal/charts/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/portal.properties
index 32dd1f9c2a..4b6f251e8b 100755
--- a/kubernetes/portal/charts/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/portal.properties
+++ b/kubernetes/portal/charts/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/portal.properties
@@ -30,7 +30,7 @@ ecomp_rest_url = http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/auxapi
ueb_listeners_enable = false
# UEB Configuration
-ueb_url_list = dmaap.{{.Release.Namespace}}
+ueb_url_list = {{.Values.messageRouter.chart.name}}.{{.Release.Namespace}}
# ECOMP Portal listens on this UEB topic
ecomp_portal_inbox_name = ECOMP-PORTAL-INBOX
# Replace these 3 default values with the ones for your specific App,
diff --git a/kubernetes/portal/charts/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/system.properties b/kubernetes/portal/charts/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/system.properties
index 6b8e685fcd..6fbf5b750e 100755
--- a/kubernetes/portal/charts/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/system.properties
+++ b/kubernetes/portal/charts/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/system.properties
@@ -24,7 +24,7 @@ decryption_key = AGLDdG4D04BKm2IxIWEr8o==
##########################################################################
db.driver = org.mariadb.jdbc.Driver
-db.connectionURL = jdbc:mariadb://{{.Values.mariadb.service.name}}.{{.Release.Namespace}}:3306/ecomp_sdk
+db.connectionURL = jdbc:mariadb://{{.Release.Name}}-{{.Values.mariadb.chart.name}}.{{.Release.Namespace}}:3306/ecomp_sdk
db.userName = root
db.password = Aa123456
db.min_pool_size = 5
diff --git a/kubernetes/portal/charts/portal-sdk/templates/deployment.yaml b/kubernetes/portal/charts/portal-sdk/templates/deployment.yaml
index 09f2e45a25..1c94c78bb4 100644
--- a/kubernetes/portal/charts/portal-sdk/templates/deployment.yaml
+++ b/kubernetes/portal/charts/portal-sdk/templates/deployment.yaml
@@ -38,7 +38,7 @@ spec:
- /root/ready.py
args:
- --container-name
- - {{ .Values.mariadb.nameOverride }}
+ - {{ .Values.mariadb.chart.name }}
env:
- name: NAMESPACE
valueFrom:
diff --git a/kubernetes/portal/charts/portal-sdk/values.yaml b/kubernetes/portal/charts/portal-sdk/values.yaml
index e4556fa31c..010b4c11bd 100644
--- a/kubernetes/portal/charts/portal-sdk/values.yaml
+++ b/kubernetes/portal/charts/portal-sdk/values.yaml
@@ -60,21 +60,23 @@ service:
internalPort: 8080
mariadb:
- nameOverride: portal-db
- service:
+ chart:
name: portal-db
-
+widget:
+ chart:
+ name: portal-widget
cassandra:
- service:
+ chart:
name: portal-cassandra
config:
cassandraUsername: root
cassandraPassword: Aa123456
-
zookeeper:
- service:
- name: portal-zk
-
+ chart:
+ name: portal-zookeeper
+messageRouter:
+ chart:
+ name: message-router
ingress:
enabled: false