Skip to content

Commit 7fb9abc

Browse files
author
Mikalai Radchuk
committed
Replace solver with simple catalog filtering
Signed-off-by: Mikalai Radchuk <[email protected]>
1 parent 7708c5e commit 7fb9abc

File tree

8 files changed

+161
-469
lines changed

8 files changed

+161
-469
lines changed

‎cmd/manager/main.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ import (
3535
"sigs.k8s.io/controller-runtime/pkg/metrics/server"
3636

3737
catalogd "github.com/operator-framework/catalogd/api/core/v1alpha1"
38-
"github.com/operator-framework/deppy/pkg/deppy/solver"
3938
rukpakv1alpha2 "github.com/operator-framework/rukpak/api/v1alpha2"
4039

4140
ocv1alpha1 "github.com/operator-framework/operator-controller/api/v1alpha1"
@@ -111,17 +110,10 @@ func main() {
111110
cl := mgr.GetClient()
112111
catalogClient := catalogclient.New(cl, cache.NewFilesystemCache(cachePath, &http.Client{Timeout: 10 * time.Second}))
113112

114-
resolver, err := solver.New()
115-
if err != nil {
116-
setupLog.Error(err, "unable to create a solver")
117-
os.Exit(1)
118-
}
119-
120113
if err = (&controllers.ClusterExtensionReconciler{
121114
Client: cl,
122115
BundleProvider: catalogClient,
123116
Scheme: mgr.GetScheme(),
124-
Resolver: resolver,
125117
}).SetupWithManager(mgr); err != nil {
126118
setupLog.Error(err, "unable to create controller", "controller", "ClusterExtension")
127119
os.Exit(1)

‎go.mod

Lines changed: 0 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -28,133 +28,64 @@ require (
2828
)
2929

3030
require (
31-
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
32-
github.com/BurntSushi/toml v1.3.2 // indirect
33-
github.com/Microsoft/go-winio v0.6.1 // indirect
34-
github.com/Microsoft/hcsshim v0.12.0-rc.1 // indirect
35-
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
36-
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
3731
github.com/beorn7/perks v1.0.1 // indirect
38-
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
3932
github.com/cespare/xxhash/v2 v2.2.0 // indirect
40-
github.com/containerd/cgroups/v3 v3.0.2 // indirect
41-
github.com/containerd/containerd v1.7.12 // indirect
42-
github.com/containerd/continuity v0.4.2 // indirect
43-
github.com/containerd/log v0.1.0 // indirect
44-
github.com/containerd/ttrpc v1.2.2 // indirect
45-
github.com/containerd/typeurl/v2 v2.1.1 // indirect
46-
github.com/containers/common v0.57.1 // indirect
47-
github.com/containers/image/v5 v5.29.0 // indirect
48-
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
49-
github.com/containers/ocicrypt v1.1.9 // indirect
50-
github.com/containers/storage v1.51.0 // indirect
5133
github.com/davecgh/go-spew v1.1.1 // indirect
52-
github.com/distribution/reference v0.6.0 // indirect
53-
github.com/docker/cli v25.0.5+incompatible // indirect
54-
github.com/docker/distribution v2.8.3+incompatible // indirect
55-
github.com/docker/docker v25.0.5+incompatible // indirect
56-
github.com/docker/docker-credential-helpers v0.8.0 // indirect
57-
github.com/docker/go-connections v0.5.0 // indirect
58-
github.com/docker/go-units v0.5.0 // indirect
5934
github.com/emicklei/go-restful/v3 v3.11.2 // indirect
6035
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
6136
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
62-
github.com/felixge/httpsnoop v1.0.4 // indirect
6337
github.com/fsnotify/fsnotify v1.7.0 // indirect
6438
github.com/go-air/gini v1.0.4 // indirect
6539
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
6640
github.com/go-git/go-billy/v5 v5.5.0 // indirect
6741
github.com/go-git/go-git/v5 v5.11.0 // indirect
68-
github.com/go-logr/stdr v1.2.2 // indirect
6942
github.com/go-logr/zapr v1.3.0 // indirect
7043
github.com/go-openapi/jsonpointer v0.20.2 // indirect
7144
github.com/go-openapi/jsonreference v0.20.4 // indirect
7245
github.com/go-openapi/swag v0.22.9 // indirect
7346
github.com/gogo/protobuf v1.3.2 // indirect
74-
github.com/golang-migrate/migrate/v4 v4.17.0 // indirect
7547
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
7648
github.com/golang/protobuf v1.5.4 // indirect
77-
github.com/google/cel-go v0.17.7 // indirect
7849
github.com/google/gnostic-models v0.6.8 // indirect
7950
github.com/google/gofuzz v1.2.0 // indirect
8051
github.com/google/uuid v1.6.0 // indirect
81-
github.com/gorilla/mux v1.8.1 // indirect
82-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect
8352
github.com/h2non/filetype v1.1.3 // indirect
8453
github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c // indirect
85-
github.com/hashicorp/errwrap v1.1.0 // indirect
86-
github.com/hashicorp/go-multierror v1.1.1 // indirect
8754
github.com/imdario/mergo v0.3.16 // indirect
88-
github.com/inconshreveable/mousetrap v1.1.0 // indirect
8955
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
9056
github.com/joelanford/ignore v0.0.0-20210607151042-0d25dc18b62d // indirect
9157
github.com/josharian/intern v1.0.0 // indirect
9258
github.com/json-iterator/go v1.1.12 // indirect
93-
github.com/klauspost/compress v1.17.4 // indirect
94-
github.com/klauspost/pgzip v1.2.6 // indirect
9559
github.com/mailru/easyjson v0.7.7 // indirect
96-
github.com/mattn/go-sqlite3 v1.14.22 // indirect
97-
github.com/moby/locker v1.0.1 // indirect
98-
github.com/moby/sys/mountinfo v0.7.1 // indirect
99-
github.com/moby/sys/sequential v0.5.0 // indirect
10060
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
10161
github.com/modern-go/reflect2 v1.0.2 // indirect
10262
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
103-
github.com/onsi/gomega v1.32.0 // indirect
104-
github.com/opencontainers/go-digest v1.0.0 // indirect
105-
github.com/opencontainers/image-spec v1.1.0-rc6 // indirect
106-
github.com/opencontainers/runc v1.1.12 // indirect
107-
github.com/opencontainers/runtime-spec v1.1.0 // indirect
10863
github.com/operator-framework/api v0.23.0 // indirect
109-
github.com/otiai10/copy v1.14.0 // indirect
11064
github.com/pkg/errors v0.9.1 // indirect
11165
github.com/pmezard/go-difflib v1.0.0 // indirect
11266
github.com/prometheus/client_golang v1.18.0 // indirect
11367
github.com/prometheus/client_model v0.6.0 // indirect
11468
github.com/prometheus/common v0.47.0 // indirect
11569
github.com/prometheus/procfs v0.12.0 // indirect
11670
github.com/sirupsen/logrus v1.9.3 // indirect
117-
github.com/spf13/cobra v1.8.0 // indirect
118-
github.com/stoewer/go-strcase v1.3.0 // indirect
119-
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
120-
github.com/ulikunitz/xz v0.5.11 // indirect
121-
github.com/vbatts/tar-split v0.11.5 // indirect
12271
github.com/vmware-tanzu/carvel-vendir v0.36.0 // indirect
123-
go.etcd.io/bbolt v1.3.9 // indirect
124-
go.opencensus.io v0.24.0 // indirect
125-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.48.0 // indirect
126-
go.opentelemetry.io/otel v1.23.1 // indirect
127-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.23.1 // indirect
128-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.23.1 // indirect
129-
go.opentelemetry.io/otel/metric v1.23.1 // indirect
130-
go.opentelemetry.io/otel/sdk v1.23.1 // indirect
131-
go.opentelemetry.io/otel/trace v1.23.1 // indirect
132-
go.opentelemetry.io/proto/otlp v1.1.0 // indirect
13372
go.uber.org/multierr v1.11.0 // indirect
134-
golang.org/x/mod v0.16.0 // indirect
13573
golang.org/x/net v0.22.0 // indirect
13674
golang.org/x/oauth2 v0.17.0 // indirect
13775
golang.org/x/sync v0.6.0 // indirect
13876
golang.org/x/sys v0.18.0 // indirect
13977
golang.org/x/term v0.18.0 // indirect
14078
golang.org/x/text v0.14.0 // indirect
14179
golang.org/x/time v0.5.0 // indirect
142-
golang.org/x/tools v0.18.0 // indirect
14380
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
14481
google.golang.org/appengine v1.6.8 // indirect
145-
google.golang.org/genproto v0.0.0-20240221002015-b0ce06bbee7c // indirect
146-
google.golang.org/genproto/googleapis/api v0.0.0-20240213162025-012b6fc9bca9 // indirect
147-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240221002015-b0ce06bbee7c // indirect
148-
google.golang.org/grpc v1.61.1 // indirect
14982
google.golang.org/protobuf v1.33.0 // indirect
15083
gopkg.in/inf.v0 v0.9.1 // indirect
15184
gopkg.in/warnings.v0 v0.1.2 // indirect
15285
gopkg.in/yaml.v3 v3.0.1 // indirect
15386
k8s.io/apiextensions-apiserver v0.29.3 // indirect
154-
k8s.io/apiserver v0.29.3 // indirect
15587
k8s.io/klog/v2 v2.120.1 // indirect
15688
k8s.io/kube-openapi v0.0.0-20240221221325-2ac9dc51f3f1 // indirect
157-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
15889
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
15990
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
16091
sigs.k8s.io/yaml v1.4.0 // indirect

0 commit comments

Comments
 (0)