Merge branch 'st-1112' into 'master'

ST-1112

See merge request ska-telescope/ska-tango-images!139

.gitignore

@@ -25,3 +25,5 @@ charts/ska-tango-umbrella/charts
 charts/ska-tango-umbrella/Chart.lock
 # we generate this values.yaml
 charts/ska-tango-base/values.yaml
+charts/generated_values.yaml
+charts/values.yaml

charts/ska-tango-base/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 0.3.10
 description: A Helm chart for deploying the TANGO base system on Kubernetes
 name: ska-tango-base
-version: 0.3.6
+version: 0.3.7
 icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
 dependencies:
 - name: ska-tango-util

charts/ska-tango-base/templates/databaseds.yaml

+{{ $cluster_domain := coalesce .Values.global.cluster_domain "cluster.local" }}
 {{ $databaseds_name := (split ":" .Values.global.tango_host)._0 }} 
 {{ $databaseds_port := (split ":" .Values.global.tango_host)._1 }}
 {{ $tries := coalesce  .Values.global.tries 10}}
 {{ $sleep := coalesce  .Values.global.sleep 5}}
+
 ---
 
 apiVersion: v1
@@ -117,7 +119,7 @@ spec:
           - -ORBendPoint
           - giop:tcp::{{ $databaseds_port }}
           - -ORBendPointPublish
-          - giop:tcp:{{ tpl ($databaseds_name | toString) . }}:{{ $databaseds_port }}
+          - giop:tcp:$(TANGO_SERVER_PUBLISH_HOSTNAME):{{ $databaseds_port }}
         env:
           - name: MYSQL_HOST
             value: "{{ template "ska-tango-base.name" . }}-{{ .Values.tangodb.component }}:3306"
@@ -127,6 +129,8 @@ spec:
             value: "{{ .Values.tangodb.db.user }}"
           - name: MYSQL_PASSWORD
             value: "{{ .Values.tangodb.db.password }}"
+          - name: TANGO_SERVER_PUBLISH_HOSTNAME
+            value: {{ tpl ($databaseds_name | toString) . }}.{{ .Release.Namespace }}.svc.{{ $cluster_domain }}
         ports:
         - name: ds
           containerPort: {{ $databaseds_port }}

charts/ska-tango-base/tests/databaseds_test.yaml

@@ -193,4 +193,4 @@ tests:
             - -ORBendPoint
             - giop:tcp::40000
             - -ORBendPointPublish
-            - giop:tcp:databaseds-test:40000
+            - giop:tcp:$(TANGO_SERVER_PUBLISH_HOSTNAME):40000

charts/ska-tango-umbrella/Chart.yaml

@@ -6,7 +6,7 @@ version: 0.2.0
 icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
 dependencies:
 - name: ska-tango-base
-  version: 0.3.6
+  version: 0.3.7
   repository: file://../ska-tango-base
   condition: ska-tango-base.enabled,global.sub-system.ska-tango-base.enabled
 - name: ska-tango-util