Drop usage of forked copies of goyaml.v2 and goyaml.v3

Signed-off-by: Davanum Srinivas <davanum@gmail.com>

kyaml/yaml/alias.go

@@ -7,7 +7,7 @@ import (
 	"bytes"
 	"io"
 
-	yaml "sigs.k8s.io/yaml/goyaml.v3"
+	yaml "go.yaml.in/yaml/v3"
 )
 
 const (

kyaml/yaml/compatibility.go

@@ -7,9 +7,9 @@ import (
 	"reflect"
 	"strings"
 
+	y1_1 "go.yaml.in/yaml/v2"
+	y1_2 "go.yaml.in/yaml/v3"
 	"k8s.io/kube-openapi/pkg/validation/spec"
-	y1_1 "sigs.k8s.io/yaml/goyaml.v2"
-	y1_2 "sigs.k8s.io/yaml/goyaml.v3"
 )
 
 // typeToTag maps OpenAPI schema types to yaml 1.2 tags

kyaml/yaml/fns.go

@@ -10,8 +10,8 @@ import (
 	"strings"
 
 	"github.com/davecgh/go-spew/spew"
+	yaml "go.yaml.in/yaml/v3"
 	"sigs.k8s.io/kustomize/kyaml/errors"
-	yaml "sigs.k8s.io/yaml/goyaml.v3"
 )
 
 // Append creates an ElementAppender

kyaml/yaml/fns_test.go

@@ -9,9 +9,9 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	yaml "go.yaml.in/yaml/v3"
 	"sigs.k8s.io/kustomize/kyaml/errors"
 	. "sigs.k8s.io/kustomize/kyaml/yaml"
-	yaml "sigs.k8s.io/yaml/goyaml.v3"
 )
 
 const (

kyaml/yaml/kfns.go

@@ -4,8 +4,8 @@
 package yaml
 
 import (
+	yaml "go.yaml.in/yaml/v3"
 	"sigs.k8s.io/kustomize/kyaml/errors"
-	yaml "sigs.k8s.io/yaml/goyaml.v3"
 )
 
 // AnnotationClearer removes an annotation at metadata.annotations.

kyaml/yaml/match.go

@@ -9,8 +9,8 @@ import (
 	"strconv"
 	"strings"
 
+	yaml "go.yaml.in/yaml/v3"
 	"sigs.k8s.io/kustomize/kyaml/errors"
-	yaml "sigs.k8s.io/yaml/goyaml.v3"
 )
 
 // PathMatcher returns all RNodes matching the path wrapped in a SequenceNode.

kyaml/yaml/match_test.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	yaml "sigs.k8s.io/yaml/goyaml.v3"
+	yaml "go.yaml.in/yaml/v3"
 )
 
 func TestPathMatcher_Filter(t *testing.T) {

kyaml/yaml/rnode.go

@@ -12,11 +12,11 @@ import (
 	"strconv"
 	"strings"
 
+	yaml "go.yaml.in/yaml/v3"
 	"sigs.k8s.io/kustomize/kyaml/errors"
 	"sigs.k8s.io/kustomize/kyaml/sliceutil"
 	"sigs.k8s.io/kustomize/kyaml/utils"
 	"sigs.k8s.io/kustomize/kyaml/yaml/internal/k8sgen/pkg/labels"
-	yaml "sigs.k8s.io/yaml/goyaml.v3"
 )
 
 // MakeNullNode returns an RNode that represents an empty document.

kyaml/yaml/rnode_test.go

@@ -12,7 +12,7 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	yaml "sigs.k8s.io/yaml/goyaml.v3"
+	yaml "go.yaml.in/yaml/v3"
 )
 
 func TestRNodeHasNilEntryInList(t *testing.T) {

kyaml/yaml/types.go

@@ -7,9 +7,9 @@ import (
 	"bytes"
 	"strings"
 
+	yaml "go.yaml.in/yaml/v3"
 	"sigs.k8s.io/kustomize/kyaml/errors"
 	"sigs.k8s.io/kustomize/kyaml/sets"
-	yaml "sigs.k8s.io/yaml/goyaml.v3"
 )
 
 // CopyYNode returns a distinct copy of its argument.