ping-device not check-device

charts/archiver/Chart.yaml

@@ -2,12 +2,12 @@ apiVersion: v2
 appVersion: "1.0"
 description: A Helm chart for deploying the HDB++ archiver for the MVP on Kubernetes
 name: archiver
-version: 0.2.6
+version: 0.2.7
 appVersion: 1.16.0
 icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
 dependencies:
 - name: tango-util
-  version: 0.2.3
+  version: 0.2.4
   repository: file://../tango-util
 # The archiver cannot have the tango-base since we allow only one level in the chart hierarchies
 # - name: tango-base

charts/ska-docker/Chart.yaml

@@ -2,14 +2,14 @@ apiVersion: v2
 appVersion: "1.0"
 description: A Helm chart for deploying the TANGO base system on Kubernetes
 name: ska-docker
-version: 0.1.6
+version: 0.1.7
 icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
 dependencies:
 - name: tango-base
-  version: 0.2.6
+  version: 0.2.7
   repository: file://../tango-base
   condition: tango-base.enabled,global.sub-system.tango-base.enabled
 - name: archiver
-  version: 0.2.6
+  version: 0.2.7
   repository: file://../archiver
   condition: archiver.enabled,global.sub-system.archiver.enabled

charts/tango-base/Chart.yaml

@@ -2,9 +2,9 @@ apiVersion: v2
 appVersion: "1.0"
 description: A Helm chart for deploying the TANGO base system on Kubernetes
 name: tango-base
-version: 0.2.6
+version: 0.2.7
 icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
 dependencies:
 - name: tango-util
-  version: 0.2.3
+  version: 0.2.4
   repository: file://../tango-util
\ No newline at end of file

charts/tango-util/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 description: A Helm chart library of utilities for TANGO deployents
 name: tango-util
 type: library
-appVersion: 0.2.3
-version: 0.2.3
+appVersion: 0.2.4
+version: 0.2.4
 icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
 maintainers:
 - name: Matteo Di Carlo

charts/tango-util/templates/_configuration.yaml

@@ -2,6 +2,8 @@
 {{ $default_tango_host := printf "%s-%s" "databaseds-tango-base-" .Release.Name }}
 {{ $tango_host := tpl (coalesce .Values.global.tango_host .Values.tango_host $default_tango_host | toString) . }}
 {{ $dsconfig := coalesce .Values.global.dsconfig .Values.dsconfig}}
+{{ $default_tango_host := printf "%s-%s" "databaseds-tango-base-" .Release.Name }}
+{{ $tango_host := tpl (coalesce .Values.global.tango_host .Values.tango_host $default_tango_host | toString) . }}
 {{ $itango := coalesce .Values.global.itango .Values.itango}}
 ---
 # Device Server configurations
@@ -58,19 +60,17 @@ spec:
     spec:
       initContainers:
       - name: check-databaseds-ready
-        image: {{ $itango.image.registry }}/{{ $itango.image.image }}:{{ $itango.image.tag }}
-        imagePullPolicy: {{ $itango.image.pullPolicy }}
+        image: {{ $dsconfig.image.registry }}/{{ $dsconfig.image.image }}:{{ $dsconfig.image.tag }}
+        imagePullPolicy: {{ $dsconfig.image.pullPolicy }}
         command:
-          - retry
-          - --max=10
+          - /usr/local/bin/wait-for-it.sh
+          - {{ $tango_host }}
+          - --timeout=60
+          - --strict
           - --
-          - tango_admin
-          - --check-device
-          - sys/database/2
-        env:
-        - name: TANGO_HOST
-          value: {{ $tango_host }}
+          - echo {{ $tango_host }} ready
 {{- if (.Values.global.environment_variables) }}
+        env:
 {{- range $index, $envvar := .Values.global.environment_variables }}
         - name: {{$envvar.name}}
           value: {{tpl ($envvar.value | toString) $ }}

charts/tango-util/templates/_deviceserver.yaml

@@ -92,7 +92,7 @@ spec:
           - --max=10
           - --
           - tango_admin
-          - --check-device
+          - --ping-device
           - {{ $device.device | toString }}
         env:
         - name: TANGO_HOST