Skip to content

[GKE Autopilot] Defaults cloud_provider_metadata to ["gcp"] only #1819

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 22, 2025
Merged

[GKE Autopilot] Defaults cloud_provider_metadata to ["gcp"] only #1819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7a43b35
use gcp as sole cloud provider when autopilot provider
tbavelier Apr 22, 2025
3b517fc
fix templating + test baseline
tbavelier Apr 22, 2025
63bbbd5
Merge branch 'main' into tbavelier/gke-autopilot-cloud-metadata-limit
tbavelier Apr 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions charts/datadog/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Datadog changelog

## 3.110.13
* Defaults `DD_CLOUD_PROVIDER_METADATA` to `["gcp"]` when the GKE Autopilot provider is used, to avoid polling other cloud providers for metadata.

## 3.110.12

* add syscalls to system-probe seccomp to fix k3s ([#1811](https://github.com/DataDog/helm-charts/pull/1811)).
Expand Down
2 changes: 1 addition & 1 deletion charts/datadog/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
apiVersion: v1
name: datadog
version: 3.110.12
version: 3.110.13
appVersion: "7"
description: Datadog Agent
keywords:
Expand Down
2 changes: 1 addition & 1 deletion charts/datadog/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Datadog

![Version: 3.110.12](https://img.shields.io/badge/Version-3.110.12-informational?style=flat-square) ![AppVersion: 7](https://img.shields.io/badge/AppVersion-7-informational?style=flat-square)
![Version: 3.110.13](https://img.shields.io/badge/Version-3.110.13-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/).

Expand Down
4 changes: 4 additions & 0 deletions charts/datadog/templates/_components-common-env.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,8 @@
- name: DD_KUBELET_CLIENT_KEY
value: /certs/tls.key
{{- end }}
{{- if .Values.providers.gke.autopilot }}
- name: DD_CLOUD_PROVIDER_METADATA
value: '["gcp"]'
{{- end }}
{{- end }}
8 changes: 8 additions & 0 deletions test/datadog/baseline/manifests/gke_autopilot_allowlistedv2workload_default.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -759,6 +759,8 @@ spec:
value: "true"
- name: KUBERNETES
value: "yes"
- name: DD_CLOUD_PROVIDER_METADATA
value: '["gcp"]'
- name: DD_LANGUAGE_DETECTION_ENABLED
value: "false"
- name: DD_LANGUAGE_DETECTION_REPORTING_ENABLED
Expand Down Expand Up @@ -910,6 +912,8 @@ spec:
value: "true"
- name: KUBERNETES
value: "yes"
- name: DD_CLOUD_PROVIDER_METADATA
value: '["gcp"]'
- name: DD_LANGUAGE_DETECTION_ENABLED
value: "false"
- name: DD_LANGUAGE_DETECTION_REPORTING_ENABLED
Expand Down Expand Up @@ -1023,6 +1027,8 @@ spec:
value: "true"
- name: KUBERNETES
value: "yes"
- name: DD_CLOUD_PROVIDER_METADATA
value: '["gcp"]'
- name: DD_LANGUAGE_DETECTION_ENABLED
value: "false"
- name: DD_LANGUAGE_DETECTION_REPORTING_ENABLED
Expand Down Expand Up @@ -1167,6 +1173,8 @@ spec:
optional: true
- name: KUBERNETES
value: "yes"
- name: DD_CLOUD_PROVIDER_METADATA
value: '["gcp"]'
- name: DD_LANGUAGE_DETECTION_ENABLED
value: "false"
- name: DD_LANGUAGE_DETECTION_REPORTING_ENABLED
Expand Down
10 changes: 10 additions & 0 deletions test/datadog/baseline/manifests/gke_autopilot_npm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1009,6 +1009,8 @@ spec:
value: "true"
- name: KUBERNETES
value: "yes"
- name: DD_CLOUD_PROVIDER_METADATA
value: '["gcp"]'
- name: DD_LANGUAGE_DETECTION_ENABLED
value: "false"
- name: DD_LANGUAGE_DETECTION_REPORTING_ENABLED
Expand Down Expand Up @@ -1175,6 +1177,8 @@ spec:
value: "true"
- name: KUBERNETES
value: "yes"
- name: DD_CLOUD_PROVIDER_METADATA
value: '["gcp"]'
- name: DD_LANGUAGE_DETECTION_ENABLED
value: "false"
- name: DD_LANGUAGE_DETECTION_REPORTING_ENABLED
Expand Down Expand Up @@ -1278,6 +1282,8 @@ spec:
value: "true"
- name: KUBERNETES
value: "yes"
- name: DD_CLOUD_PROVIDER_METADATA
value: '["gcp"]'
- name: DD_LANGUAGE_DETECTION_ENABLED
value: "false"
- name: DD_LANGUAGE_DETECTION_REPORTING_ENABLED
Expand Down Expand Up @@ -1387,6 +1393,8 @@ spec:
value: "true"
- name: KUBERNETES
value: "yes"
- name: DD_CLOUD_PROVIDER_METADATA
value: '["gcp"]'
- name: DD_LANGUAGE_DETECTION_ENABLED
value: "false"
- name: DD_LANGUAGE_DETECTION_REPORTING_ENABLED
Expand Down Expand Up @@ -1571,6 +1579,8 @@ spec:
optional: true
- name: KUBERNETES
value: "yes"
- name: DD_CLOUD_PROVIDER_METADATA
value: '["gcp"]'
- name: DD_LANGUAGE_DETECTION_ENABLED
value: "false"
- name: DD_LANGUAGE_DETECTION_REPORTING_ENABLED
Expand Down
10 changes: 10 additions & 0 deletions test/datadog/baseline/manifests/gke_autopilot_system_probe.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1009,6 +1009,8 @@ spec:
value: "true"
- name: KUBERNETES
value: "yes"
- name: DD_CLOUD_PROVIDER_METADATA
value: '["gcp"]'
- name: DD_LANGUAGE_DETECTION_ENABLED
value: "false"
- name: DD_LANGUAGE_DETECTION_REPORTING_ENABLED
Expand Down Expand Up @@ -1175,6 +1177,8 @@ spec:
value: "true"
- name: KUBERNETES
value: "yes"
- name: DD_CLOUD_PROVIDER_METADATA
value: '["gcp"]'
- name: DD_LANGUAGE_DETECTION_ENABLED
value: "false"
- name: DD_LANGUAGE_DETECTION_REPORTING_ENABLED
Expand Down Expand Up @@ -1278,6 +1282,8 @@ spec:
value: "true"
- name: KUBERNETES
value: "yes"
- name: DD_CLOUD_PROVIDER_METADATA
value: '["gcp"]'
- name: DD_LANGUAGE_DETECTION_ENABLED
value: "false"
- name: DD_LANGUAGE_DETECTION_REPORTING_ENABLED
Expand Down Expand Up @@ -1419,6 +1425,8 @@ spec:
value: "true"
- name: KUBERNETES
value: "yes"
- name: DD_CLOUD_PROVIDER_METADATA
value: '["gcp"]'
- name: DD_LANGUAGE_DETECTION_ENABLED
value: "false"
- name: DD_LANGUAGE_DETECTION_REPORTING_ENABLED
Expand Down Expand Up @@ -1635,6 +1643,8 @@ spec:
optional: true
- name: KUBERNETES
value: "yes"
- name: DD_CLOUD_PROVIDER_METADATA
value: '["gcp"]'
- name: DD_LANGUAGE_DETECTION_ENABLED
value: "false"
- name: DD_LANGUAGE_DETECTION_REPORTING_ENABLED
Expand Down
8 changes: 8 additions & 0 deletions test/datadog/baseline/manifests/gke_autopilot_usm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1009,6 +1009,8 @@ spec:
value: "true"
- name: KUBERNETES
value: "yes"
- name: DD_CLOUD_PROVIDER_METADATA
value: '["gcp"]'
- name: DD_LANGUAGE_DETECTION_ENABLED
value: "false"
- name: DD_LANGUAGE_DETECTION_REPORTING_ENABLED
Expand Down Expand Up @@ -1171,6 +1173,8 @@ spec:
value: "true"
- name: KUBERNETES
value: "yes"
- name: DD_CLOUD_PROVIDER_METADATA
value: '["gcp"]'
- name: DD_LANGUAGE_DETECTION_ENABLED
value: "false"
- name: DD_LANGUAGE_DETECTION_REPORTING_ENABLED
Expand Down Expand Up @@ -1308,6 +1312,8 @@ spec:
value: "true"
- name: KUBERNETES
value: "yes"
- name: DD_CLOUD_PROVIDER_METADATA
value: '["gcp"]'
- name: DD_LANGUAGE_DETECTION_ENABLED
value: "false"
- name: DD_LANGUAGE_DETECTION_REPORTING_ENABLED
Expand Down Expand Up @@ -1521,6 +1527,8 @@ spec:
optional: true
- name: KUBERNETES
value: "yes"
- name: DD_CLOUD_PROVIDER_METADATA
value: '["gcp"]'
- name: DD_LANGUAGE_DETECTION_ENABLED
value: "false"
- name: DD_LANGUAGE_DETECTION_REPORTING_ENABLED
Expand Down
6 changes: 6 additions & 0 deletions test/datadog/baseline/manifests/gke_autopilot_workloadallowlist_default.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -759,6 +759,8 @@ spec:
value: "true"
- name: KUBERNETES
value: "yes"
- name: DD_CLOUD_PROVIDER_METADATA
value: '["gcp"]'
- name: DD_LANGUAGE_DETECTION_ENABLED
value: "false"
- name: DD_LANGUAGE_DETECTION_REPORTING_ENABLED
Expand Down Expand Up @@ -933,6 +935,8 @@ spec:
value: "true"
- name: KUBERNETES
value: "yes"
- name: DD_CLOUD_PROVIDER_METADATA
value: '["gcp"]'
- name: DD_LANGUAGE_DETECTION_ENABLED
value: "false"
- name: DD_LANGUAGE_DETECTION_REPORTING_ENABLED
Expand Down Expand Up @@ -1077,6 +1081,8 @@ spec:
optional: true
- name: KUBERNETES
value: "yes"
- name: DD_CLOUD_PROVIDER_METADATA
value: '["gcp"]'
- name: DD_LANGUAGE_DETECTION_ENABLED
value: "false"
- name: DD_LANGUAGE_DETECTION_REPORTING_ENABLED
Expand Down