kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-14 02:20:53 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

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

Browse Source 
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
This commit is contained in:
Davanum Srinivas
2025-06-25 13:01:16 -04:00
parent ba617e5126
commit a7703f685c
104 changed files with 746 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kyaml/go.mod
View File

@@ -12,10 +12,12 @@ require (
github.com/spf13/cobra v1.8.0
github.com/stretchr/testify v1.10.0
github.com/xlab/treeprint v1.2.0
go.yaml.in/yaml/v2 v2.4.2
go.yaml.in/yaml/v3 v3.0.3
golang.org/x/sys v0.29.0
google.golang.org/protobuf v1.36.1
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7
sigs.k8s.io/yaml v1.4.0
sigs.k8s.io/yaml v1.5.0
)
require (

9
kyaml/go.sum
View File

@@ -15,7 +15,6 @@ github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+Gr
github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ=
github.com/google/gnostic-models v0.6.9 h1:MU/8wDLif2qCXZmzncUQ/BOfxWfthHi63KqpoNbWqVw=
github.com/google/gnostic-models v0.6.9/go.mod h1:CiWsm0s6BSQd1hRn8/QmxqB6BesYcbSZxsz9b0KuDBw=
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
@@ -64,6 +63,10 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/xlab/treeprint v1.2.0 h1:HzHnuAF1plUN2zGlAFHbSQP2qJ0ZAD3XF5XD7OesXRQ=
github.com/xlab/treeprint v1.2.0/go.mod h1:gj5Gd3gPdKtR1ikdDK6fnFLdmIS0X30kTTuNd/WEJu0=
go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=
go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
go.yaml.in/yaml/v3 v3.0.3 h1:bXOww4E/J3f66rav3pX3m8w6jDE4knZjGOw8b5Y6iNE=
go.yaml.in/yaml/v3 v3.0.3/go.mod h1:tBHosrYAkRZjRAOREWbDnBXUf08JOwYq++0QNwQiWzI=
golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk=
@@ -83,5 +86,5 @@ k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
sigs.k8s.io/yaml v1.5.0 h1:M10b2U7aEUY6hRtU870n2VTPgR5RZiL/I6Lcc2F4NUQ=
sigs.k8s.io/yaml v1.5.0/go.mod h1:wZs27Rbxoai4C0f8/9urLZtZtF3avA3gKvGyPdDqTO4=

2
kyaml/yaml/alias.go
View File

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

4
kyaml/yaml/compatibility.go
View File

@@ -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

2
kyaml/yaml/fns.go
View File

@@ -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

2
kyaml/yaml/fns_test.go
View File

@@ -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 (

2
kyaml/yaml/kfns.go
View File

@@ -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.

2
kyaml/yaml/match.go
View File

@@ -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.

2
kyaml/yaml/match_test.go
View File

@@ -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) {

2
kyaml/yaml/rnode.go
View File

@@ -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.

2
kyaml/yaml/rnode_test.go
View File

@@ -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) {

2
kyaml/yaml/types.go
View File

@@ -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.