From 14467e1211e109cc339c7e49e2365f7e7a6d567d Mon Sep 17 00:00:00 2001 From: Alon Girmonsky <1990761+alongir@users.noreply.github.com> Date: Wed, 25 Dec 2024 15:18:08 -0800 Subject: [PATCH] ebpf changes Bring back ebpf as the default traffic capture mode provide support for ebpf-v1 --- helm-chart/templates/06-front-deployment.yaml | 2 +- helm-chart/templates/09-worker-daemon-set.yaml | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/helm-chart/templates/06-front-deployment.yaml b/helm-chart/templates/06-front-deployment.yaml index 59fde16d1..8e8037928 100644 --- a/helm-chart/templates/06-front-deployment.yaml +++ b/helm-chart/templates/06-front-deployment.yaml @@ -43,7 +43,7 @@ spec: - name: REACT_APP_PRESET_FILTERS_CHANGING_ENABLED value: '{{ .Values.tap.presetFiltersChangingEnabled }}' - name: REACT_APP_BPF_OVERRIDE_DISABLED - value: '{{ eq .Values.tap.packetCapture "ebpf" | ternary "true" "false" }}' + value: '{{ if and (ne .Values.tap.packetCapture "af_packet") (ne .Values.tap.packetCapture "libpcap") }}true{{ else }}false{{ end }}' - name: REACT_APP_RECORDING_DISABLED value: '{{ .Values.tap.recordingDisabled }}' - name: REACT_APP_STOP_TRAFFIC_CAPTURING_DISABLED diff --git a/helm-chart/templates/09-worker-daemon-set.yaml b/helm-chart/templates/09-worker-daemon-set.yaml index ab42bc01d..c7a9b60f3 100644 --- a/helm-chart/templates/09-worker-daemon-set.yaml +++ b/helm-chart/templates/09-worker-daemon-set.yaml @@ -35,7 +35,11 @@ spec: - -metrics-port - '{{ .Values.tap.metrics.port }}' - -packet-capture - - '{{ .Values.tap.packetCapture }}' + {{- if or (eq .Values.tap.packetCapture "ebpf") (eq .Values.tap.packetCapture "ebpf-v1") }} + - ebpf + {{- else }} + - {{ .Values.tap.packetCapture }} + {{- end }} - -loglevel - '{{ .Values.logLevel | default "warning" }}' {{- if .Values.tap.tls }} @@ -46,7 +50,7 @@ spec: {{- end }} - -procfs - /hostproc - {{- if ne .Values.tap.packetCapture "ebpf" }} + {{- if or (eq .Values.tap.packetCapture "af_packet") (eq .Values.tap.packetCapture "libpcap") }} - -disable-ebpf {{- end }} {{- if .Values.tap.resourceGuard.enabled }} @@ -157,9 +161,12 @@ spec: - ./tracer - -procfs - /hostproc - {{- if ne .Values.tap.packetCapture "ebpf" }} + {{- if or (eq .Values.tap.packetCapture "af_packet") (eq .Values.tap.packetCapture "libpcap") }} - -disable-ebpf {{- end }} + {{- if eq .Values.tap.packetCapture "ebpf-v1" }} + - -ebpf1 + {{- end }} {{- if .Values.tap.disableTlsLog }} - -disable-tls-log {{- end }}