From bcbeb30d85ced775978275f76e1b782d62e4760d Mon Sep 17 00:00:00 2001 From: Ole Markus With Date: Sun, 10 Apr 2022 11:34:40 +0200 Subject: [PATCH] Remove explicit dependency on yamlv2 Update tests/e2e/kubetest2-kops/deployer/template.go Co-authored-by: Ciprian Hacman --- go.mod | 2 +- pkg/kubemanifest/BUILD.bazel | 1 - pkg/kubemanifest/yaml.go | 6 +++--- tests/e2e/go.mod | 2 +- tests/e2e/kubetest2-kops/deployer/template.go | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 82aad0f19e..b40b009e04 100644 --- a/go.mod +++ b/go.mod @@ -83,7 +83,6 @@ require ( gopkg.in/gcfg.v1 v1.2.3 gopkg.in/inf.v0 v0.9.1 gopkg.in/square/go-jose.v2 v2.5.1 - gopkg.in/yaml.v2 v2.4.0 helm.sh/helm/v3 v3.8.1 k8s.io/api v0.23.5 k8s.io/apimachinery v0.23.5 @@ -231,6 +230,7 @@ require ( google.golang.org/protobuf v1.27.1 // indirect gopkg.in/ini.v1 v1.66.3 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect k8s.io/apiextensions-apiserver v0.23.5 // indirect k8s.io/cloud-provider v0.23.5 // indirect diff --git a/pkg/kubemanifest/BUILD.bazel b/pkg/kubemanifest/BUILD.bazel index ff75b28753..88ee8d28cd 100644 --- a/pkg/kubemanifest/BUILD.bazel +++ b/pkg/kubemanifest/BUILD.bazel @@ -15,7 +15,6 @@ go_library( visibility = ["//visibility:public"], deps = [ "//util/pkg/text:go_default_library", - "//vendor/gopkg.in/yaml.v2:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", diff --git a/pkg/kubemanifest/yaml.go b/pkg/kubemanifest/yaml.go index c5df2b0ef1..6383cc773e 100644 --- a/pkg/kubemanifest/yaml.go +++ b/pkg/kubemanifest/yaml.go @@ -20,9 +20,9 @@ import ( "encoding/json" "fmt" - yamlv2 "gopkg.in/yaml.v2" "k8s.io/apimachinery/pkg/runtime" "k8s.io/klog/v2" + "sigs.k8s.io/yaml" ) // KubeObjectToApplyYAML returns the kubernetes object converted to YAML, with "noisy" fields removed. @@ -41,7 +41,7 @@ func KubeObjectToApplyYAML(data runtime.Object) (string, error) { // Convert the JSON to a map. jsonObj := make(map[string]interface{}) - if err := yamlv2.Unmarshal(j, &jsonObj); err != nil { + if err := yaml.Unmarshal(j, &jsonObj); err != nil { return "", err } @@ -61,7 +61,7 @@ func KubeObjectToApplyYAML(data runtime.Object) (string, error) { } // Marshal the cleaned-up map into YAML. - y, err := yamlv2.Marshal(jsonObj) + y, err := yaml.Marshal(jsonObj) if err != nil { return "", err } diff --git a/tests/e2e/go.mod b/tests/e2e/go.mod index f10223cd60..c6c2962067 100644 --- a/tests/e2e/go.mod +++ b/tests/e2e/go.mod @@ -7,7 +7,6 @@ require ( github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 github.com/octago/sflags v0.2.0 github.com/spf13/pflag v1.0.5 - gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.23.5 k8s.io/apimachinery v0.23.5 k8s.io/client-go v9.0.0+incompatible @@ -140,6 +139,7 @@ require ( gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/square/go-jose.v2 v2.5.1 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect k8s.io/klog v1.0.0 // indirect k8s.io/release v0.7.1-0.20210204090829-09fb5e3883b8 // indirect diff --git a/tests/e2e/kubetest2-kops/deployer/template.go b/tests/e2e/kubetest2-kops/deployer/template.go index 2dbc93dc77..1e2453bfed 100644 --- a/tests/e2e/kubetest2-kops/deployer/template.go +++ b/tests/e2e/kubetest2-kops/deployer/template.go @@ -22,9 +22,9 @@ import ( "path" "strings" - "gopkg.in/yaml.v2" "k8s.io/klog/v2" "sigs.k8s.io/kubetest2/pkg/exec" + "sigs.k8s.io/yaml" ) // renderTemplate will render the manifest template with the provided values,