Maksytka/kind
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kind.git synced 2025-12-01 07:26:05 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3906 from BenTheElder/yaml-yaml

Browse Source 
migrate off of gopkg.in/yaml.v3
This commit is contained in:
Kubernetes Prow Robot
2025-04-03 16:28:37 -07:00
committed by GitHub
parent bbb7bb01cd b229bcf3d1
commit 1e95d05eec
6 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
go.mod
View File

@@ -20,7 +20,6 @@ require (
github.com/pkg/errors v0.9.1 github.com/pkg/errors v0.9.1
github.com/spf13/cobra v1.8.0 github.com/spf13/cobra v1.8.0
github.com/spf13/pflag v1.0.5 github.com/spf13/pflag v1.0.5
gopkg.in/yaml.v3 v3.0.1
sigs.k8s.io/yaml v1.4.0 sigs.k8s.io/yaml v1.4.0
) )
@@ -28,4 +27,6 @@ require (
github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/kr/text v0.2.0 // indirect github.com/kr/text v0.2.0 // indirect
golang.org/x/sys v0.6.0 // indirect golang.org/x/sys v0.6.0 // indirect
// TODO: https://github.com/google/safetext/issues/9
gopkg.in/yaml.v3 v3.0.1 // indirect
) )

4
pkg/apis/config/v1alpha4/yaml.go
View File

@@ -27,7 +27,7 @@ Custom YAML (de)serialization for these types
*/ */
// UnmarshalYAML implements custom decoding YAML // UnmarshalYAML implements custom decoding YAML
// https://godoc.org/gopkg.in/yaml.v3 // https://godoc.org/sigs.k8s.io/yaml/goyaml.v3
func (m *Mount) UnmarshalYAML(unmarshal func(interface{}) error) error { func (m *Mount) UnmarshalYAML(unmarshal func(interface{}) error) error {
// first unmarshal in the alias type (to avoid a recursion loop on unmarshal) // first unmarshal in the alias type (to avoid a recursion loop on unmarshal)
type MountAlias Mount type MountAlias Mount
@@ -50,7 +50,7 @@ func (m *Mount) UnmarshalYAML(unmarshal func(interface{}) error) error {
} }
// UnmarshalYAML implements custom decoding YAML // UnmarshalYAML implements custom decoding YAML
// https://godoc.org/gopkg.in/yaml.v3 // https://godoc.org/sigs.k8s.io/yaml/goyaml.v3
func (p *PortMapping) UnmarshalYAML(unmarshal func(interface{}) error) error { func (p *PortMapping) UnmarshalYAML(unmarshal func(interface{}) error) error {
// first unmarshal in the alias type (to avoid a recursion loop on unmarshal) // first unmarshal in the alias type (to avoid a recursion loop on unmarshal)
type PortMappingAlias PortMapping type PortMappingAlias PortMapping

2
pkg/cluster/internal/kubeconfig/internal/kubeconfig/encode.go
View File

@@ -19,8 +19,8 @@ package kubeconfig
import ( import (
"bytes" "bytes"
yaml "gopkg.in/yaml.v3"
kubeyaml "sigs.k8s.io/yaml" kubeyaml "sigs.k8s.io/yaml"
yaml "sigs.k8s.io/yaml/goyaml.v3"
"sigs.k8s.io/kind/pkg/errors" "sigs.k8s.io/kind/pkg/errors"
) )

2
pkg/cluster/internal/kubeconfig/internal/kubeconfig/read.go
View File

@@ -20,7 +20,7 @@ import (
"io" "io"
"os" "os"
yaml "gopkg.in/yaml.v3" yaml "sigs.k8s.io/yaml/goyaml.v3"
"sigs.k8s.io/kind/pkg/errors" "sigs.k8s.io/kind/pkg/errors"
) )

2
pkg/internal/apis/config/encoding/load.go
View File

@@ -20,7 +20,7 @@ import (
"bytes" "bytes"
"os" "os"
yaml "gopkg.in/yaml.v3" yaml "sigs.k8s.io/yaml/goyaml.v3"
"sigs.k8s.io/kind/pkg/apis/config/v1alpha4" "sigs.k8s.io/kind/pkg/apis/config/v1alpha4"
"sigs.k8s.io/kind/pkg/errors" "sigs.k8s.io/kind/pkg/errors"

3
pkg/internal/patch/toml.go
View File

@@ -23,7 +23,8 @@ import (
burntoml "github.com/BurntSushi/toml" burntoml "github.com/BurntSushi/toml"
jsonpatch "github.com/evanphx/json-patch/v5" jsonpatch "github.com/evanphx/json-patch/v5"
toml "github.com/pelletier/go-toml" toml "github.com/pelletier/go-toml"
yaml "gopkg.in/yaml.v3"
yaml "sigs.k8s.io/yaml/goyaml.v3"
"sigs.k8s.io/kind/pkg/errors" "sigs.k8s.io/kind/pkg/errors"
) )