From cd9513e07a5be27aba0b4427d0f592d9fb86aa19 Mon Sep 17 00:00:00 2001
From: Ahmed Mezghani <38987709+ahmed-mez@users.noreply.github.com>
Date: Fri, 27 Mar 2020 14:44:23 +0100
Subject: [PATCH] add wpa config (#21641)

Signed-off-by: Ahmed Mezghani <ahmed.mezghani@outlook.com>
---
 stable/datadog/CHANGELOG.md                           |  4 ++++
 stable/datadog/Chart.yaml                             |  2 +-
 stable/datadog/ci/cluster-agent-wpa.yaml              | 11 +++++++++++
 stable/datadog/templates/agent-rbac.yaml              | 10 ++++++++++
 .../datadog/templates/cluster-agent-deployment.yaml   |  2 ++
 stable/datadog/values.yaml                            |  5 +++++
 6 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 stable/datadog/ci/cluster-agent-wpa.yaml

diff --git a/stable/datadog/CHANGELOG.md b/stable/datadog/CHANGELOG.md
index a460f1c513..b936a64b89 100644
--- a/stable/datadog/CHANGELOG.md
+++ b/stable/datadog/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Datadog changelog
 
+## 2.1.1
+
+* Add option to enable WPA in the Cluster Agent.
+
 ## 2.1.0
 
 * Changed the default for `processAgent.enabled` to `true`.
diff --git a/stable/datadog/Chart.yaml b/stable/datadog/Chart.yaml
index 616bac947a..e67231b4a2 100644
--- a/stable/datadog/Chart.yaml
+++ b/stable/datadog/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: datadog
-version: 2.1.0
+version: 2.1.1
 appVersion: "7"
 description: Datadog Agent
 keywords:
diff --git a/stable/datadog/ci/cluster-agent-wpa.yaml b/stable/datadog/ci/cluster-agent-wpa.yaml
new file mode 100644
index 0000000000..084a431ee3
--- /dev/null
+++ b/stable/datadog/ci/cluster-agent-wpa.yaml
@@ -0,0 +1,11 @@
+datadog:
+  apiKey: "00000000000000000000000000000000"
+  appKey: "0000000000000000000000000000000000000000"
+
+clusterAgent:
+  enabled: true
+
+  metricsProvider:
+    enabled: true
+
+    wpaController: true
diff --git a/stable/datadog/templates/agent-rbac.yaml b/stable/datadog/templates/agent-rbac.yaml
index 096773c2d6..31986b6be4 100644
--- a/stable/datadog/templates/agent-rbac.yaml
+++ b/stable/datadog/templates/agent-rbac.yaml
@@ -71,6 +71,16 @@ rules:
   - "/healthz"
   verbs:
   - get
+{{- if and .Values.clusterAgent.metricsProvider.enabled .Values.clusterAgent.metricsProvider.wpaController }}
+- apiGroups:
+  - "datadoghq.com"
+  resources:
+  - "watermarkpodautoscalers"
+  verbs:
+  - "list"
+  - "get"
+  - "watch"
+{{- end }}
 ---
 apiVersion: {{ template "rbac.apiVersion" . }}
 kind: ClusterRoleBinding
diff --git a/stable/datadog/templates/cluster-agent-deployment.yaml b/stable/datadog/templates/cluster-agent-deployment.yaml
index b07c60d504..fb27259ae3 100644
--- a/stable/datadog/templates/cluster-agent-deployment.yaml
+++ b/stable/datadog/templates/cluster-agent-deployment.yaml
@@ -95,6 +95,8 @@ spec:
             value: {{ .Values.clusterAgent.metricsProvider.enabled | quote }}
           - name: DD_EXTERNAL_METRICS_PROVIDER_PORT
             value: {{ .Values.clusterAgent.metricsProvider.service.port | quote }}
+          - name: DD_EXTERNAL_METRICS_PROVIDER_WPA_CONTROLLER
+            value: {{ .Values.clusterAgent.metricsProvider.wpaController | quote }}
           {{- end }}
           {{- if .Values.datadog.clusterChecks.enabled }}
           - name: DD_CLUSTER_CHECKS_ENABLED
diff --git a/stable/datadog/values.yaml b/stable/datadog/values.yaml
index 43ce2d4e5d..1e507404e9 100644
--- a/stable/datadog/values.yaml
+++ b/stable/datadog/values.yaml
@@ -411,6 +411,11 @@ clusterAgent:
   metricsProvider:
     enabled: false
 
+    ## @param wpaController - boolean - optional
+    ## Enable informer and controller of the watermark pod autoscaler
+    #
+    wpaController: false
+
     ## Configuration for the service for the cluster-agent metrics server
     #
     service: