stacklok / toolhive / 28832278790

68%

Build Type

push

github

Committed by web-flow

Commit Message

Preserve external annotations on operator Services (#5731)

A Service co-owned by an external controller (e.g. GKE NEG/Gateway,
which writes `cloud.google.com/*` annotations) made `serviceNeedsUpdate`
fire on every reconcile and the update wholesale-replace those
annotations, hot-looping `Update` against the concurrent writer with
`resourceVersion` conflicts.

* Compare operator-owned labels/annotations with `MapIsSubset` instead
  of `maps.Equal`, so externally-managed keys are not treated as drift
* Merge (not replace) labels/annotations on write via `MergeLabels`/
  `MergeAnnotations`, preserving external keys
* Apply the fix to the VirtualMCPServer, MCPServer, MCPRemoteProxy, and
  EmbeddingServer Service reconcilers
* Add detection and write-path regression tests for all four

Fixes #5730

Coverage Stats

25 of 27 new or added lines in 4 files covered. (92.59%)

18 existing lines in 5 files now uncovered.

72725 of 107174 relevant lines covered (67.86%)

64.11 hits per line