fluxcd: add container-based config discovery support - #24510
Draft
vitkyrka wants to merge 4 commits into
Draft
Conversation
vitkyrka
added a commit
that referenced
this pull request
Jul 10, 2026
Also renames the two changelog entries inherited from the unmerged vwhitchurch/keda-discovery base branch (keda/changelog.d/24459.added, datadog_checks_dev/changelog.d/24459.added) to this PR's number, since the PR-changelog CI check flags them as belonging to the wrong PR when diffed against master. Environment: Datadog workspace Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
🎉 All green!🧪 All tests passed 🎯 Code Coverage (details) 🔗 Commit SHA: e20786c | Docs | Datadog PR Page | Give us feedback! |
vitkyrka
changed the base branch from
vwhitchurch/keda-discovery
to
graphite-base/24510
July 15, 2026 14:17
vitkyrka
force-pushed
the
graphite-base/24510
branch
from
July 15, 2026 14:17
2c0dc75 to
9f91003
Compare
vitkyrka
force-pushed
the
vwhitchurch/fluxcd-discovery
branch
from
July 15, 2026 14:17
518ac33 to
e761168
Compare
vitkyrka
changed the base branch from
graphite-base/24510
to
vwhitchurch/argo_workflows-discovery
July 15, 2026 14:17
Contributor
Author
|
Warning This pull request is not mergeable via GitHub because a downstack PR is open. Once all requirements are satisfied, merge this PR as a stack on Graphite.
This stack of pull requests is managed by Graphite. Learn more about stacking. |
3 tasks
Adds a from_ports discovery strategy on port 8080 (the shared Prometheus metrics port across all Flux controllers) and an auto_conf.yaml matching the four flux-system controller images (helm-controller, kustomize-controller, notification-controller, source-controller) already exercised by the integration's kind-based E2E test. Wires the new kind-based E2E discovery helpers (setup_discovery_agent/save_kube_discovery_state/ run_discovery_check_kubernetes/assert_all_discovery_candidates_stable_kubernetes) into conftest.py and test_e2e.py. Environment: Datadog workspace Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
vitkyrka
changed the base branch from
vwhitchurch/argo_workflows-discovery
to
graphite-base/24510
July 16, 2026 08:51
3 tasks
vitkyrka
force-pushed
the
vwhitchurch/fluxcd-discovery
branch
from
July 16, 2026 09:01
5f1a24a to
e20786c
Compare
vitkyrka
force-pushed
the
graphite-base/24510
branch
from
July 16, 2026 09:01
9f91003 to
e5340cc
Compare
vitkyrka
changed the base branch from
graphite-base/24510
to
vwhitchurch/argo_workflows-discovery
July 16, 2026 09:01
Contributor
Validation ReportAll 21 validations passed. Show details
|
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.

What does this PR do?
Adds container-based config discovery support to fluxcd.
Discovery finds the FluxCD controller metrics endpoints using the named Kubernetes port
http-prominstead of a numeric port hint.The
ad_identifierstargets somewhat generic short image names (source-controller,helm-controller, etc.) so we use a CEL selector to narrow those to FluxCD images.The E2E coverage validates that Kubernetes Autodiscovery finds the four FluxCD controller instances and that generated discovery candidates can probe a FluxCD controller without destabilizing it.
image-automation-controllerwas deployed by the kind fixture, but wasn't being scraped by the non-discovery e2e tests (due to missing forwarded ports) but it's included now, and it's also included as part of thead_identifiersfor discovery.Motivation
https://datadoghq.atlassian.net/browse/DSCVR-529
Review checklist (to be filled by reviewers)
qa/requiredif this PR needs QA validation, orqa/skip-qaif it does not. Exactly one of the two is required.backport/<branch-name>label to the PR and it will automatically open a backport PR once this one is merged