[stable/datadog] Fix metricsProvider port with Kubernetes <= 1.14 (#2…

…3358) Signed-off-by: Vincent Boulineau <[email protected]>
helm · Jul 27, 2020 · d6da827 · d6da827
1 parent 9b630cf
commit d6da827
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 6 deletions.
diff --git a/stable/datadog/CHANGELOG.md b/stable/datadog/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Datadog changelog
 
+## 2.3.41
+
+* Fix issue with Kubernetes <= 1.14 and Cluster Agent's External Metrics Provider (must be 443)
+
 ## 2.3.40
 
 * Update documentation for resource requests & limits default values.

diff --git a/stable/datadog/Chart.yaml b/stable/datadog/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: datadog
-version: 2.3.40
+version: 2.3.41
 appVersion: "7"
 description: Datadog Agent
 keywords:

diff --git a/stable/datadog/README.md b/stable/datadog/README.md
@@ -402,7 +402,7 @@ helm install --name <RELEASE_NAME> \
 | `clusterAgent.rbac.serviceAccount`                           | existing ServiceAccount to use (ignored if rbac.create=true) for cluster agent's pods                                                                                                                                                                                                               | `default`                                       |
 | `clusterAgent.metricsProvider.enabled`                       | Enable Datadog metrics as a source for HPA scaling                                                                                                                                                                                                                                                  | `false`                                         |
 | `clusterAgent.metricsProvider.service.type`                  | The type of service to use for the clusterAgent metrics server                                                                                                                                                                                                                                      | `ClusterIP`                                     |
-| `clusterAgent.metricsProvider.service.port`                  | The port for service to use for the clusterAgent metrics server                                                                                                                                                                                                                                     | `8443`                                          |
+| `clusterAgent.metricsProvider.service.port`                  | The port for service to use for the clusterAgent metrics server (Kubernetes >= 1.15)                                                                                                                                                                                                                | `8443`                                          |
 | `clusterAgent.env`                                           | Additional Datadog environment variables for the cluster-agent                                                                                                                                                                                                                                      | `nil`                                           |
 | `clusterAgent.confd`                                         | Additional check configurations (static and Autodiscovery)                                                                                                                                                                                                                                          | `nil`                                           |
 | `clusterAgent.podAnnotations`                                | Annotations to add to the Cluster Agent Pod(s)                                                                                                                                                                                                                                                      | `nil`                                           |

diff --git a/stable/datadog/templates/_helpers.tpl b/stable/datadog/templates/_helpers.tpl
@@ -101,6 +101,17 @@ beta.kubernetes.io/os
 {{- end -}}
 {{- end -}}
 
+{{/*
+Correct `clusterAgent.metricsProvider.service.port` if Kubernetes <= 1.15
+*/}}
+{{- define "clusterAgent.metricsProvider.port" -}}
+{{- if semverCompare "^1.15-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- .Values.clusterAgent.metricsProvider.service.port -}}
+{{- else -}}
+443
+{{- end -}}
+{{- end -}}
+
 {{/*
 Return the container runtime socket
 */}}

diff --git a/stable/datadog/templates/agent-apiservice.yaml b/stable/datadog/templates/agent-apiservice.yaml
@@ -13,7 +13,9 @@ spec:
   service:
     name: {{ template "datadog.fullname" . }}-cluster-agent-metrics-api
     namespace: {{ .Release.Namespace }}
-    port: {{ .Values.clusterAgent.metricsProvider.service.port }}
+{{- if semverCompare "^1.15-0" .Capabilities.KubeVersion.GitVersion }}
+    port: {{ template "clusterAgent.metricsProvider.port" . }}
+{{- end }}
   version: v1beta1
   insecureSkipTLSVerify: true
   group: external.metrics.k8s.io

diff --git a/stable/datadog/templates/agent-services.yaml b/stable/datadog/templates/agent-services.yaml
@@ -40,7 +40,7 @@ spec:
   selector:
     app: {{ template "datadog.fullname" . }}-cluster-agent
   ports:
-  - port: {{ .Values.clusterAgent.metricsProvider.service.port }}
+  - port: {{ template "clusterAgent.metricsProvider.port" . }}
     name: metricsapi
     protocol: TCP
 {{ end }}

diff --git a/stable/datadog/templates/cluster-agent-deployment.yaml b/stable/datadog/templates/cluster-agent-deployment.yaml
@@ -91,7 +91,7 @@ spec:
           name: agentport
           protocol: TCP
         {{- if .Values.clusterAgent.metricsProvider.enabled }}
-        - containerPort: {{ .Values.clusterAgent.metricsProvider.service.port }}
+        - containerPort: {{ template "clusterAgent.metricsProvider.port" . }}
           name: metricsapi
           protocol: TCP
         {{- end }}
@@ -113,7 +113,7 @@ spec:
           - name: DD_EXTERNAL_METRICS_PROVIDER_ENABLED
             value: {{ .Values.clusterAgent.metricsProvider.enabled | quote }}
           - name: DD_EXTERNAL_METRICS_PROVIDER_PORT
-            value: {{ .Values.clusterAgent.metricsProvider.service.port | quote }}
+            value: {{ include "clusterAgent.metricsProvider.port" . | quote }}
           - name: DD_EXTERNAL_METRICS_PROVIDER_WPA_CONTROLLER
             value: {{ .Values.clusterAgent.metricsProvider.wpaController | quote }}
           - name: DD_EXTERNAL_METRICS_PROVIDER_USE_DATADOGMETRIC_CRD