From 40e15da909744807875f95089969b371480da8b3 Mon Sep 17 00:00:00 2001 From: Mikhail Mazurskiy Date: Thu, 25 Jun 2020 12:17:31 +1000 Subject: [PATCH] Use sigs.k8s.io/yaml for YAML --- go.mod | 3 +-- go.sum | 4 ++++ pkg/kstatus/status/status_compute_test.go | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 9d8fa03..3376902 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,6 @@ module sigs.k8s.io/cli-utils go 1.13 require ( - github.com/ghodss/yaml v1.0.0 github.com/go-errors/errors v1.0.1 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef // indirect github.com/google/uuid v1.1.1 @@ -25,5 +24,5 @@ require ( k8s.io/utils v0.0.0-20191114184206-e782cd3c129f sigs.k8s.io/controller-runtime v0.4.0 sigs.k8s.io/kustomize/kyaml v0.1.4 - sigs.k8s.io/yaml v1.1.0 + sigs.k8s.io/yaml v1.2.0 ) diff --git a/go.sum b/go.sum index f6eafc3..d362cf3 100644 --- a/go.sum +++ b/go.sum @@ -524,6 +524,8 @@ gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.7 h1:VUgggvou5XRW9mHwD/yXxIYSMtY0zoKQf/v226p2nyo= gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20191120175047-4206685974f2/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71 h1:Xe2gvTZUJpsvOWUnvmL/tmhVBZUmHSvLbMjRj6NUUKo= gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= @@ -597,4 +599,6 @@ sigs.k8s.io/testing_frameworks v0.1.2 h1:vK0+tvjF0BZ/RYFeZ1E6BYBwHJJXhjuZ3TdsEKH sigs.k8s.io/testing_frameworks v0.1.2/go.mod h1:ToQrwSC3s8Xf/lADdZp3Mktcql9CG0UAmdJG9th5i0w= sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= +sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= +sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc/go.mod h1:so/NYdZXCz+E3ZpW0uAoCj6uzU2+8OWDFv/HxUSs7kI= diff --git a/pkg/kstatus/status/status_compute_test.go b/pkg/kstatus/status/status_compute_test.go index 5be0147..2d9907b 100644 --- a/pkg/kstatus/status/status_compute_test.go +++ b/pkg/kstatus/status/status_compute_test.go @@ -8,10 +8,10 @@ import ( "testing" "time" - "github.com/ghodss/yaml" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" + "sigs.k8s.io/yaml" ) func y2u(t *testing.T, spec string) *unstructured.Unstructured {