Skip to content
This repository was archived by the owner on Dec 19, 2023. It is now read-only.

Commit 6c640a6

Browse files
author
Néstor Salceda
committed
chore: Update to latest sysdig version
1 parent 7ed4abc commit 6c640a6

File tree

10 files changed

+137
-65
lines changed

10 files changed

+137
-65
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Current Operator version
2-
VERSION ?= 1.11.0
2+
VERSION ?= 1.11.11
33
# Default bundle image tag
44
BUNDLE_IMG ?= controller-bundle:$(VERSION)
55
# Options for 'bundle-build'

helm-charts/sysdig/CHANGELOG.md

Lines changed: 69 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,75 @@
22

33
## Change Log
44

5-
This file documents all notable changes to Sysdig Helm Chart. The release
6-
numbering uses [semantic versioning](http://semver.org).
5+
This file documents all notable changes to Sysdig Helm Chart. The release numbering uses [semantic versioning](http://semver.org).
6+
7+
## v1.11.11
8+
9+
### Minor changes
10+
11+
* Update agent to 11.1.2
12+
13+
## v1.11.10
14+
15+
### Minor changes
16+
17+
* Fix the if in the imageanalyzer extravolumes
18+
19+
## v1.11.9
20+
21+
### Minor changes
22+
23+
* Improvements and fixes in README for installation instructions (use sysdig-agent namespace by default)
24+
25+
## v1.11.8
26+
27+
### Minor changes
28+
29+
* Improvements in CI process and testing
30+
31+
## v1.11.7
32+
33+
### Minor changes
34+
35+
* Update Node Image Analyzer to 0.1.10 by default
36+
* Fix VERIFY_CERTIFICATE setting for Node Image Analyzer
37+
38+
## v1.11.6
39+
40+
### Minor changes
41+
42+
* Add tolerations configuration item to Node Image Analyzer
43+
44+
## v1.11.5
45+
46+
### Minor Changes
47+
48+
* Fix appversion
49+
50+
## v1.11.4
51+
52+
### Minor Changes
53+
54+
* Use the latest image from Agent (11.0.0)
55+
56+
## v1.11.3
57+
58+
### Minor Changes
59+
60+
* Use the latest image from Agent (10.9.0)
61+
62+
## v1.11.2
63+
64+
### Minor changes
65+
66+
* Allow for customization of liveness and readiness probes initial delay
67+
68+
## v1.11.1
69+
70+
### Minor Changes
71+
72+
* Use the latest image from Agent (10.8.0)
73+
* Use the latest image from Node Image Analyzer (0.1.7)
774

875
## v1.11.0
976

helm-charts/sysdig/Chart.yaml

100644100755
Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
apiVersion: v1
2-
appVersion: 10.7.0
2+
name: sysdig
3+
version: 1.11.11
4+
appVersion: 11.1.2
35
description: Sysdig Monitor and Secure agent
6+
keywords:
7+
- monitoring
8+
- security
9+
- alerting
10+
- metric
11+
- troubleshooting
12+
- run-time
413
home: https://www.sysdig.com/
514
icon: https://478h5m1yrfsa3bbe262u7muv-wpengine.netdna-ssl.com/wp-content/uploads/2019/02/Shovel_600px.png
6-
keywords:
7-
- monitoring
8-
- security
9-
- alerting
10-
- metric
11-
- troubleshooting
12-
- run-time
13-
maintainers:
14-
- email: lachlan@deis.com
15-
name: lachie83
16-
- email: jorge.salamero@sysdig.com
17-
name: bencer
18-
- email: nestor.salceda@sysdig.com
19-
name: nestorsalceda
20-
- email: alvaro.iradier@sysdig.com
21-
name: airadier
22-
- email: carlos.arilla@sysdig.com
23-
name: carillan81
24-
name: sysdig
2515
sources:
26-
- https://app.sysdigcloud.com/#/settings/user
27-
- https://github.com/draios/sysdig
28-
version: 1.11.0
16+
- https://app.sysdigcloud.com/#/settings/user
17+
- https://github.com/draios/sysdig
18+
maintainers:
19+
- name: lachie83
20+
email: lachlan@deis.com
21+
- name: bencer
22+
email: jorge.salamero@sysdig.com
23+
- name: nestorsalceda
24+
email: nestor.salceda@sysdig.com
25+
- name: airadier
26+
email: alvaro.iradier@sysdig.com
27+
- name: carillan81
28+
email: carlos.arilla@sysdig.com

helm-charts/sysdig/README.md

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ This chart adds the Sysdig agent for [Sysdig Monitor](https://sysdig.com/product
1212

1313
## Installing the Chart
1414

15-
To install the chart with the release name `my-release`, retrieve your Sysdig Monitor Access Key from your [Account Settings](https://app.sysdigcloud.com/#/settings/agentInstallation) and run:
15+
To install the chart with the release name `sysdig-agent`, retrieve your Sysdig Monitor Access Key from your [Account Settings](https://app.sysdigcloud.com/#/settings/agentInstallation) and run:
1616

1717
```bash
18-
$ helm repo add sysdiglabs https://sysdiglabs.github.io/charts/
18+
$ helm repo add sysdig https://charts.sysdig.com/
1919
```
2020

21-
to add the `sysdiglabs` Helm chart repository. Then run:
21+
to add the `sysdig` Helm chart repository. Then run:
2222

2323
```bash
24-
$ helm install --name my-release --set sysdig.accessKey=YOUR-KEY-HERE sysdiglabs/sysdig
24+
$ helm install --namespace sysdig-agent --name sysdig-agent --set sysdig.accessKey=YOUR-KEY-HERE sysdig/sysdig
2525
```
2626

2727
After a few seconds, you should see hosts and containers appearing in Sysdig Monitor and Sysdig Secure.
@@ -30,12 +30,12 @@ After a few seconds, you should see hosts and containers appearing in Sysdig Mon
3030
3131
## Uninstalling the Chart
3232

33-
To uninstall/delete the `my-release` deployment:
33+
To uninstall/delete the `sysdig-agent` deployment:
3434

3535
```bash
36-
$ helm delete my-release
36+
$ helm delete --namespace sysdig-agent sysdig-agent
3737
```
38-
> **Tip**: Use helm delete --purge my-release to completely remove the release from Helm internal storage
38+
> **Tip**: Use `helm delete --namespace sysdig-agent --purge sysdig-agent` to completely remove the release from Helm internal storage
3939
4040
The command removes all the Kubernetes components associated with the chart and deletes the release.
4141

@@ -47,7 +47,7 @@ The following table lists the configurable parameters of the Sysdig chart and th
4747
| --- | --- | --- |
4848
| `image.registry` | Sysdig Agent image registry | `docker.io` |
4949
| `image.repository` | The image repository to pull from | `sysdig/agent` |
50-
| `image.tag` | The image tag to pull | `10.7.0` |
50+
| `image.tag` | The image tag to pull | `11.1.2` |
5151
| `image.pullPolicy` | The Image pull policy | `IfNotPresent` |
5252
| `image.pullSecrets` | Image pull secrets | `nil` |
5353
| `resources.requests.cpu` | CPU requested for being run in a node | `600m` |
@@ -63,6 +63,7 @@ The following table lists the configurable parameters of the Sysdig chart and th
6363
| `daemonset.nodeSelector` | Node Selector | `{}` |
6464
| `daemonset.affinity` | Node affinities | `schedule on amd64 and linux` |
6565
| `daemonset.annotations` | Custom annotations for daemonset | `{}` |
66+
| `daemonset.probes.initialDelay` | Initial delay for liveness and readiness probes. daemonset | `{}` |
6667
| `slim.enabled` | Use the slim based Sysdig Agent image | `false` |
6768
| `slim.kmoduleImage.repository` | The kernel module image builder repository to pull from | `sysdig/agent-kmodule` |
6869
| `slim.resources.requests.cpu` | CPU requested for building the kernel module | `1000m` |
@@ -96,7 +97,7 @@ The following table lists the configurable parameters of the Sysdig chart and th
9697
| `nodeImageAnalyzer.settings.httpsProxy` | Proxy configuration variables | |
9798
| `nodeImageAnalyzer.settings.noProxy` | Proxy configuration variables | |
9899
| `nodeImageAnalyzer.image.repository` | The image repository to pull the Node Image Analyzer from | `sysdig/node-image-analyzer` |
99-
| `nodeImageAnalyzer.image.tag` | The image tag to pull the Node Image Analyzer | `0.1.6` |
100+
| `nodeImageAnalyzer.image.tag` | The image tag to pull the Node Image Analyzer | `0.1.7` |
100101
| `nodeImageAnalyzer.image.pullPolicy` | The Image pull policy for the Node Image Analyzer | `IfNotPresent` |
101102
| `nodeImageAnalyzer.image.pullSecrets` | Image pull secrets for the Node Image Analyzer | `nil` |
102103
| `nodeImageAnalyzer.resources.requests.cpu` | Node Image Analyzer CPU requests per node | `250m` |
@@ -109,15 +110,15 @@ The following table lists the configurable parameters of the Sysdig chart and th
109110
Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
110111

111112
```bash
112-
$ helm install --name my-release \
113+
$ helm install --namespace sysdig-agent --name sysdig-agent \
113114
--set sysdig.accessKey=YOUR-KEY-HERE,sysdig.settings.tags="role:webserver\,location:europe" \
114-
sysdiglabs/sysdig
115+
sysdig/sysdig
115116
```
116117

117118
Alternatively, a YAML file that specifies the values for the parameters can be provided while installing the chart. For example,
118119

119120
```bash
120-
$ helm install --name my-release -f values.yaml sysdiglabs/sysdig
121+
$ helm install --namespace sysdig-agent --name sysdig-agent -f values.yaml sysdig/sysdig
121122
```
122123

123124
> **Tip**: You can use the default [values.yaml](values.yaml)
@@ -149,12 +150,12 @@ Installing the agent using the Helm chart is also possible in this scenario, and
149150
For example:
150151

151152
```bash
152-
$ helm install --name my-release \
153+
$ helm install --namespace sysdig-agent --name sysdig-agent \
153154
--set sysdig.accessKey=YOUR-KEY-HERE \
154155
--set collectorSettings.collectorHost=42.32.196.18 \
155156
--set collectorSettings.collectorPort=6443 \
156157
--set collectorSettings.sslVerifyCertificate=false \
157-
sysdiglabs/sysdig
158+
sysdig/sysdig
158159
```
159160

160161
## Using private Docker image registry
@@ -188,7 +189,7 @@ Finally, set the accessKey value and you are ready to deploy the Sysdig agent
188189
using the Helm chart:
189190
190191
```bash
191-
$ helm install --name my-release -f values.yaml sysdiglabs/sysdig
192+
$ helm install --namespace sysdig-agent --name sysdig-agent -f values.yaml sysdig/sysdig
192193
```
193194

194195
You can read more details about this in [Kubernetes Documentation](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/).
@@ -209,7 +210,7 @@ sysdig:
209210
```
210211
211212
```bash
212-
$ helm install --name my-release -f values.yaml sysdiglabs/sysdig
213+
$ helm install --namespace sysdig-agent --name sysdig-agent -f values.yaml sysdig/sysdig
213214
```
214215

215216
## Upgrading Sysdig agent configuration
@@ -230,7 +231,7 @@ sysdig:
230231
And then, upgrade Helm chart with:
231232
232233
```bash
233-
$ helm upgrade my-release -f values.yaml sysdiglabs/sysdig
234+
$ helm upgrade --namespace sysdig-agent sysdig-agent -f values.yaml sysdig/sysdig
234235
```
235236

236237
## How to upgrade to the last version
@@ -244,24 +245,24 @@ $ helm repo update
244245
In case you deployed the chart with a values.yaml file, you just need to modify (or add if it's missing) the `image.tag` field and execute:
245246

246247
```bash
247-
$ helm install --name sysdig -f values.yaml sysdiglabs/sysdig
248+
$ helm install --namespace sysdig-agent --name sysdig-agent -f values.yaml sysdig/sysdig
248249
```
249250

250251
If you deployed the chart setting the values as CLI parameters, like for example:
251252

252253
```bash
253254
$ helm install \
254-
--name sysdig \
255+
--namespace sysdig-agent \
256+
--name sysdig-agent \
255257
--set sysdig.accessKey=xxxx \
256258
--set ebpf.enabled=true \
257-
--namespace sysdig-agent \
258-
sysdiglabs/sysdig
259+
sysdig/sysdig
259260
```
260261

261262
You will need to execute:
262263

263264
```bash
264-
$ helm upgrade --set image.tag=<last_version> --reuse-values sysdig sysdiglabs/sysdig
265+
$ helm upgrade --namespace sysdig-agent --set image.tag=<last_version> --reuse-values sysdig-agent sysdig/sysdig
265266
```
266267

267268
## Adding custom AppChecks
@@ -291,12 +292,12 @@ sysdig:
291292
mykey: myvalue
292293
```
293294
294-
The first section, dumps the AppCheck in a Kubernetes configmap and makes it available within the Sysdig agent container. The second, configures it on the `dragent.yaml` file.
295+
The first section dumps the AppCheck in a Kubernetes configmap and makes it available within the Sysdig agent container. The second one configures it on the `dragent.yaml` file.
295296

296297
Once the values YAML file is ready, we will deploy the Chart like before:
297298

298299
```bash
299-
$ helm install --name my-release -f values.yaml sysdiglabs/sysdig
300+
$ helm install --namespace sysdig-agent --name sysdig-agent -f values.yaml sysdig/sysdig
300301
```
301302

302303
### Automating the generation of custom-app-checks.yaml file
@@ -323,15 +324,15 @@ sysdig:
323324
You can generate an additional values YAML file with the custom AppChecks:
324325

325326
```bash
326-
$ git clone https://github.com/kubernetes/charts.git
327-
$ cd charts/sysdiglabs/sysdig
327+
$ git clone https://github.com/sysdiglabs/charts.git
328+
$ cd charts/sysdig
328329
$ ./scripts/appchecks2helm appChecks/solr.py appChecks/traefik.py appChecks/nats.py > custom-app-checks.yaml
329330
```
330331

331332
And deploy the Chart with both of them:
332333

333334
```bash
334-
$ helm install --name my-release -f custom-app-checks.yaml -f values.yaml sysdiglabs/sysdig
335+
$ helm install --namespace sysdig-agent --name sysdig-agent -f custom-app-checks.yaml -f values.yaml sysdig/sysdig
335336
```
336337

337338
### Adding prometheus.yaml to configure promscrape

helm-charts/sysdig/ci/test-values.yaml

Lines changed: 0 additions & 2 deletions
This file was deleted.

helm-charts/sysdig/scripts/appchecks2helm

100644100755
File mode changed.

helm-charts/sysdig/templates/configmap-image-analyzer.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ data:
1818
{{- if .Values.nodeImageAnalyzer.settings.collectorEndpoint }}
1919
collector_endpoint: {{ .Values.nodeImageAnalyzer.settings.collectorEndpoint }}
2020
{{- end }}
21-
{{- if .Values.nodeImageAnalyzer.settings.sslVerifyCertificate }}
22-
ssl_verify_certificate: {{ .Values.nodeImageAnalyzer.settings.sslVerifyCertificate }}
21+
{{- if hasKey .Values.nodeImageAnalyzer.settings "sslVerifyCertificate" }}
22+
ssl_verify_certificate: "{{ .Values.nodeImageAnalyzer.settings.sslVerifyCertificate }}"
2323
{{- end }}
2424

2525
debug: "{{ .Values.nodeImageAnalyzer.settings.debug | default false }}"

helm-charts/sysdig/templates/daemonset-image-analyzer.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@ spec:
4747
{{ toYaml .Values.nodeImageAnalyzer.extraVolumesvolumes | indent 8 }}
4848
{{- end }}
4949
tolerations:
50-
- effect: NoSchedule
51-
key: node-role.kubernetes.io/master
50+
{{ toYaml .Values.nodeImageAnalyzer.tolerations | indent 8 }}
5251
# The following line is necessary for RBAC
5352
serviceAccount: {{ template "sysdig.serviceAccountName" .}}
5453
{{- if .Values.nodeImageAnalyzer.image.pullSecrets }}
@@ -75,7 +74,7 @@ spec:
7574
- mountPath: /var/lib/containers
7675
name: var-lib-containers-vol
7776
# Custom volume mount here
78-
{{- if .Values.extraVolumes.mounts }}
77+
{{- if .Values.nodeImageAnalyzer.extraVolumes.mounts }}
7978
{{ toYaml .Values.nodeImageAnalyzer.extraVolumes.mounts | indent 10 }}
8079
{{- end }}
8180
env:
@@ -174,4 +173,4 @@ spec:
174173
name: {{ template "sysdig.fullname" . }}-image-analyzer
175174
key: no_proxy
176175
optional: true
177-
{{- end }}
176+
{{- end }}

helm-charts/sysdig/templates/daemonset.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,11 @@ spec:
121121
readinessProbe:
122122
exec:
123123
command: [ "test", "-e", "/opt/draios/logs/running" ]
124-
initialDelaySeconds: 10
124+
initialDelaySeconds: {{ .Values.daemonset.probes.initialDelay }}
125125
livenessProbe:
126126
exec:
127127
command: [ "test", "-e", "/opt/draios/logs/running" ]
128-
initialDelaySeconds: 10
128+
initialDelaySeconds: {{ .Values.daemonset.probes.initialDelay }}
129129
volumeMounts:
130130
{{- if not .Values.slim.enabled }}
131131
- mountPath: /etc/modprobe.d

0 commit comments

Comments
 (0)