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

Author: estroz

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

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")