From 3686c8ce4f80275138d2b0504cfe1515eb876200 Mon Sep 17 00:00:00 2001 From: Manjunath Kumatagi Date: Wed, 18 Dec 2024 10:25:07 +0530 Subject: [PATCH] Use sigs.k8s.io/yaml/goyaml.v3 --- go.mod | 3 +-- go.sum | 3 ++- pkg/merger/BUILD.bazel | 2 +- pkg/merger/merger.go | 2 +- repos.bzl | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 06d053e85..267d2e311 100644 --- a/go.mod +++ b/go.mod @@ -25,12 +25,11 @@ require ( google.golang.org/genproto/googleapis/rpc v0.0.0-20230731193218-e0aa005b6bdf // indirect google.golang.org/grpc v1.57.0 google.golang.org/protobuf v1.31.0 - gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.27.4 k8s.io/klog/v2 v2.100.1 // indirect k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect sigs.k8s.io/structured-merge-diff/v4 v4.3.0 // indirect - sigs.k8s.io/yaml v1.3.0 + sigs.k8s.io/yaml v1.4.0 ) go 1.14 diff --git a/go.sum b/go.sum index 174a4cae2..fc500d315 100644 --- a/go.sum +++ b/go.sum @@ -2033,5 +2033,6 @@ sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ih sigs.k8s.io/structured-merge-diff/v4 v4.3.0 h1:UZbZAZfX0wV2zr7YZorDz6GXROfDFj6LvqCRm4VUVKk= sigs.k8s.io/structured-merge-diff/v4 v4.3.0/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= -sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= +sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= +sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= diff --git a/pkg/merger/BUILD.bazel b/pkg/merger/BUILD.bazel index 33b74e075..3979f0d7d 100644 --- a/pkg/merger/BUILD.bazel +++ b/pkg/merger/BUILD.bazel @@ -13,7 +13,7 @@ go_library( "@com_github_golang_protobuf//proto:go_default_library", "@com_github_sirupsen_logrus//:go_default_library", "@com_google_cloud_go_storage//:go_default_library", - "@in_gopkg_yaml_v2//:go_default_library", + "@io_k8s_sigs_yaml//goyaml.v2:go_default_library", ], ) diff --git a/pkg/merger/merger.go b/pkg/merger/merger.go index 2e99627e6..0fabebb56 100644 --- a/pkg/merger/merger.go +++ b/pkg/merger/merger.go @@ -26,7 +26,7 @@ import ( "cloud.google.com/go/storage" "github.com/golang/protobuf/proto" "github.com/sirupsen/logrus" - "gopkg.in/yaml.v2" + yaml "sigs.k8s.io/yaml/goyaml.v2" "github.com/GoogleCloudPlatform/testgrid/config" configpb "github.com/GoogleCloudPlatform/testgrid/pb/config" diff --git a/repos.bzl b/repos.bzl index 30f48b2d3..f4a0963d5 100644 --- a/repos.bzl +++ b/repos.bzl @@ -2501,8 +2501,8 @@ def go_repositories(): build_file_generation = "on", build_file_proto_mode = "disable", importpath = "sigs.k8s.io/yaml", - sum = "h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=", - version = "v1.3.0", + sum = "h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=", + version = "v1.4.0", ) go_repository( name = "io_k8s_utils",