Skip to content

Commit 2ae9d05

Browse files
committed
chore: upgrade gopkg.in/yaml from v2 to v3
Signed-off-by: Chiman Jain <chimanjain15@gmail.com>
1 parent 48f73d6 commit 2ae9d05

7 files changed

Lines changed: 14 additions & 11 deletions

File tree

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ require (
4343
google.golang.org/grpc v1.81.1
4444
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.2
4545
google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af
46-
gopkg.in/yaml.v2 v2.4.0
46+
gopkg.in/yaml.v3 v3.0.1
4747
k8s.io/api v0.36.2
4848
k8s.io/apiextensions-apiserver v0.36.2
4949
k8s.io/apimachinery v0.36.2
@@ -214,7 +214,7 @@ require (
214214
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
215215
gopkg.in/inf.v0 v0.9.1 // indirect
216216
gopkg.in/warnings.v0 v0.1.2 // indirect
217-
gopkg.in/yaml.v3 v3.0.1 // indirect
217+
gopkg.in/yaml.v2 v2.4.0 // indirect
218218
k8s.io/apiserver v0.36.2 // indirect
219219
k8s.io/cli-runtime v0.36.1 // indirect
220220
k8s.io/component-base v0.36.2 // indirect

pkg/lib/bundle/chartutil.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"path/filepath"
2424

2525
"github.com/pkg/errors"
26-
"gopkg.in/yaml.v2"
26+
"gopkg.in/yaml.v3"
2727
)
2828

2929
// Maintainer describes a Chart maintainer.

pkg/lib/bundle/generate.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"strings"
99

1010
log "github.com/sirupsen/logrus"
11-
"gopkg.in/yaml.v2"
11+
"gopkg.in/yaml.v3"
1212
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
1313
utilerrors "k8s.io/apimachinery/pkg/util/errors"
1414
k8syaml "k8s.io/apimachinery/pkg/util/yaml"

pkg/lib/bundle/generate_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"testing"
88

99
"github.com/stretchr/testify/require"
10-
"gopkg.in/yaml.v2"
10+
"gopkg.in/yaml.v3"
1111
)
1212

1313
func TestGetMediaType(t *testing.T) {

pkg/lib/bundle/utils_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"os"
55
"path/filepath"
66

7-
"gopkg.in/yaml.v2"
7+
"gopkg.in/yaml.v3"
88
)
99

1010
const (

pkg/lib/indexer/indexer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"sync"
1414

1515
"github.com/sirupsen/logrus"
16-
"gopkg.in/yaml.v2"
16+
"gopkg.in/yaml.v3"
1717
utilerrors "k8s.io/apimachinery/pkg/util/errors"
1818

1919
"github.com/operator-framework/operator-registry/pkg/containertools"

pkg/sqlite/directory_test.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"github.com/otiai10/copy"
1010
"github.com/sirupsen/logrus"
1111
"github.com/stretchr/testify/require"
12-
"gopkg.in/yaml.v2"
12+
"gopkg.in/yaml.v3"
1313

1414
"github.com/operator-framework/operator-registry/pkg/api"
1515
"github.com/operator-framework/operator-registry/pkg/registry"
@@ -206,13 +206,16 @@ func TestQuerierForDirectory(t *testing.T) {
206206
{"etcd", "stable", "etcdoperator.v0.6.1", ""},
207207
{"etcd", "stable", "etcdoperator.v0.9.0", "etcdoperator.v0.6.1"},
208208
{"etcd", "stable", "etcdoperator.v0.9.2", "etcdoperator.v0.9.1"},
209-
{"etcd", "stable", "etcdoperator.v0.9.2", "etcdoperator.v0.9.0"}}, etcdChannelEntriesThatProvide)
209+
{"etcd", "stable", "etcdoperator.v0.9.2", "etcdoperator.v0.9.0"},
210+
}, etcdChannelEntriesThatProvide)
210211

211212
etcdLatestChannelEntriesThatProvide, err := store.GetLatestChannelEntriesThatProvide(context.TODO(), "etcd.database.coreos.com", "v1beta2", "EtcdCluster")
212213
require.NoError(t, err)
213-
require.ElementsMatch(t, []*registry.ChannelEntry{{"etcd", "alpha", "etcdoperator.v0.9.2", "etcdoperator.v0.9.0"},
214+
require.ElementsMatch(t, []*registry.ChannelEntry{
215+
{"etcd", "alpha", "etcdoperator.v0.9.2", "etcdoperator.v0.9.0"},
214216
{"etcd", "beta", "etcdoperator.v0.9.0", "etcdoperator.v0.6.1"},
215-
{"etcd", "stable", "etcdoperator.v0.9.2", "etcdoperator.v0.9.0"}}, etcdLatestChannelEntriesThatProvide)
217+
{"etcd", "stable", "etcdoperator.v0.9.2", "etcdoperator.v0.9.0"},
218+
}, etcdLatestChannelEntriesThatProvide)
216219

217220
etcdBundleByProvides, err := store.GetBundleThatProvides(context.TODO(), "etcd.database.coreos.com", "v1beta2", "EtcdCluster")
218221
require.NoError(t, err)

0 commit comments

Comments
 (0)