Merge branch 'master' into tcp-keepalive

Author: Sheeproid

helm/robusta/templates/_helpers.tpl

@@ -110,3 +110,34 @@ active_playbooks:
 
 {{- end }}
 {{ end }}
+
+{{/*
+Determine if this is a Robusta SaaS environment.
+Returns "true" if ROBUSTA_UI_DOMAIN is not set OR ends with ".robusta.dev"
+*/}}
+{{- define "robusta.isSaasEnvironment" -}}
+{{- $robustaUiDomain := "" -}}
+{{- range .Values.runner.additional_env_vars -}}
+  {{- if eq .name "ROBUSTA_UI_DOMAIN" -}}
+    {{- $robustaUiDomain = .value -}}
+  {{- end -}}
+{{- end -}}
+{{- if or (eq $robustaUiDomain "") (hasSuffix ".robusta.dev" $robustaUiDomain) -}}
+true
+{{- else -}}
+false
+{{- end -}}
+{{- end -}}
+
+{{/*
+Determine the Sentry DSN value.
+Returns the user-provided value if set, otherwise returns the default SaaS DSN if in a SaaS environment, otherwise returns empty string.
+*/}}
+{{- define "robusta.sentryDsn" -}}
+{{- if .Values.runner.sentry_dsn -}}
+{{ .Values.runner.sentry_dsn }}
+{{- else if eq (include "robusta.isSaasEnvironment" .) "true" -}}
+https://18ac614b2d7fbbb3c7a7789b946506e1@o4510692373299200.ingest.de.sentry.io/4510707940982864
+{{- else -}}
+{{- end -}}
+{{- end -}}

helm/robusta/templates/runner.yaml

@@ -318,7 +318,8 @@ spec:
   targetLabels:
     - target
 {{ end }}
-{{ if .Values.runner.sentry_dsn }}
+{{- $sentryDsn := include "robusta.sentryDsn" . -}}
+{{- if $sentryDsn }}
 ---
 apiVersion: v1
 kind: Secret
@@ -327,5 +328,6 @@ metadata:
   namespace: {{ .Release.Namespace }}
 type: Opaque
 stringData:
-  SENTRY_DSN: {{ .Values.runner.sentry_dsn }}
-{{ end }}
+  SENTRY_DSN: {{ $sentryDsn }}
+{{- end }}
+

helm/robusta/values.yaml

@@ -701,7 +701,7 @@ runner:
   imagePullPolicy: IfNotPresent
   revisionHistoryLimit: 10
   log_level: INFO
-  sentry_dsn: https://[email protected]/6156573
+  sentry_dsn: ""
   sendAdditionalTelemetry: false
   certificate: "" # base64 encoded
   createServiceAccount: true