cherry-pick: csv-gen bugfixes for #2015 #2017 (#2021)

* *: fix gen-csv to copy CRD manifests with any name (#2015)


(cherry picked from commit 5d22a11)

* internal/pkg/scaffold/olm-catalog/csv_updaters.go: fix applying owned CRDs (#2017)

* internal/pkg/scaffold/olm-catalog/csv_updaters.go: fix applying owned CRDs
* CHANGELOG.md: add line for #2017

(cherry picked from commit 5bfe311)

Author: hasbro17

CHANGELOG.md

@@ -10,6 +10,9 @@
 
 ### Bug Fixes
 
+- The command `operator-sdk olm-catalog gen-csv --csv-version=<version> --update-crds` would fail to copy over CRD manifests into `deploy/olm-catalog` for manifests whose name didn't end with a `_crd.yaml` suffix. This has been fixed so `gen-csv` now copies all CRD manifests specified by `deploy/olm-catalog/csv_config.yaml` by checking the type of the manifest rather than the filename suffix. ([#2015](https://github.com/operator-framework/operator-sdk/pull/2015))
+- Fixed an issue in `operator-sdk olm-catalog gen-csv` where the generated CSV is missing the expected set of owned CRDs. ([#2017](https://github.com/operator-framework/operator-sdk/pull/2017))
+
 ## v0.10.0
 
 ### Added

cmd/operator-sdk/olmcatalog/gen-csv.go

@@ -18,12 +18,12 @@ import (
 	"fmt"
 	"io/ioutil"
 	"path/filepath"
-	"strings"
 
 	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
 	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 	catalog "github.com/operator-framework/operator-sdk/internal/pkg/scaffold/olm-catalog"
 	"github.com/operator-framework/operator-sdk/internal/util/fileutil"
+	"github.com/operator-framework/operator-sdk/internal/util/k8sutil"
 	"github.com/operator-framework/operator-sdk/internal/util/projutil"
 
 	"github.com/coreos/go-semver/semver"
@@ -167,13 +167,18 @@ func verifyCSVVersion(version string) error {
 
 func writeCRDsToDir(crdPaths []string, toDir string) error {
 	for _, p := range crdPaths {
-		if !strings.HasSuffix(p, "crd.yaml") {
-			continue
-		}
 		b, err := ioutil.ReadFile(p)
 		if err != nil {
 			return err
 		}
+		typeMeta, err := k8sutil.GetTypeMetaFromBytes(b)
+		if err != nil {
+			return err
+		}
+		if typeMeta.Kind != "CustomResourceDefinition" {
+			continue
+		}
+
 		path := filepath.Join(toDir, filepath.Base(p))
 		err = ioutil.WriteFile(path, b, fileutil.DefaultFileMode)
 		if err != nil {

internal/pkg/scaffold/olm-catalog/csv_updaters.go

@@ -305,12 +305,12 @@ func getGVKID(g, v, k string) string {
 // the CRD key is not in spec.customresourcedefinitions.owned already.
 func (u *CustomResourceDefinitionsUpdate) Apply(csv *olmapiv1alpha1.ClusterServiceVersion) error {
 	set := make(map[string]olmapiv1alpha1.CRDDescription)
-	for _, uDesc := range u.Owned {
-		set[crdDescID(uDesc)] = uDesc
+	for _, csvDesc := range csv.Spec.CustomResourceDefinitions.Owned {
+		set[crdDescID(csvDesc)] = csvDesc
 	}
 	newDescs := []olmapiv1alpha1.CRDDescription{}
-	for _, csvDesc := range csv.Spec.CustomResourceDefinitions.Owned {
-		if uDesc, ok := set[crdDescID(csvDesc)]; !ok {
+	for _, uDesc := range u.Owned {
+		if csvDesc, ok := set[crdDescID(uDesc)]; !ok {
 			newDescs = append(newDescs, uDesc)
 		} else {
 			newDescs = append(newDescs, csvDesc)

internal/util/k8sutil/k8sutil.go

@@ -104,7 +104,7 @@ func GetTypeMetaFromBytes(b []byte) (t metav1.TypeMeta, err error) {
 	// There is only one YAML doc if there are no more bytes to be read or EOF
 	// is hit.
 	if err := dec.Decode(&u); err == nil && r.Len() != 0 {
-		return t, errors.New("error getting TypeMeta from bytes: more than one manifest in b")
+		return t, errors.New("error getting TypeMeta from bytes: more than one manifest in file")
 	} else if err != nil && err != io.EOF {
 		return t, errors.Wrap(err, "error getting TypeMeta from bytes")
 	}