Skip to content

Commit 351986e

Browse files
feat(shield): add host support (universal_ebpf) on gke-autopilot (#2076)
1 parent dd5d50d commit 351986e

6 files changed

Lines changed: 54 additions & 10 deletions

File tree

charts/shield/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ maintainers:
1313
- name: mavimo
1414
email: marcovito.moscaritolo@sysdig.com
1515
type: application
16-
version: 1.0.0
16+
version: 1.1.0
1717
appVersion: "1.0.0"

charts/shield/templates/host/_helpers.tpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,14 @@ true
9090
{{- end }}
9191

9292
{{- define "host.driver.is_legacy_ebpf" }}
93-
{{- if eq "legacy_ebpf" .Values.host.driver }}
93+
{{- if and (eq "legacy_ebpf" .Values.host.driver) (not (include "common.cluster_type.is_gke_autopilot" .)) }}
9494
true
9595
{{- else }}
9696
{{- end }}
9797
{{- end }}
9898

9999
{{- define "host.driver.is_universal_ebpf" }}
100-
{{- if eq "universal_ebpf" .Values.host.driver }}
100+
{{- if or (eq "universal_ebpf" .Values.host.driver) (include "common.cluster_type.is_gke_autopilot" .) }}
101101
true
102102
{{- else }}
103103
{{- end }}

charts/shield/templates/host/daemonset.yaml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,6 @@ spec:
9898
- mountPath: /host/etc/os-release
9999
name: osrel
100100
readOnly: true
101-
- mountPath: /root/.sysdig
102-
name: bpf-probes
103101
{{- end }}
104102
{{- end }}
105103
containers:
@@ -123,7 +121,7 @@ spec:
123121
- name: SYSDIG_BPF_PROBE
124122
value:
125123
{{- end }}
126-
{{- if and (include "host.driver.is_universal_ebpf" .) (not (include "common.cluster_type.is_gke_autopilot" .)) }}
124+
{{- if (include "host.driver.is_universal_ebpf" .) }}
127125
- name: SYSDIG_AGENT_DRIVER
128126
value: universal_ebpf
129127
{{- else if and (include "host.driver.is_legacy_ebpf" .) (not (include "common.cluster_type.is_gke_autopilot" .)) }}
@@ -214,8 +212,6 @@ spec:
214212
readOnly: true
215213
- mountPath: /host/var/run/containerd/containerd.sock
216214
name: containerdsock-vol
217-
- mountPath: /root/.sysdig
218-
name: bpf-probes
219215
{{- end }}
220216

221217
{{- if (include "host.need_host_root" .) }}
@@ -313,8 +309,6 @@ spec:
313309
- name: osrel
314310
hostPath:
315311
path: /etc/os-release
316-
- name: bpf-probes
317-
emptyDir: {}
318312
- name: containerdsock-vol
319313
hostPath:
320314
path: /var/run/containerd/containerd.sock
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{{- if (include "common.cluster_type.is_gke_autopilot" .) -}}
2+
apiVersion: auto.gke.io/v1
3+
kind: AllowlistSynchronizer
4+
metadata:
5+
name: sysdig-agent-allowlist-synchronizer
6+
namespace: {{ .Release.Namespace }}
7+
annotations:
8+
helm.sh/hook: "pre-install,pre-upgrade"
9+
labels:
10+
{{- include "host.labels" . | nindent 4 }}
11+
spec:
12+
allowlistPaths:
13+
- "Sysdig/agent/*"
14+
{{- end -}}
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
suite: Host - Service
2+
templates:
3+
- templates/host/gke-allowlist-synchronizer.yaml
4+
release:
5+
name: release-name
6+
namespace: shield-namespace
7+
values:
8+
- ../values/gke-autopilot.yaml
9+
tests:
10+
- it: Contains the agent GKE AllowlistSynchronizer resource
11+
asserts:
12+
- containsDocument:
13+
kind: AllowlistSynchronizer
14+
apiVersion: auto.gke.io/v1
15+
name: sysdig-agent-allowlist-synchronizer
16+
- equal:
17+
path: metadata.namespace
18+
value: shield-namespace
19+
- equal:
20+
path: metadata.annotations["helm.sh/hook"]
21+
value: pre-install,pre-upgrade
22+
- equal:
23+
path: spec.allowlistPaths
24+
value:
25+
- "Sysdig/agent/*"
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
cluster_config:
2+
name: test-cluster
3+
cluster_type: gke-autopilot
4+
5+
sysdig_endpoint:
6+
region: custom
7+
access_key: 12345678-1234-1234-1234-123456789012
8+
api_url: https://www.example.com
9+
collector:
10+
host: example.com
11+
port: 6443

0 commit comments

Comments
 (0)