Skip to content

[v0.17.x] generate csv: do not generate a package manifest for bundles (#3014) #3042

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 14, 2020
Merged

[v0.17.x] generate csv: do not generate a package manifest for bundles (#3014) #3042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions changelog/fragments/csv-package-manifests-bugfix.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
entries:
- description: >
do not generate a package manifest when 'generate csv --make-manifests=true'

kind: "bugfix"

breaking: false
10 changes: 7 additions & 3 deletions cmd/operator-sdk/generate/csv.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,9 +267,13 @@ func (c csvCmd) run() error {
if err := csv.Generate(); err != nil {
return fmt.Errorf("error generating CSV: %v", err)
}
pkg := gencatalog.NewPackageManifest(cfg, c.csvVersion, c.csvChannel, c.defaultChannel)
if err := pkg.Generate(); err != nil {
return fmt.Errorf("error generating package manifest: %v", err)

// A package manifest file is not a part of the bundle format.
if !c.makeManifests {
pkg := gencatalog.NewPackageManifest(cfg, c.csvVersion, c.csvChannel, c.defaultChannel)
if err := pkg.Generate(); err != nil {
return fmt.Errorf("error generating package manifest: %v", err)
}
}

log.Info("CSV manifest generated successfully")
Expand Down