ST-515 fixes

charts/Makefile

@@ -92,7 +92,7 @@ uninstall-chart: ## uninstall the ska-docker helm chart on the namespace ska-doc
 reinstall-chart: uninstall-chart install-chart ## reinstall the ska-docker helm chart on the namespace ska-docker
 
 upgrade-chart: ## upgrade the ska-docker helm chart on the namespace ska-docker
-	@helm upgrade --set global.minikube=$(MINIKUBE) $(RELEASE_NAME) $(UMBRELLA_CHART_PATH) --namespace $(KUBE_NAMESPACE)
+	@helm upgrade --set global.minikube=$(MINIKUBE) --set global.tango_host=$(TANGO_HOST) $(RELEASE_NAME) $(UMBRELLA_CHART_PATH) --namespace $(KUBE_NAMESPACE)
 
 chart_lint: ## lint check the helm chart
 	@helm lint $(UMBRELLA_CHART_PATH) \

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.3
+version: 0.2.4
 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.1
+  version: 0.2.2
   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/templates/configurations.yaml

@@ -4,6 +4,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}}
+{{ $itango := coalesce .Values.global.itango .Values.itango}}
 
 ---
 apiVersion: v1
@@ -41,8 +43,8 @@ spec:
           name: "attrconfig-configuration-{{ template "archiver.name" . }}-{{ .Release.Name }}"
       initContainers:
         - name: wait-for-devices
-          image: "{{ .Values.global.dsconfig.image.registry }}/{{ .Values.global.dsconfig.image.image }}:{{ .Values.global.dsconfig.image.tag }}"
-          imagePullPolicy: {{ .Values.global.dsconfig.image.pullPolicy }}
+          image: "{{ $dsconfig.image.registry }}/{{ $dsconfig.image.image }}:{{ $dsconfig.image.tag }}"
+          imagePullPolicy: {{ $dsconfig.image.pullPolicy }}
           command:
             - sh
           args:
@@ -54,8 +56,8 @@ spec:
             value: {{ $tango_host }}
       containers:
       - name: attrconfig
-        image: "{{ .Values.global.itango.image.registry }}/{{ .Values.global.itango.image.image }}:{{ .Values.global.itango.image.tag }}"
-        imagePullPolicy: {{ .Values.global.itango.image.pullPolicy }}
+        image: "{{ $itango.image.registry }}/{{ $itango.image.image }}:{{ $itango.image.tag }}"
+        imagePullPolicy: {{ $itango.image.pullPolicy }}
         command:
           - sh
         args:

charts/archiver/values.yaml

@@ -12,19 +12,22 @@ telescope: SKA-mid
 
 global:
   minikube: true
+  tango_host: databaseds-tango-base-{{.Release.Name}}:10000
+
 labels:
   app: ska-docker
 annotations:
   app.gitlab.com/app: CI_PROJECT_PATH_SLUG
   app.gitlab.com/env: CI_ENVIRONMENT_SLUG
-  tango_host: databaseds-tango-base-{{.Release.Name}}:10000
-  environment_variables: []
+
 dsconfig:
+  configuration_file: data/configuration.json
   image:
     registry: nexus.engageska-portugal.pt/ska-docker
     image: tango-dsconfig
     tag: 1.5.0
     pullPolicy: IfNotPresent
+
 itango:
   image:
     registry: nexus.engageska-portugal.pt/ska-docker
@@ -32,9 +35,6 @@ global:
     tag: 9.3.1
     pullPolicy: IfNotPresent
 
-dsconfig:
-  configuration_file: data/configuration.json
-
 attributes: 
   configuration_file: data/attribute2archive.json
 

charts/ska-docker/Chart.yaml

@@ -5,14 +5,11 @@ name: ska-docker
 version: 0.1.5
 icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
 dependencies:
-- name: tango-util
-  version: 0.2.1
-  repository: file://../tango-util
 - name: tango-base
-  version: 0.2.4
+  version: 0.2.5
   repository: file://../tango-base
   condition: tango-base.enabled,global.sub-system.tango-base.enabled
 - name: archiver
-  version: 0.2.3
+  version: 0.2.4
   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.4
+version: 0.2.5
 icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
 dependencies:
 - name: tango-util
-  version: 0.2.1
+  version: 0.2.2
   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.1
-version: 0.2.1
+appVersion: 0.2.2
+version: 0.2.2
 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

 {{- define "tango-util.configuration.tpl" -}}
 {{ $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}}
+{{ $itango := coalesce .Values.global.itango .Values.itango}}
 ---
 # Device Server configurations
 apiVersion: v1
@@ -56,8 +58,8 @@ spec:
     spec:
       initContainers:
       - name: check-databaseds-ready
-        image: {{ .Values.global.itango.image.registry }}/{{ .Values.global.itango.image.image }}:{{ .Values.global.itango.image.tag }}
-        imagePullPolicy: {{ .Values.global.itango.image.pullPolicy }}
+        image: {{ $itango.image.registry }}/{{ $itango.image.image }}:{{ $itango.image.tag }}
+        imagePullPolicy: {{ $itango.image.pullPolicy }}
         command:
           - retry
           - --max=10
@@ -76,8 +78,8 @@ spec:
 {{- end }}
       containers:
       - name: dsconfig
-        image: "{{ .Values.global.dsconfig.image.registry }}/{{ .Values.global.dsconfig.image.image }}:{{ .Values.global.dsconfig.image.tag }}"
-        imagePullPolicy: {{ .Values.global.dsconfig.image.pullPolicy }}
+        image: "{{ $dsconfig.image.registry }}/{{ $dsconfig.image.image }}:{{ $dsconfig.image.tag }}"
+        imagePullPolicy: {{ $dsconfig.image.pullPolicy }}
         command: # exit code 2 is CONFIG_APPLIED - https://github.com/MaxIV-KitsControls/lib-maxiv-dsconfig/blob/master/dsconfig/utils.py#L11 !!!! this should not be an error !!!!
           - sh
           - data/bootstrap.sh