Set cluster domain from helm values

robusta-dev · Oct 31, 2023 · dff1800 · dff1800
1 parent 7964bdd
commit dff1800
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 2 deletions.
diff --git a/helm/robusta/templates/runner.yaml b/helm/robusta/templates/runner.yaml
@@ -78,6 +78,8 @@ spec:
             value: {{ .Values.runner.certificate }}
           - name: IMAGE_REGISTRY
             value: {{ .Values.image.registry }}
+          - name: CLUSTER_DOMAIN
+            value: {{ .Values.global.clusterDomain }}
           {{- if kindIs "string" .Values.runner.additional_env_vars }}
           {{- fail "The `additional_env_vars` string value is deprecated. Change the `additional_env_vars` value to an array" -}}
           {{- end }}

diff --git a/helm/robusta/values.yaml b/helm/robusta/values.yaml
@@ -13,6 +13,9 @@ sinksConfig: []
 clusterName: ""
 clusterZone: ""
 
+global:
+  clusterDomain: "cluster.local"
+
 automountServiceAccountToken: true
 
 # see https://docs.robusta.dev/master/user-guide/configuration.html#global-config and https://docs.robusta.dev/master/configuration/additional-settings.html#global-config
@@ -540,7 +543,7 @@ kube-prometheus-stack:
         - name: 'null'
         - name:  'robusta'
           webhook_configs:
-            - url: 'http://robusta-runner.{{ .Release.Namespace }}/api/alerts'
+            - url: 'http://robusta-runner.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }}/api/alerts'
               send_resolved: true
     alertmanagerSpec:
       resources:

diff --git a/src/robusta/api/__init__.py b/src/robusta/api/__init__.py
@@ -38,6 +38,7 @@
 )
 from robusta.core.model.env_vars import (
     ALERT_BUILDER_WORKERS,
+    CLUSTER_DOMAIN,
     CLUSTER_STATUS_PERIOD_SEC,
     CUSTOM_PLAYBOOKS_ROOT,
     DEFAULT_PLAYBOOKS_PIP_INSTALL,

diff --git a/src/robusta/core/model/env_vars.py b/src/robusta/core/model/env_vars.py
@@ -96,3 +96,5 @@ def load_bool(env_var, default: bool):
 PROMETHEUS_ERROR_LOG_PERIOD_SEC = int(os.environ.get("DISCOVERY_MAX_BATCHES", 14400))
 
 IMAGE_REGISTRY = os.environ.get("IMAGE_REGISTRY", "us-central1-docker.pkg.dev/genuine-flight-317411/devel")
+
+CLUSTER_DOMAIN = os.environ.get("CLUSTER_DOMAIN", "cluster.local")
diff --git a/src/robusta/utils/service_discovery.py b/src/robusta/utils/service_discovery.py
@@ -4,6 +4,8 @@
 from kubernetes.client import V1ServiceList
 from kubernetes.client.models.v1_service import V1Service
 
+from robusta.core.model.env_vars import CLUSTER_DOMAIN
+
 
 def find_service_url(label_selector):
     """
@@ -18,6 +20,6 @@ def find_service_url(label_selector):
     name = svc.metadata.name
     namespace = svc.metadata.namespace
     port = svc.spec.ports[0].port
-    url = f"http://{name}.{namespace}:{port}"
+    url = f"http://{name}.{namespace}.svc.{CLUSTER_DOMAIN}:{port}"
     logging.info(f"discovered service with label-selector: `{label_selector}` at url: `{url}`")
     return url