From 3a3bb192dfeefb629f10d76e518199a031723527 Mon Sep 17 00:00:00 2001 From: Matteo Di Carlo <matteo.dicarlo@inaf.it> Date: Mon, 26 Oct 2020 09:04:06 +0000 Subject: [PATCH] ping-device not check-device --- charts/archiver/Chart.yaml | 4 ++-- charts/ska-docker/Chart.yaml | 6 +++--- charts/tango-base/Chart.yaml | 4 ++-- charts/tango-util/Chart.yaml | 4 ++-- .../tango-util/templates/_configuration.yaml | 20 +++++++++---------- .../tango-util/templates/_deviceserver.yaml | 2 +- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/charts/archiver/Chart.yaml b/charts/archiver/Chart.yaml index 7cee69ae..b119c227 100644 --- a/charts/archiver/Chart.yaml +++ b/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 diff --git a/charts/ska-docker/Chart.yaml b/charts/ska-docker/Chart.yaml index b9f636d0..7c35a0c9 100644 --- a/charts/ska-docker/Chart.yaml +++ b/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 diff --git a/charts/tango-base/Chart.yaml b/charts/tango-base/Chart.yaml index 808bb576..e2b033e1 100644 --- a/charts/tango-base/Chart.yaml +++ b/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 diff --git a/charts/tango-util/Chart.yaml b/charts/tango-util/Chart.yaml index 2a757c37..d3a68dfa 100644 --- a/charts/tango-util/Chart.yaml +++ b/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 diff --git a/charts/tango-util/templates/_configuration.yaml b/charts/tango-util/templates/_configuration.yaml index 6e79d10f..a8968fe4 100644 --- a/charts/tango-util/templates/_configuration.yaml +++ b/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) $ }} diff --git a/charts/tango-util/templates/_deviceserver.yaml b/charts/tango-util/templates/_deviceserver.yaml index 7005d069..3fc640bd 100644 --- a/charts/tango-util/templates/_deviceserver.yaml +++ b/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 -- GitLab