Merge pull request #396 from helmfile/bump_yaml_v3

bump: upgrade gopkg.in/yaml.v2 to gopkg.in/yaml.v3
This commit is contained in:
yxxhero
2022-10-05 10:12:25 +08:00
committed by GitHub
22 changed files with 218 additions and 73 deletions
+1 -1
View File
@@ -4660,7 +4660,7 @@ releases:
}
expectedValues := []interface{}{
map[interface{}]interface{}{"val1": "zipkin"},
map[interface{}]interface{}{"val2": "val2"}}
map[string]interface{}{"val2": "val2"}}
expectedSetValues := []state.SetValue{
{Name: "name-zipkin", Value: "val-zipkin"},
{Name: "name", Value: "val"}}
+3 -2
View File
@@ -1,8 +1,9 @@
package app
import (
"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"
"github.com/helmfile/helmfile/pkg/maputil"
"github.com/helmfile/helmfile/pkg/state"
)
@@ -21,7 +22,7 @@ type LoadOpts struct {
}
func (o LoadOpts) DeepCopy() LoadOpts {
bytes, err := yaml.Marshal(o)
bytes, err := maputil.YamlMarshal(o)
if err != nil {
panic(err)
}
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"strings"
"testing"
"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"
"github.com/helmfile/helmfile/pkg/helmexec"
"github.com/helmfile/helmfile/pkg/remote"