Skip to content

[deckhouse-cli] Preserve object-level default map #374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ldmonster merged 1 commit into from
May 28, 2026
Merged

[deckhouse-cli] Preserve object-level default map #374

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions internal/packagecmd/internal/packages/values/schema/defaults/generator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@
// 3. `enum`, preferring `default` if set, else the first enum value.
// 4. Object walk — explicit `type: object`, structural `properties`, or
// composition keywords (allOf / oneOf / anyOf) contribute properties.
// 5. `default` (deep-copied so callers may mutate the result).
// If `default` is a map, it is overlaid on top of the walked properties
// (same precedence rule as `x-example`), so a schema can declare both
// a property set and a richer default map without losing either.
// 5. `default` for non-object schemas (deep-copied so callers may mutate).
// 6. Array walk — one element synthesized from `items.schema`.
// 7. Scalar placeholder by type: 123 for integer/number, true for boolean,
// a pattern-matching string via reggen for string.
Expand Down Expand Up @@ -132,7 +135,16 @@ func synthesizeValue(s *spec.Schema) (any, error) {
}

if isObject(s) {
return synthesizeObject(s)
base, err := synthesizeObject(s)
if err != nil {
return nil, err
}

if def, ok := s.Default.(map[string]any); ok {
deepMergeOverride(base, def)
}

return base, nil
}

if s.Default != nil {
Expand Down
Loading