stacklok / toolhive / 29639299804

69%

Build Type

push

github

Committed by web-flow

Commit Message

Stop VirtualMCPServer hot-reconcile on cleared podTemplateSpec (#5846)

A stale podTemplateSpecHashAnnotation left over from a prior reconcile
(when spec.podTemplateSpec was set) survived MergeAnnotations forever
once the field was cleared, since the desired annotations map no
longer carried a key to overwrite it with. That made
podTemplateSpecNeedsUpdate report drift on every reconcile, hot-looping
the Deployment update — same bug class as #5817, fixed here for the
podTemplateSpec annotation:

- Made podTemplateSpecNeedsUpdate a plain stored != expected hash
  comparison instead of the previous asymmetric presence check.
- Extended mergeDeploymentAnnotations to prune podTemplateSpecHashAnnotation
  alongside imagePullRefsHashAnnotation when desired no longer wants it,
  collapsing the two prune checks into one loop.
- Fixed the identical bug in the MCPRegistry registry-api deployment path
  (cmd/thv-operator/pkg/registryapi/deployment.go), where the same stale
  annotation could survive an additive-only annotation merge.
- Added regression tests for both controllers, each reconciling twice
  from a stale-annotation fixture and asserting the second pass is a
  true no-op.

Fixes #5818

Co-authored-by: Claude Sonnet 5 <noreply@anthropic.com>

Coverage Stats

12 of 15 new or added lines in 2 files covered. (80.0%)

12 existing lines in 5 files now uncovered.

75095 of 109437 relevant lines covered (68.62%)

72.88 hits per line