Skip to content

Commit 35bc0a2

Browse files
feat: update channel namming to reflect to the conv (#4978)
Signed-off-by: Camila Macedo <[email protected]>
1 parent 0c3d84d commit 35bc0a2

File tree

8 files changed

+21
-21
lines changed

8 files changed

+21
-21
lines changed

internal/cmd/operator-sdk/pkgmantobundle/cmd.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ func getChannelsByCSV(bundle *apimanifests.Bundle, channelsByCSV map[string][]st
323323
// TODO: verify if we have to add this validation since while building bundles if channel is not specified
324324
// we add the default channel.
325325
if channels == "" {
326-
channels = "preview"
326+
channels = "candidate"
327327
log.Infof("Supported channels cannot be identified from CSV %s, using default channel 'preview'", bundle.CSV.GetName())
328328
}
329329

@@ -339,7 +339,7 @@ func getPackageMetadata(pkg *apimanifests.PackageManifest) (packagename, default
339339

340340
defaultChannel = pkg.DefaultChannelName
341341
if defaultChannel == "" {
342-
defaultChannel = "preview"
342+
defaultChannel = "candidate"
343343
}
344344

345345
channelsByCSV = make(map[string][]string)

internal/cmd/operator-sdk/pkgmantobundle/pkgmantobundle_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,10 +173,10 @@ var _ = Describe("Running pkgmanToBundle command", func() {
173173
Expect(ch).To(BeEquivalentTo("alpha,beta"))
174174
})
175175

176-
It("if no channel is provided, default to preview", func() {
176+
It("if no channel is provided, default to candidate", func() {
177177
channels := map[string][]string{}
178178
ch := getChannelsByCSV(&bundle, channels)
179-
Expect(ch).To(BeEquivalentTo("preview"))
179+
Expect(ch).To(BeEquivalentTo("candidate"))
180180
})
181181
})
182182
})
@@ -228,7 +228,7 @@ var _ = Describe("Running pkgmanToBundle command", func() {
228228
pkg.DefaultChannelName = ""
229229
_, defaultChannel, _, err := getPackageMetadata(&pkg)
230230
Expect(err).NotTo(HaveOccurred())
231-
Expect(defaultChannel).To(BeEquivalentTo("preview"))
231+
Expect(defaultChannel).To(BeEquivalentTo("candidate"))
232232
})
233233
})
234234
})

internal/plugins/manifests/v2/init.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,10 @@ const (
127127
VERSION ?= 0.0.1
128128
129129
# CHANNELS define the bundle channels used in the bundle.
130-
# Add a new line here if you would like to change its default config. (E.g CHANNELS = "preview,fast,stable")
130+
# Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")
131131
# To re-generate a bundle for other specific channels without changing the standard setup, you can:
132-
# - use the CHANNELS as arg of the bundle target (e.g make bundle CHANNELS=preview,fast,stable)
133-
# - use environment variables to overwrite this value (e.g export CHANNELS="preview,fast,stable")
132+
# - use the CHANNELS as arg of the bundle target (e.g make bundle CHANNELS=candidate,fast,stable)
133+
# - use environment variables to overwrite this value (e.g export CHANNELS="candidate,fast,stable")
134134
ifneq ($(origin CHANNELS), undefined)
135135
BUNDLE_CHANNELS := --channels=$(CHANNELS)
136136
endif

testdata/ansible/memcached-operator/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
VERSION ?= 0.0.1
77

88
# CHANNELS define the bundle channels used in the bundle.
9-
# Add a new line here if you would like to change its default config. (E.g CHANNELS = "preview,fast,stable")
9+
# Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")
1010
# To re-generate a bundle for other specific channels without changing the standard setup, you can:
11-
# - use the CHANNELS as arg of the bundle target (e.g make bundle CHANNELS=preview,fast,stable)
12-
# - use environment variables to overwrite this value (e.g export CHANNELS="preview,fast,stable")
11+
# - use the CHANNELS as arg of the bundle target (e.g make bundle CHANNELS=candidate,fast,stable)
12+
# - use environment variables to overwrite this value (e.g export CHANNELS="candidate,fast,stable")
1313
ifneq ($(origin CHANNELS), undefined)
1414
BUNDLE_CHANNELS := --channels=$(CHANNELS)
1515
endif

testdata/go/v2/memcached-operator/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
VERSION ?= 0.0.1
77

88
# CHANNELS define the bundle channels used in the bundle.
9-
# Add a new line here if you would like to change its default config. (E.g CHANNELS = "preview,fast,stable")
9+
# Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")
1010
# To re-generate a bundle for other specific channels without changing the standard setup, you can:
11-
# - use the CHANNELS as arg of the bundle target (e.g make bundle CHANNELS=preview,fast,stable)
12-
# - use environment variables to overwrite this value (e.g export CHANNELS="preview,fast,stable")
11+
# - use the CHANNELS as arg of the bundle target (e.g make bundle CHANNELS=candidate,fast,stable)
12+
# - use environment variables to overwrite this value (e.g export CHANNELS="candidate,fast,stable")
1313
ifneq ($(origin CHANNELS), undefined)
1414
BUNDLE_CHANNELS := --channels=$(CHANNELS)
1515
endif

testdata/go/v3/memcached-operator/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
VERSION ?= 0.0.1
77

88
# CHANNELS define the bundle channels used in the bundle.
9-
# Add a new line here if you would like to change its default config. (E.g CHANNELS = "preview,fast,stable")
9+
# Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")
1010
# To re-generate a bundle for other specific channels without changing the standard setup, you can:
11-
# - use the CHANNELS as arg of the bundle target (e.g make bundle CHANNELS=preview,fast,stable)
12-
# - use environment variables to overwrite this value (e.g export CHANNELS="preview,fast,stable")
11+
# - use the CHANNELS as arg of the bundle target (e.g make bundle CHANNELS=candidate,fast,stable)
12+
# - use environment variables to overwrite this value (e.g export CHANNELS="candidate,fast,stable")
1313
ifneq ($(origin CHANNELS), undefined)
1414
BUNDLE_CHANNELS := --channels=$(CHANNELS)
1515
endif

testdata/helm/memcached-operator/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
VERSION ?= 0.0.1
77

88
# CHANNELS define the bundle channels used in the bundle.
9-
# Add a new line here if you would like to change its default config. (E.g CHANNELS = "preview,fast,stable")
9+
# Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")
1010
# To re-generate a bundle for other specific channels without changing the standard setup, you can:
11-
# - use the CHANNELS as arg of the bundle target (e.g make bundle CHANNELS=preview,fast,stable)
12-
# - use environment variables to overwrite this value (e.g export CHANNELS="preview,fast,stable")
11+
# - use the CHANNELS as arg of the bundle target (e.g make bundle CHANNELS=candidate,fast,stable)
12+
# - use environment variables to overwrite this value (e.g export CHANNELS="candidate,fast,stable")
1313
ifneq ($(origin CHANNELS), undefined)
1414
BUNDLE_CHANNELS := --channels=$(CHANNELS)
1515
endif

website/content/en/docs/overview/cheat-sheet.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ The following examples let you update the [bundle][bundle] with data-informed. F
5252
make bundle CHANNELS=fast,preview DEFAULT_CHANNEL=stable VERSION=1.0.0 IMG=<some-registry>/<project-name-bundle>:<tag>
5353
```
5454

55-
**NOTE** You can use environment variables to pass the values such as `export CHANNELS=fast,preview`. Note that, their values will be used by `make bundle` command.
55+
**NOTE** You can use environment variables to pass the values such as `export CHANNELS=fast,candidate`. Note that, their values will be used by `make bundle` command.
5656

5757
## To test your projects
5858

0 commit comments

Comments
 (0)