diff --git a/go.mod b/go.mod index 736d7979d..71c0c24ee 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,6 @@ require ( github.com/containers/image/v5 v5.28.0 github.com/docker/cli v23.0.5+incompatible github.com/docker/distribution v2.8.2+incompatible - github.com/ghodss/yaml v1.0.0 github.com/golang-migrate/migrate/v4 v4.16.1 github.com/golang/mock v1.6.0 github.com/google/go-cmp v0.6.0 @@ -23,7 +22,7 @@ require ( github.com/onsi/gomega v1.27.10 github.com/opencontainers/go-digest v1.0.0 github.com/opencontainers/image-spec v1.1.0-rc4 - github.com/operator-framework/api v0.19.0 + github.com/operator-framework/api v0.20.0 github.com/otiai10/copy v1.2.0 github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2 github.com/pkg/errors v0.9.1 diff --git a/go.sum b/go.sum index 558b869ef..fce3193ae 100644 --- a/go.sum +++ b/go.sum @@ -165,7 +165,6 @@ github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYis github.com/garyburd/redigo v1.6.0 h1:0VruCpn7yAIIu7pWVClQC8wxCJEcG3nyzpMSHKi1PQc= github.com/garyburd/redigo v1.6.0/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY= github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= github.com/go-git/gcfg v1.5.0 h1:Q5ViNfGF8zFgyJWPqYwA7qGFoMTEiBmdlkcfRmpIMa4= @@ -449,8 +448,8 @@ github.com/opencontainers/runc v1.1.9 h1:XR0VIHTGce5eWPkaPesqTBrhW2yAcaraWfsEalN github.com/opencontainers/runc v1.1.9/go.mod h1:CbUumNnWCuTGFukNXahoo/RFBZvDAgRh/smNYNOhA50= github.com/opencontainers/runtime-spec v1.1.0 h1:HHUyrt9mwHUjtasSbXSMvs4cyFxh+Bll4AjJ9odEGpg= github.com/opencontainers/runtime-spec v1.1.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -github.com/operator-framework/api v0.19.0 h1:QU1CTJU+CufoeneA5rsNlP/uP96s8vDHWUYDFZTauzA= -github.com/operator-framework/api v0.19.0/go.mod h1:SCCslqke6AVOJ5JM+NqNE1CHuAgJLScsL66pnPaSMXs= +github.com/operator-framework/api v0.20.0 h1:A2YCRhr+6s0k3pRJacnwjh1Ue8BqjIGuQ2jvPg9XCB4= +github.com/operator-framework/api v0.20.0/go.mod h1:rXPOhrQ6mMeXqCmpDgt1ALoar9ZlHL+Iy5qut9R99a4= github.com/otiai10/copy v1.2.0 h1:HvG945u96iNadPoG2/Ja2+AUJeW5YuFQMixq9yirC+k= github.com/otiai10/copy v1.2.0/go.mod h1:rrF5dJ5F0t/EWSYODDu4j9/vEeYHMkc8jt0zJChqQWw= github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE= diff --git a/pkg/configmap/configmap_writer.go b/pkg/configmap/configmap_writer.go index 580aeaeb0..dd8931cc9 100644 --- a/pkg/configmap/configmap_writer.go +++ b/pkg/configmap/configmap_writer.go @@ -6,12 +6,12 @@ import ( "os" "regexp" - "github.com/ghodss/yaml" "github.com/sirupsen/logrus" batchv1 "k8s.io/api/batch/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" + "sigs.k8s.io/yaml" "github.com/operator-framework/operator-registry/pkg/client" "github.com/operator-framework/operator-registry/pkg/lib/bundle" diff --git a/pkg/lib/bundle/validate.go b/pkg/lib/bundle/validate.go index a11025c28..66e29dffc 100644 --- a/pkg/lib/bundle/validate.go +++ b/pkg/lib/bundle/validate.go @@ -8,7 +8,6 @@ import ( "path/filepath" "strings" - y "github.com/ghodss/yaml" log "github.com/sirupsen/logrus" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" @@ -18,6 +17,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" k8syaml "k8s.io/apimachinery/pkg/util/yaml" + y "sigs.k8s.io/yaml" "github.com/operator-framework/api/pkg/manifests" v1 "github.com/operator-framework/api/pkg/operators/v1alpha1" diff --git a/pkg/lib/indexer/indexer_test.go b/pkg/lib/indexer/indexer_test.go index 9ced69e37..f2fce1d32 100644 --- a/pkg/lib/indexer/indexer_test.go +++ b/pkg/lib/indexer/indexer_test.go @@ -6,7 +6,7 @@ import ( "sort" "testing" - "github.com/ghodss/yaml" + "sigs.k8s.io/yaml" pregistry "github.com/operator-framework/operator-registry/pkg/registry" "github.com/operator-framework/operator-registry/pkg/sqlite" diff --git a/pkg/sqlite/configmap.go b/pkg/sqlite/configmap.go index 0f727e1d4..44e2302cc 100644 --- a/pkg/sqlite/configmap.go +++ b/pkg/sqlite/configmap.go @@ -5,13 +5,13 @@ import ( "fmt" "strings" - "github.com/ghodss/yaml" "github.com/sirupsen/logrus" v1 "k8s.io/api/core/v1" "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" utilerrors "k8s.io/apimachinery/pkg/util/errors" + "sigs.k8s.io/yaml" "github.com/operator-framework/operator-registry/pkg/registry" )