Skip to content

Commit 87714cc

Browse files
authored
Merge pull request #1 from ankitathomas/deprecation_sub
Update cache with deprecations field
2 parents 03d2a03 + cd9498a commit 87714cc

File tree

2 files changed

+11
-0
lines changed

2 files changed

+11
-0
lines changed

go.sum

+2
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,8 @@ github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4
170170
github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
171171
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 h1:UhxFibDNY/bfvqU5CAUmr9zpesgbU6SWc8/B4mflAE4=
172172
github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
173+
github.com/dtfranz/api v0.0.0-20231109073835-cdc1720a9152 h1:7+LiI7iNkdPd+IL9ptjuueDeoaFG5ZQ7jJWcET/0UzM=
174+
github.com/dtfranz/api v0.0.0-20231109073835-cdc1720a9152/go.mod h1:SCCslqke6AVOJ5JM+NqNE1CHuAgJLScsL66pnPaSMXs=
173175
github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
174176
github.com/emicklei/go-restful/v3 v3.10.2 h1:hIovbnmBTLjHXkqEBUz3HGpXZdM7ZrE9fJIZIqlJLqE=
175177
github.com/emicklei/go-restful/v3 v3.10.2/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=

pkg/controller/registry/resolver/cache/operators.go

+9
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,12 @@ func (i *OperatorSourceInfo) String() string {
147147
return fmt.Sprintf("%s/%s in %s/%s", i.Package, i.Channel, i.Catalog.Name, i.Catalog.Namespace)
148148
}
149149

150+
type Deprecation struct {
151+
*api.DeprecationEntry
152+
Name string
153+
Type string // schema
154+
}
155+
150156
type Entry struct {
151157
Name string
152158
Replaces string
@@ -158,6 +164,9 @@ type Entry struct {
158164
SourceInfo *OperatorSourceInfo
159165
Properties []*api.Property
160166
BundlePath string
167+
// Since there are separate cache entries for the same bundle in different channels,
168+
// This should contain at most one deprecation for package, channel and bundle.
169+
Deprecations []Deprecation
161170

162171
// Present exclusively to pipe inlined bundle
163172
// content. Resolver components shouldn't need to read this,

0 commit comments

Comments
 (0)