Skip to content

Commit 6d762ad

Browse files
authoredSep 26, 2022
bump k8s to 1.25 (operator-framework#1024)
Signed-off-by: Austin Macdonald <[email protected]> Signed-off-by: Austin Macdonald <[email protected]>
1 parent bd3c804 commit 6d762ad

File tree

752 files changed

+40064
-12469
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

752 files changed

+40064
-12469
lines changed
 

‎alpha/declcfg/declcfg.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ type ChannelEntry struct {
5252
// Top-level fields are the source of truth, i.e. not CSV values.
5353
//
5454
// Notes:
55-
// - Any field slice type field or type containing a slice somewhere
56-
// where two types/fields are equal if their contents are equal regardless
57-
// of order must have a `hash:"set"` field tag for bundle comparison.
58-
// - Any fields that have a `json:"-"` tag must be included in the equality
59-
// evaluation in bundlesEqual().
55+
// - Any field slice type field or type containing a slice somewhere
56+
// where two types/fields are equal if their contents are equal regardless
57+
// of order must have a `hash:"set"` field tag for bundle comparison.
58+
// - Any fields that have a `json:"-"` tag must be included in the equality
59+
// evaluation in bundlesEqual().
6060
type Bundle struct {
6161
Schema string `json:"schema"`
6262
Name string `json:"name"`

‎alpha/model/model.go

+8-7
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,9 @@ type Channel struct {
141141
}
142142

143143
// TODO(joelanford): This function determines the channel head by finding the bundle that has 0
144-
// incoming edges, based on replaces and skips. It also expects to find exactly one such bundle.
145-
// Is this the correct algorithm?
144+
//
145+
// incoming edges, based on replaces and skips. It also expects to find exactly one such bundle.
146+
// Is this the correct algorithm?
146147
func (c Channel) Head() (*Bundle, error) {
147148
incoming := map[string]int{}
148149
for _, b := range c.Bundles {
@@ -210,11 +211,11 @@ func (c *Channel) Validate() error {
210211

211212
// validateReplacesChain checks the replaces chain of a channel.
212213
// Specifically the following rules must be followed:
213-
// 1. There must be exactly 1 channel head.
214-
// 2. Beginning at the head, the replaces chain must reach all non-skipped entries.
215-
// Non-skipped entries are defined as entries that are not skipped by any other entry in the channel.
216-
// 3. There must be no cycles in the replaces chain.
217-
// 4. The tail entry in the replaces chain is permitted to replace a non-existent entry.
214+
// 1. There must be exactly 1 channel head.
215+
// 2. Beginning at the head, the replaces chain must reach all non-skipped entries.
216+
// Non-skipped entries are defined as entries that are not skipped by any other entry in the channel.
217+
// 3. There must be no cycles in the replaces chain.
218+
// 4. The tail entry in the replaces chain is permitted to replace a non-existent entry.
218219
func (c *Channel) validateReplacesChain() error {
219220
head, err := c.Head()
220221
if err != nil {

0 commit comments

Comments
 (0)