Merge pull request #214 from fromanirh/cleanup-csv-generator

cleanup: streamline and use csv-generator options

hack/csv-generate.sh

@@ -20,12 +20,14 @@ OUT_CSV_FILE="${OUT_CSV_DIR}/${PACKAGE_NAME}.v${CSV_VERSION}.clusterserviceversi
 EXTRA_ANNOTATIONS=""
 MAINTAINERS=""
 
+if [ -n "$DESCRIPTION_FILE" ]; then
+	DESCRIPTION="-description-from=$DESCRIPTION_FILE"
+fi
 if [ -n "$MAINTAINERS_FILE" ]; then
 	MAINTAINERS="-maintainers-from=$MAINTAINERS_FILE"
 fi
-
 if [ -n "$ANNOTATIONS_FILE" ]; then
-	EXTRA_ANNOTATIONS="-inject-annotations-from=$ANNOTATIONS_FILE"
+	EXTRA_ANNOTATIONS="-annotations-from=$ANNOTATIONS_FILE"
 fi
 
 clean_package() {
@@ -60,6 +62,7 @@ build/_output/bin/csv-generator \
 	--olm-bundle-directory "$OUT_CSV_DIR" \
 	--replaces-csv-version "$REPLACES_CSV_VERSION" \
 	--skip-range "$CSV_SKIP_RANGE" \
+	"${DESCRIPTION}" \
 	"${MAINTAINERS}" \
 	"${EXTRA_ANNOTATIONS}"
 

tools/csv-generator/csv-generator.go

@@ -31,7 +31,7 @@ var (
 
 	outputDir = flag.String("olm-bundle-directory", "", "The directory to output the unified CSV and CRDs to")
 
-	annotationsFile = flag.String("inject-annotations-from", "", "inject metadata annotations from given file")
+	annotationsFile = flag.String("annotations-from", "", "add metadata annotations from given file")
 	maintainersFile = flag.String("maintainers-from", "", "add maintainers list from given file")
 	descriptionFile = flag.String("description-from", "", "replace the description with the content of the given file")
 
@@ -137,6 +137,9 @@ func generateUnifiedCSV(userData csvUserData) {
 	// Set Description
 	operatorCSV.Spec.Description = `
 Performance Addon Operator provides the ability to enable advanced node performance tunings on a set of nodes.`
+	if userData.Description != "" {
+		operatorCSV.Spec.Description = userData.Description
+	}
 
 	operatorCSV.Spec.DisplayName = "Performance Addon Operator"