TON-829: Accept Datadog Operator subscription - #349
Merged
gh-worker-dd-mergequeue-cf854d[bot] merged 6 commits intoAug 25, 2026
Merged
Conversation
This comment has been minimized.
This comment has been minimized.
fanny-jiang
marked this pull request as ready for review
August 21, 2026 20:28
gpalmz
reviewed
Aug 21, 2026
gpalmz
left a comment
Contributor
There was a problem hiding this comment.
Left a handful of comments, mostly about the size of this. Two I'd want resolved before merge: the bundled boto3 question in the first one, and the GovCloud/China behavior.
gpalmz
approved these changes
Aug 21, 2026
gpalmz
left a comment
Contributor
There was a problem hiding this comment.
Nice cleanup, this reads a lot better. Left two small deadline-handling things and one consistency nit, none blocking. Assuming the python3.14 boto3 probe comes back clean on the other thread.
RaphaelAllier
approved these changes
Aug 25, 2026
gh-worker-dd-mergequeue-cf854d
Bot
deleted the
fanny/TON-829/accept-operator-subscription
branch
August 25, 2026 14:03
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Note: Please remember to review the contribution guidelines
if you have not yet done so.
What does this PR do?
Adds an EKS-only CloudFormation custom resource that discovers the public free Datadog Operator offer, validates its terms and zero-cost pricing, creates and accepts the AWS Marketplace agreement, and waits for the Operator entitlement. Existing active agreements are reused, and stack deletion retains the Marketplace agreement.
The custom resource uses the modeled boto3 Marketplace Agreement client for signing, response parsing, and bounded retries, plus the SDK paginator for entitlements. Deadline-aware calls and structured logs preserve actionable subscription failures without maintaining a custom HTTP client.
Motivation
Allow the EKS Quick Start onboarding flow to accept the Datadog Operator Marketplace subscription before the instrumenter installs the managed add-on, without requiring Marketplace permissions on the Datadog integration role.
Testing Guidelines
Additional Notes
The repository uses master as its default branch; no main ref exists. The subscription resources are created only when EKS instrumentation is selected.