mirror of
https://github.com/helmfile/helmfile.git
synced 2026-09-30 15:06:58 +02:00
* feat(state): add mergeStrategy field to EnvironmentSpec Introduces a per-environment mergeStrategy with valid values "override" (default, current behavior) and "fallback". This commit only adds the field, the constants, and a parse-time validator; the loader still ignores the value, so behavior is unchanged. Subsequent commits thread the value through the values loader and implement the fallback semantics. Signed-off-by: Dominik Schmidt <dev@dominik-schmidt.de> * refactor(state): thread mergeStrategy through values loader Adds a mergeStrategy string parameter to LoadEnvironmentValues, loadValuesEntries, and mapMerge so the value can flow from EnvironmentSpec down to the merge call site. Behavior is unchanged in this commit; mapMerge ignores the strategy and the next commit implements the fallback semantics. Top-level state.DefaultValues and the --state-values-file/-set loaders are passed an empty strategy ("") since they have no per-environment spec to consult and stay on the default override behavior. Signed-off-by: Dominik Schmidt <dev@dominik-schmidt.de> * feat(state): implement fallback merge strategy Adds a hand-rolled fallbackDeepMerge that, unlike mergo, preserves keys present in the destination even when their value is the zero value (false, 0, "", nil, empty list/map). mapMerge dispatches to it when mergeStrategy == "fallback"; "override" and the empty default keep using mergo with WithOverride so existing behaviour is unchanged. Validation lives at the entry of LoadEnvironmentValues so a single chokepoint guards the field. Invalid values produce an error naming both the offending value and the valid options. Tests cover: first-file-wins precedence, gap filling, deep nested merge, three-file chains, explicit zero-value preservation (the case naïve mergo gets wrong), explicit nil preservation, inline map entries, override regression, default-equals-override equivalence, and invalid-strategy errors. Signed-off-by: Dominik Schmidt <dev@dominik-schmidt.de> * feat(state): expose prior-file values in fallback template context Under mergeStrategy: fallback, .gotmpl values files can now reference values from earlier files in the same `values:` list via .Values (e.g. `service.domain: "service.{{ .Values.cluster.domain }}"`). The accumulated result is layered under env.GetMergedValues so env defaults, env values, and CLI overrides still win on overlap. Override mode keeps the historical template context — unchanged — so this is strictly opt-in via the mergeStrategy field. Together with the precedence flip from the previous commit, this lets users replace the brittle two-stage `merged-values.yaml.gotmpl` workaround with native helmfile syntax. Tests cover the headline cross-file template reference case and pin the override-mode contract that prior-file values stay invisible. Signed-off-by: Dominik Schmidt <dev@dominik-schmidt.de> * docs: document mergeStrategy and fallback semantics Adds a new section to values-and-merging.md describing the override vs fallback strategies, the explicit-zero-value preservation guarantee, and the cross-file template reference behavior. Adds a brief pointer to environments.md so users land on the new field from the environment values discussion. Signed-off-by: Dominik Schmidt <dev@dominik-schmidt.de> * refactor(state): reuse maputil.MergeMaps for fallback merge Replaces the hand-rolled fallbackDeepMerge with a single call to maputil.MergeMaps, swapping its arguments so the accumulated dest wins over the new src file. Same first-file-wins semantic, fewer lines, and the fallback path now inherits the same slice merge strategies the rest of helmfile already uses. The one observable behavior shift is for explicit nil values: under fallback, nil in an earlier file no longer 'wins' over a non-nil value in a later file — instead it falls through (matching MergeMaps' rule that nil from the override side only fills missing keys). This is internally consistent: nil-overwrites is an mergo.WithOverride quirk that lives only in the override path. The renamed test NilFallsThroughToFallback pins the new behavior with a comment referencing the contrast with override mode (Issue1154). Signed-off-by: Dominik Schmidt <dev@dominik-schmidt.de> --------- Signed-off-by: Dominik Schmidt <dev@dominik-schmidt.de>
162 lines
5.4 KiB
Go
162 lines
5.4 KiB
Go
package state
|
|
|
|
import (
|
|
"fmt"
|
|
"path/filepath"
|
|
"strings"
|
|
|
|
"dario.cat/mergo"
|
|
"go.uber.org/zap"
|
|
|
|
"github.com/helmfile/helmfile/pkg/environment"
|
|
"github.com/helmfile/helmfile/pkg/filesystem"
|
|
"github.com/helmfile/helmfile/pkg/hcllang"
|
|
"github.com/helmfile/helmfile/pkg/maputil"
|
|
"github.com/helmfile/helmfile/pkg/remote"
|
|
"github.com/helmfile/helmfile/pkg/tmpl"
|
|
"github.com/helmfile/helmfile/pkg/yaml"
|
|
)
|
|
|
|
type EnvironmentValuesLoader struct {
|
|
storage *Storage
|
|
|
|
fs *filesystem.FileSystem
|
|
|
|
logger *zap.SugaredLogger
|
|
|
|
remote *remote.Remote
|
|
}
|
|
|
|
func NewEnvironmentValuesLoader(storage *Storage, fs *filesystem.FileSystem, logger *zap.SugaredLogger, remote *remote.Remote) *EnvironmentValuesLoader {
|
|
return &EnvironmentValuesLoader{
|
|
storage: storage,
|
|
fs: fs,
|
|
logger: logger,
|
|
remote: remote,
|
|
}
|
|
}
|
|
|
|
func (ld *EnvironmentValuesLoader) LoadEnvironmentValues(missingFileHandler *string, valuesEntries []any, ctxEnv *environment.Environment, envName string, mergeStrategy string) (map[string]any, error) {
|
|
switch mergeStrategy {
|
|
case "", MergeStrategyOverride, MergeStrategyFallback:
|
|
default:
|
|
return nil, fmt.Errorf("environment %q: invalid mergeStrategy %q (must be %q or %q)",
|
|
envName, mergeStrategy, MergeStrategyOverride, MergeStrategyFallback)
|
|
}
|
|
var (
|
|
result = map[string]any{}
|
|
hclLoader = hcllang.NewHCLLoader(ld.fs, ld.logger)
|
|
err error
|
|
)
|
|
|
|
for _, entry := range valuesEntries {
|
|
switch strOrMap := entry.(type) {
|
|
case string:
|
|
files, skipped, err := ld.storage.resolveFile(missingFileHandler, "environment values", entry.(string))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if skipped {
|
|
continue
|
|
}
|
|
for _, f := range files {
|
|
var env environment.Environment
|
|
if ctxEnv == nil {
|
|
env = *environment.New(envName)
|
|
} else {
|
|
env = *ctxEnv
|
|
}
|
|
if strings.HasSuffix(f, ".hcl") {
|
|
hclLoader.AddFile(f)
|
|
continue
|
|
}
|
|
// Use merged values (Defaults + Values + CLIOverrides) for template rendering
|
|
// so that CLI values are accessible via .Values in environment value files.
|
|
mergedVals, err := env.GetMergedValues()
|
|
if err != nil {
|
|
return nil, fmt.Errorf("failed to get merged values for environment file \"%s\": %v", f, err)
|
|
}
|
|
// Under fallback strategy, also expose values accumulated from earlier files
|
|
// in this same `values:` list, including earlier files in this same glob
|
|
// expansion, so a later .gotmpl can reference them via .Values (e.g.
|
|
// `{{ .Values.cluster.domain }}`). Env CLI overrides and values still win,
|
|
// layered on top with WithOverride.
|
|
if mergeStrategy == MergeStrategyFallback && len(result) > 0 {
|
|
enriched := map[string]any{}
|
|
if err := mergo.Merge(&enriched, result); err != nil {
|
|
return nil, fmt.Errorf("failed to build template context for \"%s\": %v", f, err)
|
|
}
|
|
if err := mergo.Merge(&enriched, mergedVals, mergo.WithOverride); err != nil {
|
|
return nil, fmt.Errorf("failed to build template context for \"%s\": %v", f, err)
|
|
}
|
|
mergedVals = enriched
|
|
}
|
|
tmplData := NewEnvironmentTemplateData(env, "", mergedVals)
|
|
r := tmpl.NewFileRenderer(ld.fs, filepath.Dir(f), tmplData)
|
|
bytes, err := r.RenderToBytes(f)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("failed to load environment values file \"%s\": %v", f, err)
|
|
}
|
|
m := map[string]any{}
|
|
if err := yaml.Unmarshal(bytes, &m); err != nil {
|
|
return nil, fmt.Errorf("failed to load environment values file \"%s\": %v\n\nOffending YAML:\n%s", f, err, bytes)
|
|
}
|
|
ld.logger.Debugf("envvals_loader: loaded %s:%v", strOrMap, m)
|
|
// Merge each file into result immediately so subsequent files in the same
|
|
// entry's expansion (e.g. a glob) can see prior files' values via .Values
|
|
// when rendered as templates.
|
|
result, err = mapMerge(result, []any{m}, mergeStrategy)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
case map[any]any, map[string]any:
|
|
result, err = mapMerge(result, []any{strOrMap}, mergeStrategy)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
default:
|
|
return nil, fmt.Errorf("unexpected type of value: value=%v, type=%T", strOrMap, strOrMap)
|
|
}
|
|
}
|
|
maps := []any{}
|
|
if hclLoader.Length() > 0 {
|
|
m, err := hclLoader.HCLRender()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
maps = append(maps, m)
|
|
}
|
|
result, err = mapMerge(result, maps, mergeStrategy)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return result, nil
|
|
}
|
|
|
|
func mapMerge(dest map[string]any, maps []any, mergeStrategy string) (map[string]any, error) {
|
|
for _, m := range maps {
|
|
// All the nested map key should be string. Otherwise we get strange errors due to that
|
|
// mergo or reflect is unable to merge map[any]any with map[string]any or vice versa.
|
|
// See https://github.com/roboll/helmfile/issues/677
|
|
vals, err := maputil.CastKeysToStrings(m)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if mergeStrategy == MergeStrategyFallback {
|
|
// First-file-wins: the new file is the base and the
|
|
// accumulator overlays it, so keys already accumulated keep
|
|
// their value while keys only present in the new file fill
|
|
// in. MergeMaps is used instead of mergo because mergo's
|
|
// isEmptyValue rule would silently let a later fallback's
|
|
// `enabled: true` clobber an explicit `enabled: false`.
|
|
dest = maputil.MergeMaps(vals, dest)
|
|
continue
|
|
}
|
|
if err := mergo.Merge(&dest, &vals, mergo.WithOverride); err != nil {
|
|
return nil, fmt.Errorf("failed to merge %v: %v", m, err)
|
|
}
|
|
}
|
|
return dest, nil
|
|
}
|