From 9bf40b84bb946ab7dfa98c8e7b444b65d6180e6f Mon Sep 17 00:00:00 2001
From: Cedric Lamoriniere <cedric.lamoriniere@datadoghq.com>
Date: Tue, 28 Apr 2020 20:06:07 +0200
Subject: [PATCH] Mount system-probe socket in agent container (#22161)

Signed-off-by: cedric lamoriniere <cedric.lamoriniere@datadoghq.com>
---
 stable/datadog/CHANGELOG.md                   |  8 +++++
 stable/datadog/Chart.yaml                     | 30 +++++++++----------
 stable/datadog/templates/container-agent.yaml |  5 ++++
 3 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/stable/datadog/CHANGELOG.md b/stable/datadog/CHANGELOG.md
index 83d0890c3c..74af59a4af 100644
--- a/stable/datadog/CHANGELOG.md
+++ b/stable/datadog/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Datadog changelog
 
+## 2.2.8
+
+* Mount `system-probe` socket in `agent` container when system-probe is enabled
+
+## 2.2.7
+
+* Add "Cluster-Agent" `Event` `create` RBAC permission
+
 ## 2.2.6
 
 * Ensure the `trace-agent` computes the same hostname as the core `agent`.
diff --git a/stable/datadog/Chart.yaml b/stable/datadog/Chart.yaml
index 5a4d4193df..40ed8c7636 100644
--- a/stable/datadog/Chart.yaml
+++ b/stable/datadog/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: datadog
-version: 2.2.7
+version: 2.2.8
 appVersion: "7"
 description: Datadog Agent
 keywords:
@@ -13,19 +13,19 @@ sources:
 - https://app.datadoghq.com/account/settings#agent/kubernetes
 - https://github.com/DataDog/datadog-agent
 maintainers:
-- name: hkaj
-  email: haissam@datadoghq.com
-- name: irabinovitch
-  email: ilan@datadoghq.com
-- name: charlyf
-  email: charly@datadoghq.com
-- name: mfpierre
-  email: pierre.margueritte@datadoghq.com
-- name: clamoriniere
-  email: cedric.lamoriniere@datadoghq.com
-- name: xlucas
-  email: xavier.lucas@datadoghq.com
-- name: L3n41c
-  email: lenaic.huard@datadoghq.com
+- name: ahmed-mez
+  email: ahmed.mezghani@datadoghq.com
 - name: celenechang
   email: celene@datadoghq.com
+- name: charlyf
+  email: charly@datadoghq.com
+- name: clamoriniere
+  email: cedric.lamoriniere@datadoghq.com
+- name: irabinovitch
+  email: ilan@datadoghq.com
+- name: L3n41c
+  email: lenaic.huard@datadoghq.com
+- name: vboulineau
+  email: vincent.boulineau@datadoghq.com
+- name: xornivore
+  email: ivan.ilichev@datadoghq.com
diff --git a/stable/datadog/templates/container-agent.yaml b/stable/datadog/templates/container-agent.yaml
index 6cce6b3919..f7f9cab3c5 100644
--- a/stable/datadog/templates/container-agent.yaml
+++ b/stable/datadog/templates/container-agent.yaml
@@ -104,6 +104,11 @@
     - name: dsdsocket
       mountPath: "/var/run/datadog"
     {{- end }}
+    {{- if .Values.datadog.systemProbe.enabled }}
+    - name: sysprobe-socket-dir
+      mountPath: /opt/datadog-agent/run
+      readOnly: true
+    {{- end }}
     - name: procdir
       mountPath: /host/proc
       readOnly: true