Skip to content

test(renderer): extend goldenImageTag pin to FIPS proxy #3333

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
gh-worker-dd-mergequeue-cf854d merged 2 commits into from
Aug 6, 2026
+14 −0
Merged

test(renderer): extend goldenImageTag pin to FIPS proxy #3333

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
23a45ac
test: pin fips-proxy tag in TestRender_Golden
jinh-labs Aug 6, 2026
0a52de0
Merge branch 'main' into jinh-labs/pin-fips-tag-in-golden-tests
jinh-labs Aug 6, 2026
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
14 changes: 14 additions & 0 deletions internal/controller/testutils/renderer/render_golden_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ var update = flag.Bool("update", false, "update golden files")
// plausible current semver since some rendering paths gate behavior on it.
const goldenImageTag = "7.80.0"

// goldenFIPSImageTag pins the FIPS proxy sidecar tag for the same reason as
// goldenImageTag: decouple goldens from FIPSProxyLatestVersion bumps.
const goldenFIPSImageTag = "1.1.29"

// pinImageTags overrides image tags on the in-memory DDA before rendering,
// rather than in the testdata fixtures, so the fixtures stay representative
// of real user input. It merges into any existing per-component override
Expand All @@ -40,6 +44,16 @@ func pinImageTags(dda *datadoghqv2alpha1.DatadogAgent) {
}
setImageTag(dda, datadoghqv2alpha1.NodeAgentComponentName)
setImageTag(dda, datadoghqv2alpha1.ClusterAgentComponentName)
pinFIPSImageTag(dda)
}

// pinFIPSImageTag sets a fixed FIPS proxy tag when the fixture enables FIPS,
// so goldens don't churn on FIPSProxyLatestVersion bumps.
func pinFIPSImageTag(dda *datadoghqv2alpha1.DatadogAgent) {
if dda.Spec.Global == nil || dda.Spec.Global.FIPS == nil {
return
}
dda.Spec.Global.FIPS.Image = &datadoghqv2alpha1.AgentImageConfig{Tag: goldenFIPSImageTag}
}

func setImageTag(dda *datadoghqv2alpha1.DatadogAgent, component datadoghqv2alpha1.ComponentName) {
Expand Down
Loading