diff options
| author |   Mandeep Khinda <mandeep.khinda@amdocs.com> | 2018-04-06 03:03:24 +0000 |
|---|---|---|
| committer | Mandeep Khinda <mandeep.khinda@amdocs.com> | 2018-04-06 03:03:24 +0000 |
| commit | 454e2fd0872dfe433e3edacdf69fde523b32c5a0 (patch) | |
| tree | d1573cac855e889528b8d03d9e60895213524a5f /kubernetes/portal/charts/portal-widget | |
| parent | 1db773e68e50f333369ccde727166805bce2b795 (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-widget')
3 files changed, 3 insertions, 4 deletions
diff --git a/kubernetes/portal/charts/portal-widget/resources/config/deliveries/properties/ONAPWIDGETMS/application.properties b/kubernetes/portal/charts/portal-widget/resources/config/deliveries/properties/ONAPWIDGETMS/application.properties index 3f4f950a58..b7a20734c6 100644 --- a/kubernetes/portal/charts/portal-widget/resources/config/deliveries/properties/ONAPWIDGETMS/application.properties +++ b/kubernetes/portal/charts/portal-widget/resources/config/deliveries/properties/ONAPWIDGETMS/application.properties @@ -6,7 +6,7 @@ spring.http.multipart.max-request-size=128MB microservice.widget.location=/tmp ## App DB Properties -spring.datasource.url=jdbc:mysql://{{.Values.mariadb.service.name}}.{{include "common.namespace" .}}:3306/portal +spring.datasource.url=jdbc:mysql://{{.Release.Name}}-{{.Values.mariadb.chart.name}}.{{include "common.namespace" .}}:3306/portal spring.datasource.username=root spring.datasource.password=Aa123456 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQLDialect diff --git a/kubernetes/portal/charts/portal-widget/templates/deployment.yaml b/kubernetes/portal/charts/portal-widget/templates/deployment.yaml index 0fb3c10384..bff7924e29 100644 --- a/kubernetes/portal/charts/portal-widget/templates/deployment.yaml +++ b/kubernetes/portal/charts/portal-widget/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-widget/values.yaml b/kubernetes/portal/charts/portal-widget/values.yaml index 3969dc8c2b..706dc2f74f 100644 --- a/kubernetes/portal/charts/portal-widget/values.yaml +++ b/kubernetes/portal/charts/portal-widget/values.yaml @@ -55,8 +55,7 @@ readiness: periodSeconds: 10 mariadb: - nameOverride: portal-db - service: + chart: name: portal-db service: |