From 7ebc4eacd5568b8f52855b66807d049d20a1f8a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20R=C3=BCger?= Date: Thu, 24 Apr 2025 21:56:08 +0200 Subject: [PATCH] chore: Port to sigs.k8s.io/yaml --- cmd/krel/cmd/release_notes.go | 2 +- go.mod | 2 +- pkg/cve/impl.go | 2 +- pkg/notes/notes.go | 2 +- pkg/notes/notes_map.go | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/krel/cmd/release_notes.go b/cmd/krel/cmd/release_notes.go index 7ec3dbfa0d7..5d5542e9788 100644 --- a/cmd/krel/cmd/release_notes.go +++ b/cmd/krel/cmd/release_notes.go @@ -34,13 +34,13 @@ import ( gogit "github.com/go-git/go-git/v5" "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "gopkg.in/yaml.v2" "sigs.k8s.io/release-sdk/git" "sigs.k8s.io/release-sdk/github" "sigs.k8s.io/release-utils/command" "sigs.k8s.io/release-utils/editor" "sigs.k8s.io/release-utils/util" + "sigs.k8s.io/yaml" "k8s.io/release/pkg/notes" "k8s.io/release/pkg/notes/document" diff --git a/go.mod b/go.mod index 8dd00bf5803..bb9f39f066b 100644 --- a/go.mod +++ b/go.mod @@ -38,7 +38,6 @@ require ( golang.org/x/oauth2 v0.29.0 golang.org/x/text v0.24.0 google.golang.org/api v0.221.0 - gopkg.in/yaml.v2 v2.4.0 k8s.io/apimachinery v0.32.3 k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 sigs.k8s.io/bom v0.6.0 @@ -311,6 +310,7 @@ require ( gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/api v0.28.4 // indirect k8s.io/client-go v0.28.4 // indirect diff --git a/pkg/cve/impl.go b/pkg/cve/impl.go index 84ac343cedd..bd647de94b4 100644 --- a/pkg/cve/impl.go +++ b/pkg/cve/impl.go @@ -27,9 +27,9 @@ import ( "cloud.google.com/go/storage" "github.com/sirupsen/logrus" - "gopkg.in/yaml.v2" "sigs.k8s.io/release-sdk/object" + "sigs.k8s.io/yaml" "k8s.io/release/pkg/notes" ) diff --git a/pkg/notes/notes.go b/pkg/notes/notes.go index 2502d821ca2..cf22e53ca5f 100644 --- a/pkg/notes/notes.go +++ b/pkg/notes/notes.go @@ -41,9 +41,9 @@ import ( "github.com/sirupsen/logrus" "golang.org/x/text/cases" "golang.org/x/text/language" - "gopkg.in/yaml.v2" "sigs.k8s.io/release-sdk/github" + "sigs.k8s.io/yaml" "k8s.io/release/pkg/notes/options" ) diff --git a/pkg/notes/notes_map.go b/pkg/notes/notes_map.go index 109f3d511a1..9ee31708908 100644 --- a/pkg/notes/notes_map.go +++ b/pkg/notes/notes_map.go @@ -24,9 +24,9 @@ import ( "path/filepath" "github.com/sirupsen/logrus" - "gopkg.in/yaml.v2" "sigs.k8s.io/release-sdk/object" + yaml "sigs.k8s.io/yaml/goyaml.v2" ) // MapProvider interface that obtains release notes maps from a source.