Skip to content
Snippets Groups Projects
Commit 8f2bf63c authored by Matteo Di Carlo's avatar Matteo Di Carlo
Browse files

Merge branch 'ST-1502-add-cluster-domain' into 'master'

ST-1502 fix cluster domain

See merge request ska-telescope/ska-tango-images!187
parents 3f48b716 9ce3d155
No related branches found
No related tags found
Loading
release=0.4.2 release=0.4.3
tag=0.4.2 tag=0.4.3
apiVersion: v2 apiVersion: v2
description: A Helm chart for deploying the TANGO base system on Kubernetes description: A Helm chart for deploying the TANGO base system on Kubernetes
name: ska-tango-base name: ska-tango-base
version: 0.4.1 version: 0.4.2
appVersion: 0.4.1 appVersion: 0.4.2
icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
dependencies: dependencies:
- name: ska-tango-util - name: ska-tango-util
version: 0.4.1 version: 0.4.2
repository: file://../ska-tango-util repository: file://../ska-tango-util
...@@ -35,6 +35,7 @@ metadata: ...@@ -35,6 +35,7 @@ metadata:
{{- end }} {{- end }}
{{- end }} {{- end }}
spec: spec:
clusterDomain: {{ $cluster_domain }}
usePV: {{ .Values.tangodb.use_pv }} usePV: {{ .Values.tangodb.use_pv }}
{{- if or (.Values.global.minikube) (.Values.global.exposeAllDS) }} {{- if or (.Values.global.minikube) (.Values.global.exposeAllDS) }}
enableLoadBalancer: true enableLoadBalancer: true
......
...@@ -6,10 +6,10 @@ appVersion: 0.2.8 ...@@ -6,10 +6,10 @@ appVersion: 0.2.8
icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
dependencies: dependencies:
- name: ska-tango-base - name: ska-tango-base
version: 0.4.1 version: 0.4.2
repository: file://../ska-tango-base repository: file://../ska-tango-base
condition: ska-tango-base.enabled,global.sub-system.ska-tango-base.enabled condition: ska-tango-base.enabled,global.sub-system.ska-tango-base.enabled
- name: ska-tango-util - name: ska-tango-util
version: 0.4.1 version: 0.4.2
repository: file://../ska-tango-util repository: file://../ska-tango-util
...@@ -2,8 +2,8 @@ apiVersion: v2 ...@@ -2,8 +2,8 @@ apiVersion: v2
description: A Helm chart library of utilities for TANGO deployents description: A Helm chart library of utilities for TANGO deployents
name: ska-tango-util name: ska-tango-util
type: library type: library
appVersion: 0.4.1 appVersion: 0.4.2
version: 0.4.1 version: 0.4.2
icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
maintainers: maintainers:
- name: Matteo Di Carlo - name: Matteo Di Carlo
......
...@@ -12,6 +12,7 @@ Parameters: ...@@ -12,6 +12,7 @@ Parameters:
{{- $default_tango_host := printf "%s-%s:10000" "databaseds-tango-base-" .local.Release.Name }} {{- $default_tango_host := printf "%s-%s:10000" "databaseds-tango-base-" .local.Release.Name }}
{{- $tango_host := tpl (coalesce .local.Values.global.tango_host .local.Values.tango_host $default_tango_host | toString) .local }} {{- $tango_host := tpl (coalesce .local.Values.global.tango_host .local.Values.tango_host $default_tango_host | toString) .local }}
{{- $databaseds_name := (split ":" $tango_host)._0 }} {{- $databaseds_name := (split ":" $tango_host)._0 }}
{{- $cluster_domain := coalesce .local.Values.global.cluster_domain "cluster.local" }}
{{- $chart := .local }} {{- $chart := .local }}
{{- $deviceserver := .deviceserver }} {{- $deviceserver := .deviceserver }}
{{- $deviceserver_name := tpl (coalesce .name .deviceserver.name | toString) .local }} {{- $deviceserver_name := tpl (coalesce .name .deviceserver.name | toString) .local }}
...@@ -35,6 +36,7 @@ metadata: ...@@ -35,6 +36,7 @@ metadata:
{{ toYaml $annotations | indent 4 }} {{ toYaml $annotations | indent 4 }}
{{- end }} {{- end }}
spec: spec:
clusterDomain: {{ $cluster_domain }}
{{- if or ($chart.Values.global.minikube) ($chart.Values.global.exposeAllDS) ($deviceserver.exposeDS) }} {{- if or ($chart.Values.global.minikube) ($chart.Values.global.exposeAllDS) ($deviceserver.exposeDS) }}
enableLoadBalancer: true enableLoadBalancer: true
{{- end }} {{- end }}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment