From 14316c044aa0dc8b698a87cbb65772c3ea86231f Mon Sep 17 00:00:00 2001 From: Peter Date: Tue, 5 May 2026 14:44:51 +0000 Subject: [PATCH 1/2] fix: use single yaml package --- config/config.go | 2 +- go.mod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/config.go b/config/config.go index ea84970a..23a551ae 100644 --- a/config/config.go +++ b/config/config.go @@ -11,7 +11,7 @@ import ( "time" "github.com/sethvargo/go-envconfig" - "gopkg.in/yaml.v3" + "go.yaml.in/yaml/v3" ) // MaxInt32 defines the maximum value of allowed integers and serves to help us avoid overflow/wraparound issues. diff --git a/go.mod b/go.mod index fa14b2d4..b5145331 100644 --- a/go.mod +++ b/go.mod @@ -27,7 +27,6 @@ require ( go.yaml.in/yaml/v3 v3.0.4 golang.org/x/sync v0.20.0 google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af - gopkg.in/yaml.v3 v3.0.1 k8s.io/apimachinery v0.36.0 k8s.io/client-go v0.36.0 ) @@ -170,6 +169,7 @@ require ( google.golang.org/grpc v1.80.0 // indirect gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect howett.net/plist v0.0.0-20181124034731-591f970eefbb // indirect k8s.io/api v0.36.0 // indirect k8s.io/klog/v2 v2.140.0 // indirect From fbf8e319062795d87443917c1331181b76d5a3c6 Mon Sep 17 00:00:00 2001 From: Sergei Zyubin Date: Tue, 5 May 2026 18:04:50 +0200 Subject: [PATCH 2/2] fix: merge conflict cleanup --- go.mod | 1 - 1 file changed, 1 deletion(-) diff --git a/go.mod b/go.mod index c065560a..2a43e009 100644 --- a/go.mod +++ b/go.mod @@ -26,7 +26,6 @@ require ( github.com/xo/dburl v0.24.2 go.yaml.in/yaml/v3 v3.0.4 golang.org/x/sync v0.20.0 - google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af k8s.io/apimachinery v0.36.0 k8s.io/client-go v0.36.0 )