Merge branch 'ST-515-safe-instance-name' into 'master'

ST-515 - Make instance names k8s safe

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

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.8
+version: 0.2.9
 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.5
+  version: 0.2.6
   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/ska-docker/Chart.yaml

@@ -10,6 +10,6 @@ dependencies:
   repository: file://../tango-base
   condition: tango-base.enabled,global.sub-system.tango-base.enabled
 - name: archiver
-  version: 0.2.8
+  version: 0.2.9
   repository: file://../archiver
   condition: archiver.enabled,global.sub-system.archiver.enabled

charts/tango-base/Chart.yaml

@@ -6,5 +6,5 @@ version: 0.2.9
 icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
 dependencies:
 - name: tango-util
-  version: 0.2.5
+  version: 0.2.6
   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.5
-version: 0.2.5
+appVersion: 0.2.6
+version: 0.2.6
 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

@@ -6,6 +6,7 @@
 {{ $tango_host := tpl (coalesce .local.Values.global.tango_host .local.Values.tango_host $default_tango_host | toString) .local }}
 {{ $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
@@ -13,11 +14,11 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{tpl (.deviceserver.name | toString) $chart }}-{{ .instance | toString }}
+  name: {{tpl (.deviceserver.name | toString) $chart }}-{{ $safe_instance }}
   namespace: {{ .local.Release.Namespace }}
   labels:
 {{ toYaml $labels | indent 4 }}
-    component: {{tpl (.deviceserver.name | toString) $chart }}-{{ .instance | toString }}
+    component: {{tpl (.deviceserver.name | toString) $chart }}-{{ $safe_instance }}
     function: {{ .deviceserver.function }}
     domain: {{ .deviceserver.domain }}
     subsystem: {{ .local.Values.subsystem }}
@@ -26,18 +27,18 @@ metadata:
 spec:
   selector:
     subsystem: {{ .local.Values.subsystem }}
-    component: {{tpl (.deviceserver.name | toString) $chart }}-{{ .instance | toString }}
+    component: {{tpl (.deviceserver.name | toString) $chart }}-{{ $safe_instance }}
   clusterIP: None
 
 ---
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: {{tpl (.deviceserver.name | toString) $chart }}-{{ .instance | toString }}
+  name: {{tpl (.deviceserver.name | toString) $chart }}-{{ $safe_instance }}
   namespace: {{ .local.Release.Namespace }}
   labels:
 {{ toYaml $labels | indent 4 }}
-    component: {{tpl (.deviceserver.name | toString) $chart }}-{{ .instance | toString }}
+    component: {{tpl (.deviceserver.name | toString) $chart }}-{{ $safe_instance }}
     function: {{ .deviceserver.function }}
     domain: {{ .deviceserver.domain }}
     subsystem: {{ .local.Values.subsystem }}
@@ -46,14 +47,14 @@ metadata:
 spec:
   selector:
     matchLabels:
-      component: {{tpl (.deviceserver.name | toString) $chart }}-{{ .instance | toString }}
+      component: {{tpl (.deviceserver.name | toString) $chart }}-{{ $safe_instance }}
       subsystem: {{ .local.Values.subsystem }}
-  serviceName: {{tpl (.deviceserver.name | toString) $chart }}-{{ .instance | toString }}
+  serviceName: {{tpl (.deviceserver.name | toString) $chart }}-{{ $safe_instance }}
   replicas: 1
   template:
     metadata:
       labels:
-        component: {{tpl (.deviceserver.name | toString) $chart }}-{{ .instance | toString }}
+        component: {{tpl (.deviceserver.name | toString) $chart }}-{{ $safe_instance }}
         function: {{ .deviceserver.function }}
         domain: {{ .deviceserver.domain }}
         subsystem: {{ .local.Values.subsystem }}