File tree Expand file tree Collapse file tree 6 files changed +80
-31
lines changed
cmd/operator-sdk/generate/bundle Expand file tree Collapse file tree 6 files changed +80
-31
lines changed Original file line number Diff line number Diff line change
1
+ entries :
2
+ - description : >
3
+ The `generate bundle` subcommand no longer requires a default channel be set nor defaults
4
+ to the first channel provided to `--channels`.
5
+ kind: change
6
+ breaking: false
7
+ - description : >
8
+ The `bundle validate` subcommand no longer returns an error if a bundle does not have a default channel.
9
+ kind: change
10
+ breaking: false
Original file line number Diff line number Diff line change @@ -19,7 +19,6 @@ import (
19
19
"fmt"
20
20
"os"
21
21
"path/filepath"
22
- "strings"
23
22
24
23
"github.com/operator-framework/operator-registry/pkg/lib/bundle"
25
24
"sigs.k8s.io/kubebuilder/pkg/model/config"
@@ -102,11 +101,6 @@ func (c *bundleCmd) setCommonDefaults(cfg *config.Config) {
102
101
if c .operatorName == "" {
103
102
c .operatorName = filepath .Base (cfg .Repo )
104
103
}
105
- // A default channel can be inferred if there is only one channel. Don't infer
106
- // default otherwise; the user must set this value.
107
- if c .defaultChannel == "" && strings .Count (c .channels , "," ) == 0 {
108
- c .defaultChannel = c .channels
109
- }
110
104
}
111
105
112
106
// validateManifests validates c for bundle manifests generation.
@@ -221,11 +215,6 @@ func (c bundleCmd) runManifests(cfg *config.Config) (err error) {
221
215
222
216
// validateMetadata validates c for bundle metadata generation.
223
217
func (c bundleCmd ) validateMetadata (* config.Config ) (err error ) {
224
- // Ensure a default channel is present.
225
- if c .defaultChannel == "" {
226
- return fmt .Errorf ("--default-channel must be set if setting multiple channels" )
227
- }
228
-
229
218
return nil
230
219
}
231
220
Original file line number Diff line number Diff line change @@ -17,7 +17,7 @@ require (
17
17
github.com/onsi/ginkgo v1.12.0
18
18
github.com/onsi/gomega v1.9.0
19
19
github.com/operator-framework/api v0.3.8
20
- github.com/operator-framework/operator-registry v1.12.6-0.20200611222234-275301b779f8
20
+ github.com/operator-framework/operator-registry v1.13.4
21
21
github.com/pborman/uuid v1.2.0
22
22
github.com/pkg/errors v0.9.1
23
23
github.com/prometheus/client_golang v1.5.1
@@ -31,7 +31,7 @@ require (
31
31
github.com/spf13/viper v1.4.0
32
32
github.com/stretchr/testify v1.5.1
33
33
go.uber.org/zap v1.14.1
34
- golang.org/x/net v0.0.0-20200301022130-244492dfa37a
34
+ golang.org/x/net v0.0.0-20200625001655-4c5254603344
35
35
golang.org/x/tools v0.0.0-20200403190813-44a64ad78b9b
36
36
gomodules.xyz/jsonpatch/v3 v3.0.1
37
37
gopkg.in/yaml.v2 v2.2.8
You can’t perform that action at this time.
0 commit comments