From 14a4a9cfbedc6ea74ff01a5a4aa0257edaa9292d Mon Sep 17 00:00:00 2001 From: Mikhail Zholobov Date: Thu, 17 Oct 2024 09:51:04 +0200 Subject: [PATCH] fix: Move DD_ADMISSION_CONTROLLER_CONTAINER_REGISTRY outside of sidecar condition (#1515) Move DD_ADMISSION_CONTROLLER_CONTAINER_REGISTRY outside of sidecar condition --- charts/datadog/CHANGELOG.md | 3 +++ charts/datadog/Chart.yaml | 2 +- charts/datadog/README.md | 2 +- charts/datadog/templates/_ac-agent-sidecar-env.yaml | 8 -------- charts/datadog/templates/cluster-agent-deployment.yaml | 6 ++++++ 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/charts/datadog/CHANGELOG.md b/charts/datadog/CHANGELOG.md index 67ccd515b..781a83ac2 100644 --- a/charts/datadog/CHANGELOG.md +++ b/charts/datadog/CHANGELOG.md @@ -1,4 +1,7 @@ # Datadog changelog +## 3.73.4 + +* Define `admission_controller.container_registry` regardless of `clusterAgent.admissionController.agentSidecarInjection` feature status. ## 3.74.3 diff --git a/charts/datadog/Chart.yaml b/charts/datadog/Chart.yaml index 0a7d77860..0d3efaf09 100644 --- a/charts/datadog/Chart.yaml +++ b/charts/datadog/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: datadog -version: 3.74.3 +version: 3.74.4 appVersion: "7" description: Datadog Agent keywords: diff --git a/charts/datadog/README.md b/charts/datadog/README.md index 6a4406e63..8219b5a9d 100644 --- a/charts/datadog/README.md +++ b/charts/datadog/README.md @@ -1,6 +1,6 @@ # Datadog -![Version: 3.74.3](https://img.shields.io/badge/Version-3.74.3-informational?style=flat-square) ![AppVersion: 7](https://img.shields.io/badge/AppVersion-7-informational?style=flat-square) +![Version: 3.74.4](https://img.shields.io/badge/Version-3.74.4-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/). diff --git a/charts/datadog/templates/_ac-agent-sidecar-env.yaml b/charts/datadog/templates/_ac-agent-sidecar-env.yaml index c25e783d7..0e9799d38 100644 --- a/charts/datadog/templates/_ac-agent-sidecar-env.yaml +++ b/charts/datadog/templates/_ac-agent-sidecar-env.yaml @@ -14,14 +14,6 @@ value: {{ .Values.clusterAgent.admissionController.agentSidecarInjection.provider }} {{- end }} -{{- if .Values.clusterAgent.admissionController.containerRegistry }} -- name: DD_ADMISSION_CONTROLLER_CONTAINER_REGISTRY - value: {{ .Values.clusterAgent.admissionController.containerRegistry }} -{{- else if .Values.registry }} -- name: DD_ADMISSION_CONTROLLER_CONTAINER_REGISTRY - value: {{ .Values.registry }} -{{- end }} - {{- if .Values.clusterAgent.admissionController.agentSidecarInjection.containerRegistry }} - name: DD_ADMISSION_CONTROLLER_AGENT_SIDECAR_CONTAINER_REGISTRY value: {{ .Values.clusterAgent.admissionController.agentSidecarInjection.containerRegistry }} diff --git a/charts/datadog/templates/cluster-agent-deployment.yaml b/charts/datadog/templates/cluster-agent-deployment.yaml index ad7a83531..6cf97d671 100644 --- a/charts/datadog/templates/cluster-agent-deployment.yaml +++ b/charts/datadog/templates/cluster-agent-deployment.yaml @@ -236,6 +236,12 @@ spec: - name: DD_ADMISSION_CONTROLLER_AUTO_INSTRUMENTATION_PATCHER_ENABLED value: "true" {{- end }} + - name: DD_ADMISSION_CONTROLLER_CONTAINER_REGISTRY + {{- if .Values.clusterAgent.admissionController.containerRegistry }} + value: {{ .Values.clusterAgent.admissionController.containerRegistry | quote }} + {{- else }} + value: {{ include "registry" .Values | quote }} + {{- end }} {{ include "ac-agent-sidecar-env" . | nindent 10 }} - name: DD_REMOTE_CONFIGURATION_ENABLED value: {{ include "clusterAgent-remoteConfiguration-enabled" . | quote }}