Resolve every variant image through one override set - #5251
Open
caseydavenport wants to merge 2 commits into
Open
Resolve every variant image through one override set#5251caseydavenport wants to merge 2 commits into
caseydavenport wants to merge 2 commits into
Conversation
Four extensions each built their own set, so a component whose controller had no set of its own could not resolve an image at all.
Every component that runs a binary out of the combined image reads that image from the variant's override set.
caseydavenport
force-pushed
the
casey-image-overrides
branch
from
August 25, 2026 20:16
7ddc495 to
57fcfef
Compare
caseydavenport
changed the title
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
3 participants
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.
Description
The operator held four separate sets of variant image overrides, one per extension that happened to need them, each with its own accessor. That works only for components whose controller has an extension carrying a set, and the combined calico image is wanted by components across several that do not: clusterconnection, apiserver, whisker, goldmane.
Adding a fifth, sixth and seventh set is the wrong direction, and it has a quiet failure mode: miss one registration and an Enterprise install silently runs the Calico image for that component.
The variant cannot change without restarting the process, so the mapping from component name to image is a property of whole operator process:
The second commit uses it. Enterprise registers a key for the combined image, and every component that runs one of its binaries resolves through the override set: typha, csi, guardian, apiserver, webhooks, whisker, goldmane, node, kube-controllers, es-kube-controllers.
The CSR init image is the one caller left that branches on the variant itself. The core certificate manager has no way to reach the override set and 27 call sites would have to opt in, so that one is its own change.
No behavior change: the same keys resolve to the same images. The Enterprise render tests and the mainline FVs now build the extensions they were skipping, since the variant field alone no longer selects an image.
Related: CORE-13461