feat: add otel tolerations using helpers.tpl

Author: Chickensoupwithrice

charts/sourcegraph/templates/_helpers.tpl

@@ -145,6 +145,25 @@ tolerations:
 {{- end }}
 {{- end }}
 
+{{/*
+OpenTelemetry tolerations - supports separate tolerations for agent and gateway
+*/}}
+{{- define "sourcegraph.openTelemetry.tolerations" -}}
+{{- $top := index . 0 }}
+{{- $component := index . 1 }}
+{{- $globalTolerations := (index $top.Values "sourcegraph" "tolerations") }}
+{{- $openTelemetryTolerations := (index $top.Values "openTelemetry" "tolerations") }}
+{{- $componentTolerations := (index $top.Values "openTelemetry" $component "tolerations") }}
+tolerations:
+{{- if $componentTolerations }}
+{{- $componentTolerations | toYaml | trim | nindent 2 }}
+{{- else if $openTelemetryTolerations }}
+{{- $openTelemetryTolerations | toYaml | trim | nindent 2 }}
+{{- else if $globalTolerations }}
+{{- $globalTolerations | toYaml | trim | nindent 2 }}
+{{- end }}
+{{- end }}
+
 {{/*
 Jaeger common labels
 */}}

charts/sourcegraph/templates/otel-collector/otel-agent.DaemonSet.yaml

@@ -84,7 +84,7 @@ spec:
       terminationGracePeriodSeconds: 120
       {{- include "sourcegraph.nodeSelector" (list . "openTelemetry" ) | trim | nindent 6 }}
       {{- include "sourcegraph.affinity" (list . "openTelemetry" ) | trim | nindent 6 }}
-      {{- include "sourcegraph.tolerations" (list . "openTelemetry" ) | trim | nindent 6 }}
+      {{- include "sourcegraph.openTelemetry.tolerations" (list . "agent" ) | trim | nindent 6 }}
       {{- with .Values.sourcegraph.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}

charts/sourcegraph/templates/otel-collector/otel-collector.Deployment.yaml

@@ -105,7 +105,7 @@ spec:
       terminationGracePeriodSeconds: 120
       {{- include "sourcegraph.nodeSelector" (list . "openTelemetry" ) | trim | nindent 6 }}
       {{- include "sourcegraph.affinity" (list . "openTelemetry" ) | trim | nindent 6 }}
-      {{- include "sourcegraph.tolerations" (list . "openTelemetry" ) | trim | nindent 6 }}
+      {{- include "sourcegraph.openTelemetry.tolerations" (list . "gateway" ) | trim | nindent 6 }}
       {{- with .Values.sourcegraph.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}

charts/sourcegraph/values.yaml

@@ -632,6 +632,8 @@ openTelemetry:
       allowPrivilegeEscalation: false
       runAsUser: 100
       runAsGroup: 101
+    # -- Tolerations for the `otel-collector` pods
+    tolerations: []
 
   agent:
     # -- Name used by resources. Does not affect service names or PVCs.
@@ -658,6 +660,8 @@ openTelemetry:
       allowPrivilegeEscalation: false
       runAsUser: 100
       runAsGroup: 101
+    # -- Tolerations for the `otel-agent` pods
+    tolerations: []
 
 nodeExporter:
   # -- Enable `node-exporter`