Skip to content

Commit 2581c4d

Browse files
author
Eric Stroczynski
authored
[v0.19.x] deps: bump operator-registry to v1.13.4 (#3605)
and gopkg.in/yaml dependency
1 parent c05841c commit 2581c4d

File tree

6 files changed

+80
-31
lines changed

6 files changed

+80
-31
lines changed
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
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

cmd/operator-sdk/generate/bundle/bundle.go

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import (
1919
"fmt"
2020
"os"
2121
"path/filepath"
22-
"strings"
2322

2423
"github.com/operator-framework/operator-registry/pkg/lib/bundle"
2524
"sigs.k8s.io/kubebuilder/pkg/model/config"
@@ -102,11 +101,6 @@ func (c *bundleCmd) setCommonDefaults(cfg *config.Config) {
102101
if c.operatorName == "" {
103102
c.operatorName = filepath.Base(cfg.Repo)
104103
}
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-
}
110104
}
111105

112106
// validateManifests validates c for bundle manifests generation.
@@ -221,11 +215,6 @@ func (c bundleCmd) runManifests(cfg *config.Config) (err error) {
221215

222216
// validateMetadata validates c for bundle metadata generation.
223217
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-
229218
return nil
230219
}
231220

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ require (
1717
github.com/onsi/ginkgo v1.12.0
1818
github.com/onsi/gomega v1.9.0
1919
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
2121
github.com/pborman/uuid v1.2.0
2222
github.com/pkg/errors v0.9.1
2323
github.com/prometheus/client_golang v1.5.1
@@ -31,7 +31,7 @@ require (
3131
github.com/spf13/viper v1.4.0
3232
github.com/stretchr/testify v1.5.1
3333
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
3535
golang.org/x/tools v0.0.0-20200403190813-44a64ad78b9b
3636
gomodules.xyz/jsonpatch/v3 v3.0.1
3737
gopkg.in/yaml.v2 v2.2.8

0 commit comments

Comments
 (0)