Fix missing appKey secret for operator subchart (#2270)

* fix missing appKey secret for operator subchart

* update readme

* revert apikey name change

* fix app key reference in cluster-agent deployment

* fix: add missing apiKey and appKey to otel-agent-gateway-hpa-dca CI values

Author: fanny-jiang

charts/datadog/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Datadog changelog
 
+## 3.157.3
+
+* Fix appKey secret creation needed by datadog-operator subchart.
+
 ## 3.157.2
 
 * Rename endpoint configmap to properly support multiple releases and the operator subchart.

charts/datadog/Chart.yaml

@@ -1,7 +1,7 @@
 ---
 apiVersion: v1
 name: datadog
-version: 3.157.2
+version: 3.157.3
 appVersion: "7"
 description: Datadog Agent
 keywords:

charts/datadog/README.md

@@ -1,6 +1,6 @@
 # Datadog
 
-![Version: 3.157.2](https://img.shields.io/badge/Version-3.157.2-informational?style=flat-square) ![AppVersion: 7](https://img.shields.io/badge/AppVersion-7-informational?style=flat-square)
+![Version: 3.157.3](https://img.shields.io/badge/Version-3.157.3-informational?style=flat-square) ![AppVersion: 7](https://img.shields.io/badge/AppVersion-7-informational?style=flat-square)
 
 [Datadog](https://www.datadoghq.com/) is a hosted infrastructure monitoring platform. This chart adds the Datadog Agent to all nodes in your cluster via a DaemonSet. It also optionally depends on the [kube-state-metrics chart](https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-state-metrics). For more information about monitoring Kubernetes with Datadog, please refer to the [Datadog documentation website](https://docs.datadoghq.com/agent/basic_agent_usage/kubernetes/).
 

charts/datadog/ci/otel-agent-gateway-hpa-dca-values.yaml

@@ -1,5 +1,10 @@
 targetSystem: "linux"
 fullnameOverride: "gw-with-dca"
+datadog:
+  apiKey: "00000000000000000000000000000000"
+  appKey: "0000000000000000000000000000000000000000"
+  kubelet:
+    tlsVerify: false
 agents:
   enabled: false
 clusterAgent:

charts/datadog/templates/cluster-agent-deployment.yaml

@@ -187,12 +187,14 @@ spec:
                 optional: true
           {{- include "components-common-env" . | nindent 10 }}
           {{- include "language-detection-common-env" . | nindent 10 }}
-          {{- if .Values.clusterAgent.metricsProvider.enabled }}
+          {{- if or .Values.appKey .Values.appKeyExistingSecret }}
           - name: DD_APP_KEY
             valueFrom:
               secretKeyRef:
                 name: {{ template "datadog.appKeySecretName" . }}
                 key: app-key
+          {{- end }}
+          {{- if .Values.clusterAgent.metricsProvider.enabled }}
           - name: DD_EXTERNAL_METRICS_PROVIDER_ENABLED
             value: {{ .Values.clusterAgent.metricsProvider.enabled | quote }}
           - name: DD_EXTERNAL_METRICS_PROVIDER_PORT

charts/datadog/templates/secret-application-key.yaml

@@ -1,5 +1,4 @@
-{{- if not .Values.datadog.appKeyExistingSecret }}
-{{- if and (eq (include "should-deploy-cluster-agent" .) "true") .Values.clusterAgent.metricsProvider.enabled }}
+{{- if and (not .Values.datadog.appKeyExistingSecret) .Values.datadog.appKey }}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -12,6 +11,5 @@ metadata:
 {{- end }}
 type: Opaque
 data:
-  app-key: {{ default "MISSING" .Values.datadog.appKey | b64enc | quote }}
-{{- end }}
+  app-key: {{ .Values.datadog.appKey | b64enc | quote }}
 {{- end }}