Skip to content

Commit 3df32d1

Browse files
authored
Use package channel entries to lookup version (#76)
A listing of all channel entries was added in a recent version of the packagemanifests API. If the length of the list is 0, that means we're on an older version of the API, so we'll fall back to the previous behavior of just guessing a CSV name. With the updated packagemanifests API, we can iterate the list of entries and find the startingCSV, and error out if the specified version is not found. Signed-off-by: Joe Lanford <[email protected]> Signed-off-by: Joe Lanford <[email protected]>
1 parent 4cf579f commit 3df32d1

File tree

3 files changed

+431
-227
lines changed

3 files changed

+431
-227
lines changed

go.mod

Lines changed: 30 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ module github.com/operator-framework/kubectl-operator
33
go 1.19
44

55
require (
6-
github.com/containerd/containerd v1.4.3
6+
github.com/containerd/containerd v1.6.10
77
github.com/onsi/ginkgo v1.16.5
88
github.com/onsi/gomega v1.20.1
9-
github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6
10-
github.com/operator-framework/api v0.7.1
11-
github.com/operator-framework/operator-lifecycle-manager v0.0.0-20200521062108-408ca95d458f
12-
github.com/operator-framework/operator-registry v1.12.5
9+
github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799
10+
github.com/operator-framework/api v0.17.3
11+
github.com/operator-framework/operator-lifecycle-manager v0.23.1
12+
github.com/operator-framework/operator-registry v1.17.5
1313
github.com/sirupsen/logrus v1.8.1
1414
github.com/spf13/cobra v1.4.0
1515
github.com/spf13/pflag v1.0.5
@@ -22,23 +22,23 @@ require (
2222
)
2323

2424
require (
25-
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
26-
github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5 // indirect
27-
github.com/Microsoft/hcsshim v0.8.7 // indirect
25+
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
26+
github.com/Microsoft/go-winio v0.5.2 // indirect
27+
github.com/Microsoft/hcsshim v0.9.5 // indirect
2828
github.com/PuerkitoBio/purell v1.1.1 // indirect
2929
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
3030
github.com/beorn7/perks v1.0.1 // indirect
3131
github.com/blang/semver v3.5.1+incompatible // indirect
3232
github.com/blang/semver/v4 v4.0.0 // indirect
3333
github.com/cespare/xxhash/v2 v2.1.2 // indirect
34-
github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f // indirect
35-
github.com/containerd/continuity v0.0.0-20200228182428-0f16d7a0959c // indirect
36-
github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de // indirect
34+
github.com/containerd/cgroups v1.0.3 // indirect
35+
github.com/containerd/continuity v0.3.0 // indirect
36+
github.com/containerd/ttrpc v1.1.0 // indirect
3737
github.com/davecgh/go-spew v1.1.1 // indirect
38-
github.com/docker/cli v0.0.0-20200130152716-5d0cf8839492 // indirect
39-
github.com/docker/distribution v2.7.1+incompatible // indirect
40-
github.com/docker/docker v1.4.2-0.20200203170920-46ec8731fbce // indirect
41-
github.com/docker/docker-credential-helpers v0.6.3 // indirect
38+
github.com/docker/cli v20.10.11+incompatible // indirect
39+
github.com/docker/distribution v2.8.1+incompatible // indirect
40+
github.com/docker/docker v20.10.14+incompatible // indirect
41+
github.com/docker/docker-credential-helpers v0.6.4 // indirect
4242
github.com/docker/go-connections v0.4.0 // indirect
4343
github.com/docker/go-metrics v0.0.1 // indirect
4444
github.com/docker/go-units v0.4.0 // indirect
@@ -55,31 +55,37 @@ require (
5555
github.com/golang/protobuf v1.5.2 // indirect
5656
github.com/google/gnostic v0.5.7-v3refs // indirect
5757
github.com/google/go-cmp v0.5.8 // indirect
58-
github.com/google/gofuzz v1.1.0 // indirect
59-
github.com/gorilla/mux v1.7.4 // indirect
58+
github.com/google/gofuzz v1.2.0 // indirect
59+
github.com/gorilla/mux v1.8.0 // indirect
60+
github.com/h2non/filetype v1.1.1 // indirect
61+
github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c // indirect
6062
github.com/imdario/mergo v0.3.12 // indirect
6163
github.com/inconshreveable/mousetrap v1.0.0 // indirect
6264
github.com/josharian/intern v1.0.0 // indirect
6365
github.com/json-iterator/go v1.1.12 // indirect
66+
github.com/klauspost/compress v1.13.6 // indirect
6467
github.com/mailru/easyjson v0.7.6 // indirect
6568
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
69+
github.com/moby/locker v1.0.1 // indirect
70+
github.com/moby/sys/mountinfo v0.5.0 // indirect
71+
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
6672
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6773
github.com/modern-go/reflect2 v1.0.2 // indirect
6874
github.com/morikuni/aec v1.0.0 // indirect
6975
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
7076
github.com/nxadm/tail v1.4.8 // indirect
71-
github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
77+
github.com/opencontainers/go-digest v1.0.0 // indirect
7278
github.com/pkg/errors v0.9.1 // indirect
7379
github.com/prometheus/client_golang v1.12.2 // indirect
7480
github.com/prometheus/client_model v0.2.0 // indirect
7581
github.com/prometheus/common v0.32.1 // indirect
7682
github.com/prometheus/procfs v0.7.3 // indirect
7783
go.etcd.io/bbolt v1.3.6 // indirect
78-
go.opencensus.io v0.22.4 // indirect
79-
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
80-
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
84+
go.opencensus.io v0.23.0 // indirect
85+
golang.org/x/net v0.0.0-20220909164309-bea034e7d591 // indirect
86+
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
8187
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
82-
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
88+
golang.org/x/sys v0.0.0-20220907062415-87db552b00fd // indirect
8389
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
8490
golang.org/x/text v0.3.7 // indirect
8591
golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
@@ -91,9 +97,9 @@ require (
9197
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
9298
gopkg.in/yaml.v2 v2.4.0 // indirect
9399
gopkg.in/yaml.v3 v3.0.1 // indirect
94-
k8s.io/klog/v2 v2.70.1 // indirect
100+
k8s.io/klog/v2 v2.80.1 // indirect
95101
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
96-
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect
102+
k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73 // indirect
97103
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
98104
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
99105
)

0 commit comments

Comments
 (0)