Skip to content

Commit 42ed2b2

Browse files
Juneezeeci-robot
authored andcommitted
Replace github.com/ghodss/yaml with sigs.k8s.io/yaml (openshift#308)
At the time of making this commit, the package `github.com/ghodss/yaml` is no longer actively maintained. `sigs.k8s.io/yaml` is a permanent fork of `ghodss/yaml` and is actively maintained by Kubernetes SIG. Signed-off-by: Eng Zer Jun <[email protected]> Upstream-repository: api Upstream-commit: 5efe1a23d8c21e51c6a63a472a0d5320342187ec
1 parent e248469 commit 42ed2b2

File tree

6 files changed

+7
-8
lines changed

6 files changed

+7
-8
lines changed

staging/api/go.mod

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ go 1.19
44

55
require (
66
github.com/blang/semver/v4 v4.0.0
7-
github.com/ghodss/yaml v1.0.0
87
github.com/go-bindata/go-bindata/v3 v3.1.3
98
github.com/google/cel-go v0.15.3
109
github.com/sirupsen/logrus v1.9.2
@@ -16,6 +15,7 @@ require (
1615
k8s.io/apimachinery v0.27.7
1716
k8s.io/client-go v0.27.7
1817
sigs.k8s.io/controller-runtime v0.15.0
18+
sigs.k8s.io/yaml v1.3.0
1919
)
2020

2121
require (
@@ -91,5 +91,4 @@ require (
9191
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
9292
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
9393
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
94-
sigs.k8s.io/yaml v1.3.0 // indirect
9594
)

staging/api/go.sum

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.
7878
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
7979
github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk=
8080
github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
81-
github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
8281
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
8382
github.com/go-bindata/go-bindata/v3 v3.1.3 h1:F0nVttLC3ws0ojc7p60veTurcOm//D4QBODNM7EGrCI=
8483
github.com/go-bindata/go-bindata/v3 v3.1.3/go.mod h1:1/zrpXsLD8YDIbhZRqXzm1Ghc7NhEvIN9+Z6R5/xH4I=

staging/api/pkg/validation/internal/crd_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
1010
"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
1111

12-
"github.com/ghodss/yaml"
12+
"sigs.k8s.io/yaml"
1313
)
1414

1515
func TestValidateCRD(t *testing.T) {

staging/api/pkg/validation/internal/csv_test.go

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

99
operatorsv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
1010

11-
"github.com/ghodss/yaml"
1211
"github.com/operator-framework/api/pkg/validation/errors"
1312
"k8s.io/apimachinery/pkg/runtime/schema"
13+
"sigs.k8s.io/yaml"
1414
)
1515

1616
func TestValidateCSV(t *testing.T) {

staging/api/pkg/validation/internal/object_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package internal
22

33
import (
4-
"github.com/ghodss/yaml"
54
"io/ioutil"
6-
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
75
"testing"
6+
7+
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
8+
"sigs.k8s.io/yaml"
89
)
910

1011
func TestValidateObject(t *testing.T) {

staging/api/pkg/validation/internal/operatorgroup_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"path/filepath"
66
"testing"
77

8-
"github.com/ghodss/yaml"
98
operatorsv1 "github.com/operator-framework/api/pkg/operators/v1"
109
"github.com/operator-framework/api/pkg/validation/errors"
10+
"sigs.k8s.io/yaml"
1111
)
1212

1313
func TestValidateOperatorGroup(t *testing.T) {

0 commit comments

Comments
 (0)