Add autoInstrumentationContainerRegistry override

charts/datadog/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Datadog changelog
 
+## 3.160.0
+
+* Add the ability to override the auto instrumentation container registry via `clusterAgent.admissionController.autoInstrumentationContainerRegistry`.
+
 ## 3.159.0
 
 * [AGENTRUN-908] Run the trace-loader process in trace-agent container if available ([#2267](https://github.com/DataDog/helm-charts/pull/2267)).

charts/datadog/Chart.yaml

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

charts/datadog/README.md

@@ -1,6 +1,6 @@
 # Datadog
 
-![Version: 3.159.0](https://img.shields.io/badge/Version-3.159.0-informational?style=flat-square) ![AppVersion: 7](https://img.shields.io/badge/AppVersion-7-informational?style=flat-square)
+![Version: 3.160.0](https://img.shields.io/badge/Version-3.160.0-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/).
 
@@ -588,6 +588,7 @@ helm install <RELEASE_NAME> \
 | clusterAgent.admissionController.agentSidecarInjection.profiles | list | `[]` | Defines the sidecar configuration override, currently only one profile is supported. |
 | clusterAgent.admissionController.agentSidecarInjection.provider | string | `nil` | Used by the admission controller to add infrastructure provider-specific configurations to the Agent sidecar. |
 | clusterAgent.admissionController.agentSidecarInjection.selectors | list | `[]` | Defines the pod selector for sidecar injection, currently only one rule is supported. |
+| clusterAgent.admissionController.autoInstrumentationContainerRegistry | string | `nil` | Override the default registry for auto instrumentation. # This allows you to override the default registry for the init container that is used to inject the Agent sidecar. # ref: https://docs.datadoghq.com/tracing/trace_collection/automatic_instrumentation/single-step-apm/kubernetes/?tab=agentv764recommended#change-the-default-image-registry |
 | clusterAgent.admissionController.configMode | string | `nil` | The kind of configuration to be injected, it can be "hostip", "service", "socket" or "csi". |
 | clusterAgent.admissionController.containerRegistry | string | `nil` | Override the default registry for the admission controller. |
 | clusterAgent.admissionController.cwsInstrumentation.enabled | bool | `false` | Enable the CWS Instrumentation admission controller endpoint. |

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

@@ -280,6 +280,10 @@ spec:
           - name: DD_ADMISSION_CONTROLLER_AUTO_INSTRUMENTATION_PATCHER_ENABLED
             value: "true"
           {{- end }}
+          {{- if .Values.clusterAgent.admissionController.autoInstrumentationContainerRegistry }}
+          - name: DD_ADMISSION_CONTROLLER_AUTO_INSTRUMENTATION_CONTAINER_REGISTRY
+            value: {{ .Values.clusterAgent.admissionController.autoInstrumentationContainerRegistry | quote }}
+          {{- end }}
           - name: DD_ADMISSION_CONTROLLER_CONTAINER_REGISTRY
           {{- if .Values.clusterAgent.admissionController.containerRegistry }}
             value: {{ .Values.clusterAgent.admissionController.containerRegistry | quote }}

charts/datadog/values.yaml

@@ -1522,6 +1522,11 @@ clusterAgent:
     ## not otherwise specified.
     containerRegistry:
 
+    # clusterAgent.admissionController.autoInstrumentationContainerRegistry -- Override the default registry for auto instrumentation.
+    ## This allows you to override the default registry for the init container that is used to inject the Agent sidecar.
+    ## ref: https://docs.datadoghq.com/tracing/trace_collection/automatic_instrumentation/single-step-apm/kubernetes/?tab=agentv764recommended#change-the-default-image-registry
+    autoInstrumentationContainerRegistry:
+
     remoteInstrumentation:
       # clusterAgent.admissionController.remoteInstrumentation.enabled -- Enable polling and applying library injection using Remote Config.
       ## This feature is in beta, and enables Remote Config in the Cluster Agent. It also requires Cluster Agent version 7.43+.