[flux/v2.9.x] kustomize: preserve existing image fields when merging spec.images#1267
Merged
Merged
Conversation
When the kustomization.yaml at the Kustomization's spec.path already contains an images entry for the same image name, the generator replaced the whole entry with the one from spec.images, silently dropping any field set only in the existing entry. With spec.images setting only newName, the newTag applied by the kustomization.yaml was lost and the build produced an untagged image reference, diverging from how a kustomize overlay handles a partial image override. Merge the fields into the existing entry instead, so a partial override preserves the remaining fields. Fixes fluxcd/flux2#5787 Signed-off-by: Gaál György <gb12335@gmail.com> (cherry picked from commit aee2dab)
Co-authored-by: Matheus Pimenta <matheuscscp@gmail.com> Signed-off-by: George Gaál <gb12335@gmail.com> (cherry picked from commit 812fbbb)
Extend the Test_Images table with the cross tag<->digest cases: an incoming newTag clears an existing digest and vice versa, newName is untouched by the pair update, setting both fields applies both, and an entry carrying only a name is a no-op. Document the pairing in the generator: it mirrors the kustomize image transformer, which replaces both original values whenever either is overridden. Signed-off-by: Gaál György <gb12335@gmail.com> (cherry picked from commit 56fcba1)
matheuscscp
approved these changes
Jul 22, 2026
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.
Automated backport to
flux/v2.9.x, triggered by a label in #1266.