[stable/sysdig] Add affinity instructions to schedule on amd64 and linux (#22150)

* [stable/sysdig] Add affinity instructions to schedule on amd64 and linux

Signed-off-by: Néstor Salceda <nestor.salceda@sysdig.com>

* [stable/sysdig] Add support for custom annotations

Signed-off-by: Néstor Salceda <nestor.salceda@sysdig.com>

stable/sysdig/CHANGELOG.md

@@ -3,6 +3,13 @@
 This file documents all notable changes to Sysdig Helm Chart. The release
 numbering uses [semantic versioning](http://semver.org).
 
+## v1.7.13
+
+### Minor changes
+
+* Implement scheduling with affinity and not with nodeSelector on amd64 & linux nodes.
+* Add support for custom annotations on daemonSet.
+
 ## v1.7.12
 
 ### Minor changes

stable/sysdig/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 name: sysdig
-version: 1.7.12
+version: 1.7.13
 appVersion: 9.9.1
 description: Sysdig Monitor and Secure agent
 keywords:

stable/sysdig/README.md

@@ -52,8 +52,8 @@ The following table lists the configurable parameters of the Sysdig chart and th
 | `serviceAccount.create`           | Create serviceAccount                                                  | `true`                                      |
 | `serviceAccount.name`             | Use this value as serviceAccountName                                   | ` `                                         |
 | `daemonset.updateStrategy.type`   | The updateStrategy for updating the daemonset                          | `RollingUpdate`                             |
-| `daemonset.affinity`              | Node affinities                                                        | `nil`                                       |
-| `daemonset.nodeSelector`          | Node selector                                                          | `kubernetes.io/arch:amd64`                  |
+| `daemonset.affinity`              | Node affinities                                                        | `schedule on amd64 and linux`               |
+| `daemonset.annotations`           | Custom annotations for daemonset                                       | `{}`                                        |
 | `slim.enabled`                    | Use the slim based Sysdig Agent image                                  | `false`                                     |
 | `slim.kmoduleImage.repository`    | The kernel module image builder repository to pull from                | `sysdig/agent-kmodule`                      |
 | `slim.resources.requests.cpu`     | CPU requested for building the kernel module                           | `1000m`                                     |

stable/sysdig/templates/daemonset.yaml

@@ -15,6 +15,10 @@ spec:
       name: {{ template "sysdig.fullname" .}}
       labels:
 {{ include "sysdig.labels" . | indent 8 }}
+      {{- if .Values.daemonset.annotations }}
+      annotations:
+{{ toYaml .Values.daemonset.annotations | indent 8 }}
+      {{- end }}
     spec:
       serviceAccountName: {{ template "sysdig.serviceAccountName" .}}
 {{- if .Values.priorityClassName }}
@@ -34,8 +38,6 @@ spec:
       imagePullSecrets:
 {{ toYaml .Values.image.pullSecrets | indent 8 }}
       {{- end }}
-      nodeSelector:
-{{ toYaml .Values.daemonset.nodeSelector | indent 8 }}
       {{- if .Values.slim.enabled }}
       initContainers:
         - name: sysdig-agent-kmodule

stable/sysdig/values.yaml

@@ -53,9 +53,21 @@ daemonset:
   env: {}
   # Allow the DaemonSet to schedule using affinity rules
   # Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
-  affinity: {}
-  nodeSelector:
-    kubernetes.io/arch: amd64
+  affinity:
+    nodeAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+        nodeSelectorTerms:
+        - matchExpressions:
+          - key: kubernetes.io/arch
+            operator: In
+            values:
+              - amd64
+          - key: kubernetes.io/os
+            operator: In
+            values:
+              - linux
+  # Allow the DaemonSet to set annotations
+  annotations: {}
 
 # If is behind a proxy you can set the proxy server
 proxy: