From c612d895490a530dd764bf69e45274f28bd0c4ce Mon Sep 17 00:00:00 2001 From: Matteo Di Carlo <matteo.dicarlo@inaf.it> Date: Mon, 26 Oct 2020 14:52:51 +0000 Subject: [PATCH] Add retry to wait for host --- charts/archiver/Chart.yaml | 4 ++-- charts/ska-docker/Chart.yaml | 2 +- charts/tango-base/Chart.yaml | 4 ++-- charts/tango-util/Chart.yaml | 4 ++-- charts/tango-util/templates/_configuration.yaml | 3 +++ charts/tango-util/templates/_deviceserver.yaml | 3 +++ 6 files changed, 13 insertions(+), 7 deletions(-) diff --git a/charts/archiver/Chart.yaml b/charts/archiver/Chart.yaml index b119c227..f4124001 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.7 +version: 0.2.8 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.4 + version: 0.2.5 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 7c35a0c9..338fb5e5 100644 --- a/charts/ska-docker/Chart.yaml +++ b/charts/ska-docker/Chart.yaml @@ -6,7 +6,7 @@ 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.7 + version: 0.2.8 repository: file://../tango-base condition: tango-base.enabled,global.sub-system.tango-base.enabled - name: archiver diff --git a/charts/tango-base/Chart.yaml b/charts/tango-base/Chart.yaml index e2b033e1..415c344c 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.7 +version: 0.2.8 icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png dependencies: - name: tango-util - version: 0.2.4 + version: 0.2.5 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 d3a68dfa..6c2fed2f 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.4 -version: 0.2.4 +appVersion: 0.2.5 +version: 0.2.5 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 a8968fe4..e8938ecc 100644 --- a/charts/tango-util/templates/_configuration.yaml +++ b/charts/tango-util/templates/_configuration.yaml @@ -63,6 +63,9 @@ spec: 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 diff --git a/charts/tango-util/templates/_deviceserver.yaml b/charts/tango-util/templates/_deviceserver.yaml index 3fc640bd..c7ab4103 100644 --- a/charts/tango-util/templates/_deviceserver.yaml +++ b/charts/tango-util/templates/_deviceserver.yaml @@ -69,6 +69,9 @@ spec: 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 - {{ $device.host }} - --timeout=60 -- GitLab