Skip to content

Commit 9ea1495

Browse files
authored
Merge pull request #2656 from mrueg/port-away-gopkg.yamlv3
chore: Port away from gopkg.in/yaml.v3
2 parents 090535f + 3b21633 commit 9ea1495

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ require (
1919
github.com/spf13/cobra v1.9.1
2020
github.com/spf13/viper v1.20.1
2121
github.com/stretchr/testify v1.10.0
22-
gopkg.in/yaml.v3 v3.0.1
2322
k8s.io/api v0.32.3
2423
k8s.io/apimachinery v0.32.3
2524
k8s.io/client-go v0.32.3
2625
k8s.io/component-base v0.32.3
2726
k8s.io/klog/v2 v2.130.1
2827
k8s.io/sample-controller v0.32.3
2928
k8s.io/utils v0.0.0-20241104163129-6fe5fd82f078
29+
sigs.k8s.io/yaml v1.4.0
3030
)
3131

3232
require (
@@ -236,11 +236,11 @@ require (
236236
gopkg.in/inf.v0 v0.9.1 // indirect
237237
gopkg.in/warnings.v0 v0.1.2 // indirect
238238
gopkg.in/yaml.v2 v2.4.0 // indirect
239+
gopkg.in/yaml.v3 v3.0.1 // indirect
239240
inet.af/netaddr v0.0.0-20230525184311-b8eac61e914a // indirect
240241
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
241242
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
242243
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
243-
sigs.k8s.io/yaml v1.4.0 // indirect
244244
)
245245

246246
tool (

internal/wrapper.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import (
2525

2626
"github.com/fsnotify/fsnotify"
2727
"github.com/spf13/viper"
28-
"gopkg.in/yaml.v3"
2928
"k8s.io/klog/v2"
29+
yaml "sigs.k8s.io/yaml/goyaml.v3"
3030

3131
"k8s.io/kube-state-metrics/v2/pkg/app"
3232
"k8s.io/kube-state-metrics/v2/pkg/options"

pkg/app/server.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ import (
3333

3434
"github.com/go-logr/logr"
3535

36-
"gopkg.in/yaml.v3"
3736
"k8s.io/client-go/kubernetes"
3837
_ "k8s.io/client-go/plugin/pkg/client/auth" // Initialize common client auth plugins.
3938
"k8s.io/client-go/tools/clientcmd"
4039
"k8s.io/klog/v2"
40+
yaml "sigs.k8s.io/yaml/goyaml.v3"
4141

4242
"github.com/KimMachineGun/automemlimit/memlimit"
4343
"github.com/oklog/run"

pkg/customresourcestate/config_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222
"testing"
2323

2424
"github.com/stretchr/testify/assert"
25-
"gopkg.in/yaml.v3"
2625
"k8s.io/klog/v2"
26+
yaml "sigs.k8s.io/yaml/goyaml.v3"
2727
)
2828

2929
//go:embed example_config.yaml

0 commit comments

Comments
 (0)