diff options
| author | openshift-ci[bot] <75433959+openshift-ci[bot]@users.noreply.github.com> | 2022-06-21 19:23:48 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-21 19:23:48 +0000 |
| commit | 8d17251f8a0574054d7dae4ddeb9484740616348 (patch) | |
| tree | 75968dd8e7f15e31e75e3939cbe9f23bb689a7f7 | |
| parent | 8863e13dc3248eaca1cd35359416166e896578f2 (diff) | |
| parent | 948866e8a0b513f5e60755f99de39c7d6311970d (diff) | |
| download | podman-8d17251f8a0574054d7dae4ddeb9484740616348.tar.gz podman-8d17251f8a0574054d7dae4ddeb9484740616348.tar.bz2 podman-8d17251f8a0574054d7dae4ddeb9484740616348.zip | |
Merge pull request #14642 from rhatdan/VENDOR
Update to use gopkg.in/yaml.v3
| -rw-r--r-- | go.mod | 2 | ||||
| -rw-r--r-- | pkg/domain/infra/abi/play.go | 6 | ||||
| -rw-r--r-- | vendor/modules.txt | 2 |
3 files changed, 5 insertions, 5 deletions
@@ -71,7 +71,7 @@ require ( golang.org/x/text v0.3.7 google.golang.org/protobuf v1.28.0 gopkg.in/inf.v0 v0.9.1 - gopkg.in/yaml.v2 v2.4.0 + gopkg.in/yaml.v3 v3.0.1 ) require github.com/docker/libnetwork v0.8.0-dev.2.0.20190625141545-5a177b73e316 // indirect diff --git a/pkg/domain/infra/abi/play.go b/pkg/domain/infra/abi/play.go index e04ab3a1a..e14a819fa 100644 --- a/pkg/domain/infra/abi/play.go +++ b/pkg/domain/infra/abi/play.go @@ -31,7 +31,7 @@ import ( "github.com/opencontainers/go-digest" "github.com/pkg/errors" "github.com/sirupsen/logrus" - yamlv2 "gopkg.in/yaml.v2" + yamlv3 "gopkg.in/yaml.v3" ) // createServiceContainer creates a container that can later on @@ -790,7 +790,7 @@ func readConfigMapFromFile(r io.Reader) (v1.ConfigMap, error) { func splitMultiDocYAML(yamlContent []byte) ([][]byte, error) { var documentList [][]byte - d := yamlv2.NewDecoder(bytes.NewReader(yamlContent)) + d := yamlv3.NewDecoder(bytes.NewReader(yamlContent)) for { var o interface{} // read individual document @@ -804,7 +804,7 @@ func splitMultiDocYAML(yamlContent []byte) ([][]byte, error) { if o != nil { // back to bytes - document, err := yamlv2.Marshal(o) + document, err := yamlv3.Marshal(o) if err != nil { return nil, errors.Wrapf(err, "individual doc yaml could not be marshalled") } diff --git a/vendor/modules.txt b/vendor/modules.txt index 2ca9a314c..9b0e22391 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -863,9 +863,9 @@ gopkg.in/square/go-jose.v2/json # gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 gopkg.in/tomb.v1 # gopkg.in/yaml.v2 v2.4.0 -## explicit gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 +## explicit gopkg.in/yaml.v3 # sigs.k8s.io/yaml v1.3.0 sigs.k8s.io/yaml |