Merge branch 'add-kubectl-wait' into 'master'

Add retry

See merge request ska-telescope/ska-docker!46

charts/Makefile

@@ -102,8 +102,8 @@ wait:## wait for pods to be ready
 	@echo "Waiting for pods to be ready"
 	@date
 	@kubectl -n $(KUBE_NAMESPACE) get pods
-	@jobs=$$(kubectl get job --output=jsonpath={.items..metadata.name} -n $(KUBE_NAMESPACE)); kubectl wait job --for=condition=complete --timeout=120s $$jobs -n $(KUBE_NAMESPACE)
-	@kubectl -n $(KUBE_NAMESPACE) wait --for=condition=ready -l app=ska-docker --timeout=120s pods || exit 1
+	@jobs=$$(kubectl get job --output=jsonpath={.items..metadata.name} -n $(KUBE_NAMESPACE)); kubectl wait job --for=condition=complete --timeout=300s $$jobs -n $(KUBE_NAMESPACE)
+	@kubectl -n $(KUBE_NAMESPACE) wait --for=condition=ready -l app=ska-docker --timeout=300s pods || exit 1
 	@date
 
 #

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.9
+version: 0.2.10
 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.6
+  version: 0.2.7
   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/archiver/values.yaml

@@ -94,7 +94,7 @@ hdbppdb:
     failureThreshold: 3
 
 deviceServers:
-- name: arhiver-cm-archiver-test
+- name: archiver-cm-archiver-test
   function: tango-archiver-service
   domain: archiver
   command: "./usr/local/bin/hdbppcm-srv"
@@ -119,7 +119,7 @@ deviceServers:
       cpu: 200m     # 200m = 0.2 CPU
       memory: 256Mi # 256Mi = 0.25 GB mem
       ephemeral-storage: 1Gi
-- name: arhiver-es-archiver-test
+- name: archiver-es-archiver-test
   function: tango-archiver-service
   domain: archiver
   command: "./usr/local/bin/hdbppes-srv"

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.8
+version: 0.1.9
 icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
 dependencies:
 - name: tango-base
-  version: 0.2.9
+  version: 0.2.10
   repository: file://../tango-base
   condition: tango-base.enabled,global.sub-system.tango-base.enabled
 - name: archiver
-  version: 0.2.9
+  version: 0.2.10
   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.9
+version: 0.2.10
 icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
 dependencies:
 - name: tango-util
-  version: 0.2.6
+  version: 0.2.7
   repository: file://../tango-util

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.6
-version: 0.2.6
+appVersion: 0.2.7
+version: 0.2.7
 icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
 maintainers:
 - name: Matteo Di Carlo

charts/tango-util/templates/_deviceserver.yaml

@@ -7,7 +7,7 @@
 {{ $dsconfig := coalesce .local.Values.global.dsconfig .local.Values.dsconfig}}
 {{ $chart := .local }}
 {{ $safe_instance := .instance |toString | replace "_" "-" }}
-
+---
 # Device Server Service 
 # Parameter: deviceserver struct, global.Values.dsconfig struct, project image struct
 # giving a dummy Service entry ensures that the single pod is DNS addressable
@@ -118,7 +118,7 @@ spec:
           - sh
           - -c
         args:
-          - {{ .deviceserver.command | toString }} {{ .instance |toString }}
+          - retry --max=10 -- {{ .deviceserver.command | toString }} {{ .instance |toString }}
         env:
         - name: TANGO_HOST
           value: {{ $tango_host }}