Don't put CRD manifests into olm.yaml.

Reverts f4060ed.

Author: benluddy

Makefile

@@ -224,7 +224,7 @@ endif
 	./scripts/package_release.sh $(ver) deploy/$(target)/manifests/$(ver) deploy/$(target)/values.yaml
 	ln -sfFn ./$(ver) deploy/$(target)/manifests/latest
 ifeq ($(quickstart), true)
-	./scripts/package_quickstart.sh deploy/$(target)/manifests/$(ver) deploy/chart/crds deploy/$(target)/quickstart/olm.yaml deploy/$(target)/quickstart/crds.yaml deploy/$(target)/quickstart/install.sh
+	./scripts/package_quickstart.sh deploy/$(target)/manifests/$(ver) deploy/$(target)/quickstart/olm.yaml deploy/$(target)/quickstart/crds.yaml deploy/$(target)/quickstart/install.sh
 endif
 
 .PHONY: run-console-local

scripts/package_quickstart.sh

@@ -9,25 +9,24 @@ if [[ ${#@} < 3 ]]; then
     exit 1
 fi
 
-manifestdir=$1
-crddir=$2
-out=$3
-outcrds=$4
-outscript=$5
+dir=$1
+out=$2
+outcrds=$3
+outscript=$4
 
 rm -f ${out}
 rm -f ${outcrds}
 touch ${out}
 touch ${outcrds}
 
-for f in ${manifestdir}/*.yaml
+for f in ${dir}/*.yaml
 do
-    awk 'NR==1 && !/^---*/ {print "---"} !/^[[:space:]]*#/ {print}' $f >> ${out}
-done
-
-for f in ${crddir}/*.yaml
-do 
-    awk 'NR==1 && !/^---*/ {print "---"} !/^[[:space:]]*#/ {print}' $f >> ${outcrds}
+    if [[ $f == *.crd.yaml ]]
+    then
+    	awk 'NR==1 && !/^---*/ {print "---"} !/^[[:space:]]*#/ {print}' $f >> ${outcrds}
+    else
+    	awk 'NR==1 && !/^---*/ {print "---"} !/^[[:space:]]*#/ {print}' $f >> ${out}
+    fi
 done
 
 echo "Wrote manifests to ${out} and ${outcrds}"