Skip to content

Commit 86239de

Browse files
Juneezeeopenshift-cherrypick-robot
authored andcommitted
Replace github.com/ghodss/yaml with sigs.k8s.io/yaml (#1171)
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. Reference: operator-framework/api#308 Signed-off-by: Eng Zer Jun <[email protected]> Upstream-repository: operator-registry Upstream-commit: 6df3abad48bb338b51986cc89877d89fc1b3e39d
1 parent 8d9fd04 commit 86239de

File tree

17 files changed

+10
-992
lines changed

17 files changed

+10
-992
lines changed

go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ require (
8585
github.com/felixge/httpsnoop v1.0.3 // indirect
8686
github.com/fsnotify/fsnotify v1.6.0 // indirect
8787
github.com/fvbommel/sortorder v1.0.1 // indirect
88-
github.com/ghodss/yaml v1.0.0 // indirect
8988
github.com/go-air/gini v1.0.4 // indirect
9089
github.com/go-errors/errors v1.4.2 // indirect
9190
github.com/go-git/gcfg v1.5.0 // indirect

staging/operator-registry/go.mod

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ require (
99
github.com/containers/image/v5 v5.28.0
1010
github.com/docker/cli v23.0.5+incompatible
1111
github.com/docker/distribution v2.8.2+incompatible
12-
github.com/ghodss/yaml v1.0.0
1312
github.com/golang-migrate/migrate/v4 v4.16.1
1413
github.com/golang/mock v1.6.0
1514
github.com/google/go-cmp v0.6.0
@@ -23,7 +22,7 @@ require (
2322
github.com/onsi/gomega v1.27.10
2423
github.com/opencontainers/go-digest v1.0.0
2524
github.com/opencontainers/image-spec v1.1.0-rc4
26-
github.com/operator-framework/api v0.19.0
25+
github.com/operator-framework/api v0.20.0
2726
github.com/otiai10/copy v1.2.0
2827
github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2
2928
github.com/pkg/errors v0.9.1

staging/operator-registry/go.sum

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,6 @@ github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYis
165165
github.com/garyburd/redigo v1.6.0 h1:0VruCpn7yAIIu7pWVClQC8wxCJEcG3nyzpMSHKi1PQc=
166166
github.com/garyburd/redigo v1.6.0/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY=
167167
github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
168-
github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
169168
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
170169
github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
171170
github.com/go-git/gcfg v1.5.0 h1:Q5ViNfGF8zFgyJWPqYwA7qGFoMTEiBmdlkcfRmpIMa4=
@@ -449,8 +448,8 @@ github.com/opencontainers/runc v1.1.9 h1:XR0VIHTGce5eWPkaPesqTBrhW2yAcaraWfsEalN
449448
github.com/opencontainers/runc v1.1.9/go.mod h1:CbUumNnWCuTGFukNXahoo/RFBZvDAgRh/smNYNOhA50=
450449
github.com/opencontainers/runtime-spec v1.1.0 h1:HHUyrt9mwHUjtasSbXSMvs4cyFxh+Bll4AjJ9odEGpg=
451450
github.com/opencontainers/runtime-spec v1.1.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
452-
github.com/operator-framework/api v0.19.0 h1:QU1CTJU+CufoeneA5rsNlP/uP96s8vDHWUYDFZTauzA=
453-
github.com/operator-framework/api v0.19.0/go.mod h1:SCCslqke6AVOJ5JM+NqNE1CHuAgJLScsL66pnPaSMXs=
451+
github.com/operator-framework/api v0.20.0 h1:A2YCRhr+6s0k3pRJacnwjh1Ue8BqjIGuQ2jvPg9XCB4=
452+
github.com/operator-framework/api v0.20.0/go.mod h1:rXPOhrQ6mMeXqCmpDgt1ALoar9ZlHL+Iy5qut9R99a4=
454453
github.com/otiai10/copy v1.2.0 h1:HvG945u96iNadPoG2/Ja2+AUJeW5YuFQMixq9yirC+k=
455454
github.com/otiai10/copy v1.2.0/go.mod h1:rrF5dJ5F0t/EWSYODDu4j9/vEeYHMkc8jt0zJChqQWw=
456455
github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE=

staging/operator-registry/pkg/configmap/configmap_writer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ import (
66
"os"
77
"regexp"
88

9-
"github.com/ghodss/yaml"
109
"github.com/sirupsen/logrus"
1110
batchv1 "k8s.io/api/batch/v1"
1211
corev1 "k8s.io/api/core/v1"
1312
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1413
"k8s.io/client-go/kubernetes"
14+
"sigs.k8s.io/yaml"
1515

1616
"github.com/operator-framework/operator-registry/pkg/client"
1717
"github.com/operator-framework/operator-registry/pkg/lib/bundle"

staging/operator-registry/pkg/lib/bundle/validate.go

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

11-
y "github.com/ghodss/yaml"
1211
log "github.com/sirupsen/logrus"
1312
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
1413
apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
@@ -18,6 +17,7 @@ import (
1817
"k8s.io/apimachinery/pkg/runtime"
1918
"k8s.io/apimachinery/pkg/util/validation/field"
2019
k8syaml "k8s.io/apimachinery/pkg/util/yaml"
20+
y "sigs.k8s.io/yaml"
2121

2222
"github.com/operator-framework/api/pkg/manifests"
2323
v1 "github.com/operator-framework/api/pkg/operators/v1alpha1"

staging/operator-registry/pkg/lib/indexer/indexer_test.go

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

9-
"github.com/ghodss/yaml"
9+
"sigs.k8s.io/yaml"
1010

1111
pregistry "github.com/operator-framework/operator-registry/pkg/registry"
1212
"github.com/operator-framework/operator-registry/pkg/sqlite"

staging/operator-registry/pkg/sqlite/configmap.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ import (
55
"fmt"
66
"strings"
77

8-
"github.com/ghodss/yaml"
98
"github.com/sirupsen/logrus"
109
v1 "k8s.io/api/core/v1"
1110
"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
1211
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
1312
"k8s.io/apimachinery/pkg/runtime"
1413
utilerrors "k8s.io/apimachinery/pkg/util/errors"
14+
"sigs.k8s.io/yaml"
1515

1616
"github.com/operator-framework/operator-registry/pkg/registry"
1717
)

vendor/github.com/ghodss/yaml/.gitignore

Lines changed: 0 additions & 20 deletions
This file was deleted.

vendor/github.com/ghodss/yaml/.travis.yml

Lines changed: 0 additions & 7 deletions
This file was deleted.

vendor/github.com/ghodss/yaml/LICENSE

Lines changed: 0 additions & 50 deletions
This file was deleted.

vendor/github.com/ghodss/yaml/README.md

Lines changed: 0 additions & 121 deletions
This file was deleted.

0 commit comments

Comments
 (0)