Merge pull request #396 from helmfile/bump_yaml_v3

bump: upgrade gopkg.in/yaml.v2 to gopkg.in/yaml.v3

pkg/state/chart_dependency.go

@@ -11,10 +11,11 @@ import (
 	goversion "github.com/hashicorp/go-version"
 	"github.com/r3labs/diff"
 	"go.uber.org/zap"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 
 	"github.com/helmfile/helmfile/pkg/app/version"
 	"github.com/helmfile/helmfile/pkg/helmexec"
+	"github.com/helmfile/helmfile/pkg/maputil"
 )
 
 type ChartMeta struct {
@@ -299,7 +300,7 @@ func (m *chartDependencyManager) updateHelm3(shell helmexec.DependencyUpdater, w
 	chartMetaContent := fmt.Sprintf("name: %s\nversion: 1.0.0\napiVersion: v2\n", m.Name)
 
 	// Generate `requirements.yaml` of the temporary local chart from the helmfile state
-	reqsContent, err := yaml.Marshal(unresolved.ToChartRequirements())
+	reqsContent, err := maputil.YamlMarshal(unresolved.ToChartRequirements())
 	if err != nil {
 		return nil, err
 	}
@@ -317,7 +318,7 @@ func (m *chartDependencyManager) updateHelm2(shell helmexec.DependencyUpdater, w
 	}
 
 	// Generate `requirements.yaml` of the temporary local chart from the helmfile state
-	reqsContent, err := yaml.Marshal(unresolved.ToChartRequirements())
+	reqsContent, err := maputil.YamlMarshal(unresolved.ToChartRequirements())
 	if err != nil {
 		return nil, err
 	}
@@ -383,7 +384,7 @@ func (m *chartDependencyManager) doUpdate(chartLockFile string, unresolved *Unre
 
 	lockedReqs.Version = version.Version
 
-	updatedLockFileContent, err = yaml.Marshal(lockedReqs)
+	updatedLockFileContent, err = maputil.YamlMarshal(lockedReqs)
 
 	if err != nil {
 		return nil, err

pkg/state/create.go

@@ -9,7 +9,7 @@ import (
 	"github.com/imdario/mergo"
 	"github.com/variantdev/vals"
 	"go.uber.org/zap"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 
 	"github.com/helmfile/helmfile/pkg/environment"
 	"github.com/helmfile/helmfile/pkg/filesystem"
@@ -86,7 +86,7 @@ func (c *StateCreator) Parse(content []byte, baseDir, file string) (*HelmState,
 
 	decoder := yaml.NewDecoder(bytes.NewReader(content))
 
-	decoder.SetStrict(c.Strict)
+	decoder.KnownFields(c.Strict)
 
 	i := 0
 	for {

pkg/state/envvals_loader.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/imdario/mergo"
 	"go.uber.org/zap"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 
 	"github.com/helmfile/helmfile/pkg/environment"
 	"github.com/helmfile/helmfile/pkg/filesystem"
@@ -79,7 +79,7 @@ func (ld *EnvironmentValuesLoader) LoadEnvironmentValues(missingFileHandler *str
 					ld.logger.Debugf("envvals_loader: loaded %s:%v", strOrMap, m)
 				}
 			}
-		case map[interface{}]interface{}:
+		case map[interface{}]interface{}, map[string]interface{}:
 			maps = append(maps, strOrMap)
 		default:
 			return nil, fmt.Errorf("unexpected type of value: value=%v, type=%T", strOrMap, strOrMap)

pkg/state/release.go

@@ -3,8 +3,9 @@ package state
 import (
 	"fmt"
 
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 
+	"github.com/helmfile/helmfile/pkg/maputil"
 	"github.com/helmfile/helmfile/pkg/tmpl"
 )
 
@@ -97,8 +98,8 @@ func (r ReleaseSpec) ExecuteTemplateExpressions(renderer *tmpl.FileRenderer) (*R
 	if len(result.ValuesTemplate) > 0 {
 		for i, t := range result.ValuesTemplate {
 			switch ts := t.(type) {
-			case map[interface{}]interface{}:
-				serialized, err := yaml.Marshal(ts)
+			case map[interface{}]interface{}, map[string]interface{}:
+				serialized, err := maputil.YamlMarshal(ts)
 				if err != nil {
 					return nil, fmt.Errorf("failed executing template expressions in release \"%s\".values[%d] = \"%v\": %v", r.Name, i, ts, err)
 				}
@@ -201,7 +202,7 @@ func (r ReleaseSpec) ExecuteTemplateExpressions(renderer *tmpl.FileRenderer) (*R
 }
 
 func (r ReleaseSpec) Clone() (*ReleaseSpec, error) {
-	serialized, err := yaml.Marshal(r)
+	serialized, err := maputil.YamlMarshal(r)
 	if err != nil {
 		return nil, fmt.Errorf("failed cloning release \"%s\": %v", r.Name, err)
 	}

pkg/state/state.go

@@ -22,12 +22,13 @@ import (
 	"github.com/variantdev/chartify"
 	"github.com/variantdev/vals"
 	"go.uber.org/zap"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 
 	"github.com/helmfile/helmfile/pkg/environment"
 	"github.com/helmfile/helmfile/pkg/event"
 	"github.com/helmfile/helmfile/pkg/filesystem"
 	"github.com/helmfile/helmfile/pkg/helmexec"
+	"github.com/helmfile/helmfile/pkg/maputil"
 	"github.com/helmfile/helmfile/pkg/remote"
 	"github.com/helmfile/helmfile/pkg/tmpl"
 )
@@ -2663,7 +2664,7 @@ func (st *HelmState) RenderReleaseValuesFileToBytes(release *ReleaseSpec, path s
 			return nil, err
 		}
 
-		return yaml.Marshal(parsedYaml)
+		return maputil.YamlMarshal(parsedYaml)
 	}
 
 	return rawBytes, nil
@@ -2830,7 +2831,7 @@ func (st *HelmState) generateSecretValuesFiles(helm helmexec.Interface, release
 				return nil, err
 			}
 		default:
-			bs, err := yaml.Marshal(value)
+			bs, err := maputil.YamlMarshal(value)
 			if err != nil {
 				return nil, err
 			}
@@ -3071,7 +3072,7 @@ func (hf *SubHelmfileSpec) UnmarshalYAML(unmarshal func(interface{}) error) erro
 	switch i := tmp.(type) {
 	case string: // single path definition without sub items, legacy sub helmfile definition
 		hf.Path = i
-	case map[interface{}]interface{}: // helmfile path with sub section
+	case map[interface{}]interface{}, map[string]interface{}: // helmfile path with sub section
 		var subHelmfileSpecTmp struct {
 			Path               string   `yaml:"path"`
 			Selectors          []string `yaml:"selectors"`
@@ -3232,7 +3233,7 @@ func (st *HelmState) GenerateOutputFilePath(release *ReleaseSpec, outputFileTemp
 }
 
 func (st *HelmState) ToYaml() (string, error) {
-	if result, err := yaml.Marshal(st); err != nil {
+	if result, err := maputil.YamlMarshal(st); err != nil {
 		return "", err
 	} else {
 		return string(result), nil

pkg/state/state_exec_tmpl.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"reflect"
 
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 
 	"github.com/helmfile/helmfile/pkg/tmpl"
 )