From de2d8df3ba73c93700c8cbb7253123211a936008 Mon Sep 17 00:00:00 2001 From: Eric Stroczynski Date: Tue, 12 May 2020 19:12:41 -0400 Subject: [PATCH] generate csv: do not generate a package manifest for bundles (#3014) --- changelog/fragments/csv-package-manifests-bugfix.yaml | 7 +++++++ cmd/operator-sdk/generate/csv.go | 10 +++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 changelog/fragments/csv-package-manifests-bugfix.yaml diff --git a/changelog/fragments/csv-package-manifests-bugfix.yaml b/changelog/fragments/csv-package-manifests-bugfix.yaml new file mode 100644 index 00000000000..e0bb623702f --- /dev/null +++ b/changelog/fragments/csv-package-manifests-bugfix.yaml @@ -0,0 +1,7 @@ +entries: + - description: > + do not generate a package manifest when 'generate csv --make-manifests=true' + + kind: "bugfix" + + breaking: false diff --git a/cmd/operator-sdk/generate/csv.go b/cmd/operator-sdk/generate/csv.go index 3859b7c5cdb..8b87dbf70a5 100644 --- a/cmd/operator-sdk/generate/csv.go +++ b/cmd/operator-sdk/generate/csv.go @@ -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")