From 0a6179f9b9a01493a594a50e711d85955ac8f201 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Bavelier?= <timothee.bavelier@datadoghq.com>
Date: Tue, 11 Feb 2025 10:03:27 +0100
Subject: [PATCH] default to gcr on us3 when autopilot

---
 charts/datadog/CHANGELOG.md           | 4 ++++
 charts/datadog/Chart.yaml             | 2 +-
 charts/datadog/README.md              | 2 +-
 charts/datadog/templates/_helpers.tpl | 2 +-
 charts/datadog/values.yaml            | 1 +
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/charts/datadog/CHANGELOG.md b/charts/datadog/CHANGELOG.md
index b5e00d940..31c524c92 100644
--- a/charts/datadog/CHANGELOG.md
+++ b/charts/datadog/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Datadog changelog
 
+## 3.90.3
+
+* Defaults `registry` to `gcr.io/datadoghq` when setting `datadog.site: us3.datadoghq.com` and deploying on GKE Autopilot (`providers.gke.autopilot: true`).
+
 ## 3.90.2
 
 * Adds env vars `DD_AGENT_IPC_PORT` and `DD_AGENT_IPC_CONFIG_REFRESH_INTERVAL` when Otel Agent is enabled and adds flag `--sync-delay=30s` to otel agent.
diff --git a/charts/datadog/Chart.yaml b/charts/datadog/Chart.yaml
index fc22fccd3..62a573977 100644
--- a/charts/datadog/Chart.yaml
+++ b/charts/datadog/Chart.yaml
@@ -1,7 +1,7 @@
 ---
 apiVersion: v1
 name: datadog
-version: 3.90.2
+version: 3.90.3
 appVersion: "7"
 description: Datadog Agent
 keywords:
diff --git a/charts/datadog/README.md b/charts/datadog/README.md
index 3a29aa8a9..d7b0271a2 100644
--- a/charts/datadog/README.md
+++ b/charts/datadog/README.md
@@ -1,6 +1,6 @@
 # Datadog
 
-![Version: 3.90.2](https://img.shields.io/badge/Version-3.90.2-informational?style=flat-square) ![AppVersion: 7](https://img.shields.io/badge/AppVersion-7-informational?style=flat-square)
+![Version: 3.90.3](https://img.shields.io/badge/Version-3.90.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/).
 
diff --git a/charts/datadog/templates/_helpers.tpl b/charts/datadog/templates/_helpers.tpl
index 2d0074988..7d07df3cd 100644
--- a/charts/datadog/templates/_helpers.tpl
+++ b/charts/datadog/templates/_helpers.tpl
@@ -295,7 +295,7 @@ eu.gcr.io/datadoghq
 public.ecr.aws/datadog
 {{- else if eq .datadog.site "ap1.datadoghq.com" -}}
 asia.gcr.io/datadoghq
-{{- else if eq .datadog.site "us3.datadoghq.com" -}}
+{{- else if and (eq .datadog.site "us3.datadoghq.com") (not .providers.gke.autopilot) -}}
 datadoghq.azurecr.io
 {{- else -}}
 gcr.io/datadoghq
diff --git a/charts/datadog/values.yaml b/charts/datadog/values.yaml
index 432b1618c..5edd2e8c0 100644
--- a/charts/datadog/values.yaml
+++ b/charts/datadog/values.yaml
@@ -27,6 +27,7 @@ commonLabels: {}
 ## Azure - use datadoghq.azurecr.io
 ## AWS - use public.ecr.aws/datadog
 ## DockerHub - use docker.io/datadog
+## If you are on GKE Autopilot, you must use a gcr.io variant registry.
 registry:  # gcr.io/datadoghq
 
 datadog: