mirror of
https://github.com/helmfile/helmfile.git
synced 2026-10-05 00:00:51 +02:00
Danny Shemesh
71bb7354e7
This commit proposes a potential solution for https://github.com/roboll/helmfile/issues/1201 The gist is that, if prestate rendering fails, for any reason, we do not populate the .Values in the second pass renderer. I think that what have been expected in this case is to populate the .Values irregardless. pkg/app/two_pass_renderer.go - Migrated to use finalEnv.GetMergedValues() pkg/environment/environment.go - Introduced GetMergedValues, which merges the environment's defaults and current values, and then casts the keys to string; This was previously defined in HelmState.Values() - however, as this method is only concerned with the environment, I think it's more appropriate for it to sit here. pkg/state/state_exec_tmpl.go - Extracted out HelmState.Values() to environment.go, see above
86 lines
1.8 KiB
Go
86 lines
1.8 KiB
Go
package environment
|
|
|
|
import (
|
|
"github.com/imdario/mergo"
|
|
"github.com/roboll/helmfile/pkg/maputil"
|
|
"gopkg.in/yaml.v2"
|
|
)
|
|
|
|
type Environment struct {
|
|
Name string
|
|
Values map[string]interface{}
|
|
Defaults map[string]interface{}
|
|
}
|
|
|
|
var EmptyEnvironment Environment
|
|
|
|
func (e Environment) DeepCopy() Environment {
|
|
valuesBytes, err := yaml.Marshal(e.Values)
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
var values map[string]interface{}
|
|
if err := yaml.Unmarshal(valuesBytes, &values); err != nil {
|
|
panic(err)
|
|
}
|
|
values, err = maputil.CastKeysToStrings(values)
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
|
|
defaultsBytes, err := yaml.Marshal(e.Defaults)
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
var defaults map[string]interface{}
|
|
if err := yaml.Unmarshal(defaultsBytes, &defaults); err != nil {
|
|
panic(err)
|
|
}
|
|
defaults, err = maputil.CastKeysToStrings(defaults)
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
|
|
return Environment{
|
|
Name: e.Name,
|
|
Values: values,
|
|
Defaults: defaults,
|
|
}
|
|
}
|
|
|
|
func (e *Environment) Merge(other *Environment) (*Environment, error) {
|
|
if e == nil {
|
|
if other != nil {
|
|
copy := other.DeepCopy()
|
|
return ©, nil
|
|
}
|
|
return nil, nil
|
|
}
|
|
copy := e.DeepCopy()
|
|
if other != nil {
|
|
if err := mergo.Merge(©, other, mergo.WithOverride, mergo.WithOverwriteWithEmptyValue); err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
return ©, nil
|
|
}
|
|
|
|
func (e *Environment) GetMergedValues() (map[string]interface{}, error) {
|
|
vals := map[string]interface{}{}
|
|
|
|
if err := mergo.Merge(&vals, e.Defaults, mergo.WithOverride, mergo.WithOverwriteWithEmptyValue); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if err := mergo.Merge(&vals, e.Values, mergo.WithOverride, mergo.WithOverwriteWithEmptyValue); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
vals, err := maputil.CastKeysToStrings(vals)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return vals, nil
|
|
}
|