[filebeat] Add flag to optionally mount the Docker socket

filebeat/README.md

@@ -114,6 +114,7 @@ as a reference. They are also used in the automated testing of this chart.
 | `daemonset.podSecurityContext` | Configurable [podSecurityContext][] for filebeat DaemonSet pod execution environment                                                                                         | see [values.yaml][]                |
 | `daemonset.resources`          | Allows you to set the [resources][] for filebeat DaemonSet                                                                                                                   | see [values.yaml][]                |
 | `daemonset.tolerations`        | Configurable [tolerations][] for filebeat DaemonSet                                                                                                                          | `[]`                               |
+| `daemonset.dockerSockMount`    | If true, mounts the docker socket from `/var/run/docker.sock`                                                                                                                | `true`                             |
 | `deployment.annotations`       | Configurable [annotations][] for filebeat Deployment                                                                                                                         | `{}`                               |
 | `deployment.labels`            | Configurable [labels][] applied to all filebeat Deployment pods                                                                                                              | `{}`                               |
 | `deployment.affinity`          | Configurable [affinity][] for filebeat Deployment                                                                                                                            | `{}`                               |

filebeat/templates/daemonset.yaml

@@ -106,9 +106,11 @@ spec:
       - name: varlog
         hostPath:
           path: /var/log
+      {{- if .Values.daemonset.dockerSockMount }}
       - name: varrundockersock
         hostPath:
           path: /var/run/docker.sock
+      {{- end }}
       {{- if .Values.extraVolumes | default .Values.daemonset.extraVolumes }}
 {{ toYaml ( .Values.extraVolumes | default .Values.daemonset.extraVolumes )  | indent 6 }}
       {{- end }}
@@ -189,9 +191,11 @@ spec:
           readOnly: true
         # Necessary when using autodiscovery; avoid mounting it otherwise
         # See: https://www.elastic.co/guide/en/beats/filebeat/master/configuration-autodiscover.html
+        {{- if .Values.daemonset.dockerSockMount }}
         - name: varrundockersock
           mountPath: /var/run/docker.sock
           readOnly: true
+        {{- end }}
         {{- if .Values.extraVolumeMounts | default .Values.daemonset.extraVolumeMounts }}
 {{ toYaml (.Values.extraVolumeMounts | default .Values.daemonset.extraVolumeMounts ) | indent 8 }}
         {{- end }}

filebeat/values.yaml

@@ -53,6 +53,8 @@ daemonset:
         password: '${ELASTICSEARCH_PASSWORD}'
         protocol: https
         ssl.certificate_authorities: ["/usr/share/filebeat/certs/ca.crt"]
+  # Mount Docker socket /var/run/docker.sock
+  dockerSockMount: true
   # Only used when updateStrategy is set to "RollingUpdate"
   maxUnavailable: 1
   nodeSelector: {}