From cf636eccebb2bd38564f42ff0f9c2ae70b5d940c Mon Sep 17 00:00:00 2001
From: Matteo Di Carlo <matteo.dicarlo@inaf.it>
Date: Tue, 21 Feb 2023 15:56:48 +0100
Subject: [PATCH] ST-1502 fix cluster domain
Signed-off-by: Matteo Di Carlo <matteo.dicarlo@inaf.it>
---
charts/ska-tango-base/templates/databaseds.yaml | 1 +
charts/ska-tango-util/templates/_operator-ds.yaml | 2 ++
2 files changed, 3 insertions(+)
diff --git a/charts/ska-tango-base/templates/databaseds.yaml b/charts/ska-tango-base/templates/databaseds.yaml
index 54f6e0b6..43254d5e 100644
--- a/charts/ska-tango-base/templates/databaseds.yaml
+++ b/charts/ska-tango-base/templates/databaseds.yaml
@@ -35,6 +35,7 @@ metadata:
{{- end }}
{{- end }}
spec:
+ clusterDomain: {{ $cluster_domain }}
usePV: {{ .Values.tangodb.use_pv }}
{{- if or (.Values.global.minikube) (.Values.global.exposeAllDS) }}
enableLoadBalancer: true
diff --git a/charts/ska-tango-util/templates/_operator-ds.yaml b/charts/ska-tango-util/templates/_operator-ds.yaml
index ede63990..1995ebbf 100644
--- a/charts/ska-tango-util/templates/_operator-ds.yaml
+++ b/charts/ska-tango-util/templates/_operator-ds.yaml
@@ -12,6 +12,7 @@ Parameters:
{{- $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 }}
{{- $databaseds_name := (split ":" $tango_host)._0 }}
+{{- $cluster_domain := coalesce .local.Values.global.cluster_domain "cluster.local" }}
{{- $chart := .local }}
{{- $deviceserver := .deviceserver }}
{{- $deviceserver_name := tpl (coalesce .name .deviceserver.name | toString) .local }}
@@ -35,6 +36,7 @@ metadata:
{{ toYaml $annotations | indent 4 }}
{{- end }}
spec:
+ clusterDomain: {{ $cluster_domain }}
{{- if or ($chart.Values.global.minikube) ($chart.Values.global.exposeAllDS) ($deviceserver.exposeDS) }}
enableLoadBalancer: true
{{- end }}
--
GitLab