Skip to content

Commit 78107d4

Browse files
committed
Remove dependency on sqlite from pkg/configmap.
The package github.com/mattn/go-sqlite3 needs CGO enabled to build. Since pkg/configmap has both direct and transitive dependencies on go-sqlite3, anything importing pkg/configmap will also need to enable CGO.
1 parent 5081783 commit 78107d4

File tree

3 files changed

+1
-5
lines changed

3 files changed

+1
-5
lines changed

go.sum

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -514,8 +514,6 @@ github.com/openshift/api v3.9.1-0.20190924102528-32369d4db2ad+incompatible/go.mo
514514
github.com/openshift/client-go v0.0.0-20190923180330-3b6373338c9b/go.mod h1:6rzn+JTr7+WYS2E1TExP4gByoABxMznR6y2SnUIkmxk=
515515
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
516516
github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
517-
github.com/operator-framework/api v0.0.0-20191127212340-9066a6e95573 h1:bMO43IWWPM3HCGIiuM/GyXjtSJWsrhOlzUpZMesVUw0=
518-
github.com/operator-framework/api v0.0.0-20191127212340-9066a6e95573/go.mod h1:S5IdlJvmKkF84K2tBvsrqJbI2FVy03P88R75snpRxJo=
519517
github.com/operator-framework/api v0.0.0-20200120235816-80fd2f1a09c9 h1:HfxMEPJ0djo/RNfrmli3kI2oKS6IeuIZWu1Q5Rewt/o=
520518
github.com/operator-framework/api v0.0.0-20200120235816-80fd2f1a09c9/go.mod h1:S5IdlJvmKkF84K2tBvsrqJbI2FVy03P88R75snpRxJo=
521519
github.com/operator-framework/operator-lifecycle-manager v0.0.0-20191115003340-16619cd27fa5 h1:rjaihxY50c5C+kbQIK4s36R8zxByATYrgRbua4eiG6o=

pkg/configmap/configmap.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010

1111
"github.com/operator-framework/operator-registry/pkg/api"
1212
"github.com/operator-framework/operator-registry/pkg/registry"
13-
"github.com/operator-framework/operator-registry/pkg/sqlite"
1413
)
1514

1615
func NewBundleLoader() *BundleLoader {
@@ -72,7 +71,7 @@ func loadBundle(entry *logrus.Entry, data map[string]string) (bundle *api.Bundle
7271
continue
7372
}
7473

75-
if resource.GetKind() == sqlite.ClusterServiceVersionKind {
74+
if resource.GetKind() == "ClusterServiceVersion" {
7675
csvBytes, err := resource.MarshalJSON()
7776
if err != nil {
7877
return nil, nil, err

pkg/configmap/configmap_writer.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"regexp"
99

1010
"github.com/ghodss/yaml"
11-
_ "github.com/mattn/go-sqlite3"
1211
errorwrap "github.com/pkg/errors"
1312
"github.com/sirupsen/logrus"
1413
batchv1 "k8s.io/api/batch/v1"

0 commit comments

Comments
 (0)