From 23a45ac8eaf9bd20f93734069d9a7a5491109f30 Mon Sep 17 00:00:00 2001 From: Jinhyuk Hong Date: Thu, 6 Aug 2026 10:21:18 +0200 Subject: [PATCH] test: pin fips-proxy tag in TestRender_Golden Extend the pinning pattern PR #3234 introduced (goldenImageTag for NodeAgent and ClusterAgent) to the FIPS proxy sidecar tag. Without this, every FIPSProxyLatestVersion bump forces a regen of the suppression goldens even though the operator's rendering behaviour is unchanged. See the last such churn in PR bumping to 1.1.29. --- .../testutils/renderer/render_golden_test.go | 14 ++++++++++++++ .../golden/suppression-autopilot.golden.yaml | 4 ++-- .../golden/suppression-baseline.golden.yaml | 12 ++++++------ 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/internal/controller/testutils/renderer/render_golden_test.go b/internal/controller/testutils/renderer/render_golden_test.go index ae92d5d188..56f02fabf7 100644 --- a/internal/controller/testutils/renderer/render_golden_test.go +++ b/internal/controller/testutils/renderer/render_golden_test.go @@ -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 @@ -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) { diff --git a/internal/controller/testutils/renderer/testdata/golden/suppression-autopilot.golden.yaml b/internal/controller/testutils/renderer/testdata/golden/suppression-autopilot.golden.yaml index d76c7c3af3..0e8ba864d3 100644 --- a/internal/controller/testutils/renderer/testdata/golden/suppression-autopilot.golden.yaml +++ b/internal/controller/testutils/renderer/testdata/golden/suppression-autopilot.golden.yaml @@ -1044,7 +1044,7 @@ kind: DatadogAgentInternal metadata: annotations: agent.datadoghq.com/cluster-provider: gke-autopilot - agent.datadoghq.com/ddaispechash: f4da8a2daaca56ee72517152fb8ea28c + agent.datadoghq.com/ddaispechash: d13d3f79908ea4001e0e3301265738d6 experimental.agent.datadoghq.com/autopilot: "true" finalizers: - finalizer.datadoghq.com/datadogagentinternal @@ -1189,7 +1189,7 @@ spec: enabled: true image: name: fips-proxy - tag: 1.1.28 + tag: 1.1.29 localAddress: 127.0.0.1 port: 9803 portRange: 15 diff --git a/internal/controller/testutils/renderer/testdata/golden/suppression-baseline.golden.yaml b/internal/controller/testutils/renderer/testdata/golden/suppression-baseline.golden.yaml index 14f24c864a..9106fd50f4 100644 --- a/internal/controller/testutils/renderer/testdata/golden/suppression-baseline.golden.yaml +++ b/internal/controller/testutils/renderer/testdata/golden/suppression-baseline.golden.yaml @@ -1033,7 +1033,7 @@ apiVersion: datadoghq.com/v1alpha1 kind: DatadogAgentInternal metadata: annotations: - agent.datadoghq.com/ddaispechash: 42c22cc68bc435428d38fbc91176741f + agent.datadoghq.com/ddaispechash: 5eba754bd6a44be78e2dfde7b71c0aff finalizers: - finalizer.datadoghq.com/datadogagentinternal labels: @@ -1177,7 +1177,7 @@ spec: enabled: true image: name: fips-proxy - tag: 1.1.28 + tag: 1.1.29 localAddress: 127.0.0.1 port: 9803 portRange: 15 @@ -1205,7 +1205,7 @@ apiVersion: apps/v1 kind: DaemonSet metadata: annotations: - agent.datadoghq.com/agentspechash: eb5fbc72880b4780e588136890df831c + agent.datadoghq.com/agentspechash: acb48fbe8c2372dd9b731053c4a96f5f labels: agent.datadoghq.com/component: agent agent.datadoghq.com/name: datadog-agent @@ -1641,7 +1641,7 @@ spec: - env: - name: DD_FIPS_LOCAL_ADDRESS value: 127.0.0.1 - image: registry.datadoghq.com/fips-proxy:1.1.28 + image: registry.datadoghq.com/fips-proxy:1.1.29 imagePullPolicy: IfNotPresent name: fips-proxy ports: @@ -1847,7 +1847,7 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - agent.datadoghq.com/agentspechash: 2dc2f35ed7b6ea6c9c37db3960096f81 + agent.datadoghq.com/agentspechash: 213f10c811c401893367317e36fe443f labels: agent.datadoghq.com/component: cluster-agent agent.datadoghq.com/name: datadog-agent @@ -2086,7 +2086,7 @@ spec: - env: - name: DD_FIPS_LOCAL_ADDRESS value: 127.0.0.1 - image: registry.datadoghq.com/fips-proxy:1.1.28 + image: registry.datadoghq.com/fips-proxy:1.1.29 imagePullPolicy: IfNotPresent name: fips-proxy ports: