From 420aa0092b35ce513f5a115500425ecbec0b8946 Mon Sep 17 00:00:00 2001 From: "red-hat-konflux-kflux-prd-rh03[bot]" <206760901+red-hat-konflux-kflux-prd-rh03[bot]@users.noreply.github.com> Date: Tue, 29 Sep 2026 04:44:08 +0000 Subject: [PATCH] fix(deps): update module gopkg.in/yaml.v2 to v3 Signed-off-by: red-hat-konflux-kflux-prd-rh03 <206760901+red-hat-konflux-kflux-prd-rh03[bot]@users.noreply.github.com> Signed-off-by: red-hat-konflux-kflux-prd-rh03 <206760901+red-hat-konflux-kflux-prd-rh03[bot]@users.noreply.github.com> --- api/go.mod | 2 +- config/config.go | 2 +- go.mod | 4 ++-- pkg/utils/utils.go | 2 +- test/integration/federated_access_cr_test.go | 3 +-- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/api/go.mod b/api/go.mod index ac0349041..613d08fa1 100644 --- a/api/go.mod +++ b/api/go.mod @@ -38,7 +38,7 @@ require ( golang.org/x/net v0.38.0 // indirect golang.org/x/text v0.23.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect - gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/klog/v2 v2.60.1 // indirect k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect diff --git a/config/config.go b/config/config.go index 8efae9749..41e719165 100644 --- a/config/config.go +++ b/config/config.go @@ -24,7 +24,7 @@ import ( awsv1alpha1 "github.com/openshift/aws-account-operator/api/v1alpha1" "github.com/openshift/aws-account-operator/pkg/utils" "github.com/openshift/aws-account-operator/test/fixtures" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" corev1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/go.mod b/go.mod index 634bf770a..f0dd27db3 100644 --- a/go.mod +++ b/go.mod @@ -30,7 +30,7 @@ require ( github.com/rkt/rkt v1.30.0 github.com/stretchr/testify v1.8.4 go.uber.org/mock v0.4.0 - gopkg.in/yaml.v2 v2.4.0 + gopkg.in/yaml.v3 v3.0.1 k8s.io/api v0.26.1 k8s.io/apimachinery v0.26.1 k8s.io/client-go v0.26.1 @@ -107,7 +107,7 @@ require ( google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect k8s.io/apiextensions-apiserver v0.26.1 // indirect k8s.io/component-base v0.26.1 // indirect k8s.io/klog/v2 v2.80.1 // indirect diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go index a93218076..6f1e950ea 100644 --- a/pkg/utils/utils.go +++ b/pkg/utils/utils.go @@ -12,7 +12,7 @@ import ( "time" "github.com/aws/smithy-go" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/reconcile" diff --git a/test/integration/federated_access_cr_test.go b/test/integration/federated_access_cr_test.go index 0e1ed6693..64d9d3915 100644 --- a/test/integration/federated_access_cr_test.go +++ b/test/integration/federated_access_cr_test.go @@ -8,7 +8,7 @@ import ( "os/exec" "testing" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/config" @@ -149,7 +149,6 @@ func testAction(t *testing.T, iamClient *iam.Client, roleARN string, stmt statem } } - // Unmarshals YAML from File func unmarshalFromFile(t *testing.T, cr string, crToTest *crStruct) { file := "../../" + cr