From 120de810458e3948fd07f5431dd837fc10b73e9a Mon Sep 17 00:00:00 2001
From: Matteo Di Carlo <matteo.dicarlo@inaf.it>
Date: Tue, 15 Nov 2022 17:37:39 +0100
Subject: [PATCH] ST-1431 bump ska-tango-util
Signed-off-by: Matteo Di Carlo <matteo.dicarlo@inaf.it>
---
.gitlab-ci.yml | 1 -
.release | 4 ++--
charts/ska-tango-base/Chart.yaml | 4 ++--
charts/ska-tango-umbrella/Chart.yaml | 6 +++---
charts/ska-tango-util/Chart.yaml | 4 ++--
charts/ska-tango-util/templates/_multidevice-svc.yaml | 4 ++--
6 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8a03f040..0e62239c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -79,7 +79,6 @@ ska-tango-examples-tests:
export BASE_IMAGE="${CI_REGISTRY}/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/ska-tango-images-pytango-runtime:${VERS}"
export OCI_BUILD_ADDITIONAL_ARGS="--no-cache --build-arg BUILD_IMAGE --build-arg BASE_IMAGE "
export PYTANGO_VERSION="$(docker run ${BUILD_IMAGE} pip list | grep pytango | awk '{print $2}')"
- echo "PYTANGO_VERSION= " $PYTANGO_VERSION
response=$(curl --request POST \
--form token=$CI_JOB_TOKEN \
--form ref=master \
diff --git a/.release b/.release
index 6ebfd1a7..c00ac63d 100644
--- a/.release
+++ b/.release
@@ -1,2 +1,2 @@
-release=0.3.24
-tag=0.3.24
+release=0.3.25
+tag=0.3.25
diff --git a/charts/ska-tango-base/Chart.yaml b/charts/ska-tango-base/Chart.yaml
index e32b7262..29df8ca0 100644
--- a/charts/ska-tango-base/Chart.yaml
+++ b/charts/ska-tango-base/Chart.yaml
@@ -2,9 +2,9 @@ apiVersion: v2
appVersion: 0.3.23
description: A Helm chart for deploying the TANGO base system on Kubernetes
name: ska-tango-base
-version: 0.3.24
+version: 0.3.25
icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
dependencies:
- name: ska-tango-util
- version: 0.3.22
+ version: 0.3.23
repository: file://../ska-tango-util
diff --git a/charts/ska-tango-umbrella/Chart.yaml b/charts/ska-tango-umbrella/Chart.yaml
index 90db9f22..945d2502 100644
--- a/charts/ska-tango-umbrella/Chart.yaml
+++ b/charts/ska-tango-umbrella/Chart.yaml
@@ -2,14 +2,14 @@ apiVersion: v2
appVersion: 0.2.5
description: A Helm chart for deploying the TANGO base system on Kubernetes
name: ska-tango-umbrella
-version: 0.2.5
+version: 0.2.6
icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
dependencies:
- name: ska-tango-base
- version: 0.3.24
+ version: 0.3.25
repository: file://../ska-tango-base
condition: ska-tango-base.enabled,global.sub-system.ska-tango-base.enabled
- name: ska-tango-util
- version: 0.3.22
+ version: 0.3.23
repository: file://../ska-tango-util
diff --git a/charts/ska-tango-util/Chart.yaml b/charts/ska-tango-util/Chart.yaml
index 62c74a14..8a64a070 100644
--- a/charts/ska-tango-util/Chart.yaml
+++ b/charts/ska-tango-util/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
description: A Helm chart library of utilities for TANGO deployents
name: ska-tango-util
type: library
-appVersion: 0.3.22
-version: 0.3.22
+appVersion: 0.3.23
+version: 0.3.23
icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
maintainers:
- name: Matteo Di Carlo
diff --git a/charts/ska-tango-util/templates/_multidevice-svc.yaml b/charts/ska-tango-util/templates/_multidevice-svc.yaml
index 62552de8..a1c1c708 100644
--- a/charts/ska-tango-util/templates/_multidevice-svc.yaml
+++ b/charts/ska-tango-util/templates/_multidevice-svc.yaml
@@ -312,13 +312,13 @@ spec:
{{- if $chart.Values.global.environment_variables }}
{{- range $index, $envvar := $chart.Values.global.environment_variables }}
- name: {{$envvar.name}}
- value: {{tpl ($envvar.value | toString) $chart }}
+ value: {{tpl ($envvar.value | toString) $chart | quote }}
{{- end }}
{{- end }}
{{- if $deviceserver.environment_variables }}
{{- range $index, $envvar := $deviceserver.environment_variables }}
- name: {{$envvar.name}}
- value: {{tpl ($envvar.value | toString) $chart }}
+ value: {{tpl ($envvar.value | toString) $chart | quote }}
{{- end }}
{{- end }}
{{- if not $chart.Values.do_not_constraint_resources }}
--
GitLab