Skip to content
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.

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

default to gcr on us3 when autopilot #1699

Merged
merged 3 commits into from
Feb 11, 2025
Merged

Conversation

tbavelier
Copy link
Member

@tbavelier tbavelier commented Feb 11, 2025

What this PR does / why we need it:

  • On GKE Autopilot, whitelisted Agent images are on gcr.io solely. When using US3 and not providing a registry, we default to Azure registry not whitelisted. We therefore add a condition on this defaulting to prevent using Azure if US3 and Autopilot.

Which issue this PR fixes

Special notes for your reviewer:

QA'd with:

  1. Site is US3, Autopilot not provided (defaults to false)
╰─❯ helm template dd charts/datadog/ --set datadog.site=us3.datadoghq.com --set datadog.apiKey=foo | grep -i "image:"
        image: "datadoghq.azurecr.io/agent:7.62.0"
        image: "datadoghq.azurecr.io/agent:7.62.0"
        image: "datadoghq.azurecr.io/agent:7.62.0"
        image: "datadoghq.azurecr.io/agent:7.62.0"
        image: "datadoghq.azurecr.io/cluster-agent:7.62.0"
        image: "datadoghq.azurecr.io/cluster-agent:7.62.0"
  1. Site is US3, Autopilot is provided
╰─❯ helm template dd charts/datadog/ --set datadog.site=us3.datadoghq.com --set providers.gke.autopilot=true --set datadog.apiKey=foo | grep -i "image:"
        image: "gcr.io/datadoghq/agent:7.62.0"
        image: "gcr.io/datadoghq/agent:7.62.0"
        image: "gcr.io/datadoghq/agent:7.62.0"
        image: "gcr.io/datadoghq/agent:7.62.0"
        image: "gcr.io/datadoghq/cluster-agent:7.62.0"
        image: "gcr.io/datadoghq/cluster-agent:7.62.0"
  1. Site is something else, regular behaviour based on it:
╰─❯ helm template dd charts/datadog/ --set datadog.site=datadoghq.eu --set providers.gke.autopilot=true --set datadog.apiKey=foo | grep -i "image:"
        image: "eu.gcr.io/datadoghq/agent:7.62.0"
        image: "eu.gcr.io/datadoghq/agent:7.62.0"
        image: "eu.gcr.io/datadoghq/agent:7.62.0"
        image: "eu.gcr.io/datadoghq/agent:7.62.0"
        image: "eu.gcr.io/datadoghq/cluster-agent:7.62.0"
        image: "eu.gcr.io/datadoghq/cluster-agent:7.62.0"
╰─❯ helm template dd charts/datadog/ --set datadog.site=datadoghq.com --set datadog.apiKey=foo | grep -i "image:"
        image: "gcr.io/datadoghq/agent:7.62.0"
        image: "gcr.io/datadoghq/agent:7.62.0"
        image: "gcr.io/datadoghq/agent:7.62.0"
        image: "gcr.io/datadoghq/agent:7.62.0"
        image: "gcr.io/datadoghq/cluster-agent:7.62.0"
        image: "gcr.io/datadoghq/cluster-agent:7.62.0"

Checklist

[Place an '[x]' (no spaces) in all applicable fields. Please remove unrelated fields.]

  • Chart Version bumped
  • Documentation has been updated with helm-docs (run: .github/helm-docs.sh)
  • CHANGELOG.md has been updated
  • Variables are documented in the README.md
  • For Datadog Operator chart or value changes update the test baselines (run: make update-test-baselines)

@tbavelier tbavelier added bug Something isn't working chart/datadog This issue or pull request is related to the datadog chart labels Feb 11, 2025
@tbavelier tbavelier requested a review from a team as a code owner February 11, 2025 09:06
Copy link
Contributor

@celenechang celenechang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just a small suggestion

Co-authored-by: Celene <celene@datadoghq.com>
@tbavelier
Copy link
Member Author

/merge

@dd-devflow
Copy link

dd-devflow bot commented Feb 11, 2025

Devflow running: /merge

View all feedbacks in Devflow UI.


2025-02-11 12:40:11 UTC ℹ️ MergeQueue: waiting for PR to be ready

This merge request is not mergeable yet, because of pending checks/missing approvals. It will be added to the queue as soon as checks pass and/or get approvals.
Note: if you pushed new commits since the last approval, you may need additional approval.
You can remove it from the waiting list with /remove command.


2025-02-11 13:17:09 UTC ℹ️ MergeQueue: merge request added to the queue

The median merge time in main is 41m.


2025-02-11 13:52:53 UTC ℹ️ MergeQueue: This merge request was merged

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working chart/datadog This issue or pull request is related to the datadog chart mergequeue-status: done
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Failed to install Datadog Agent 3.90.2 in GKE Autopilot
2 participants