Remove check to skip CSV annotation for Go types

Instead only skip when API types directory is missing.

Author: hasbro17

internal/generate/olm-catalog/csv_updaters.go

@@ -24,7 +24,6 @@ import (
 
 	"github.com/operator-framework/operator-registry/pkg/registry"
 	"github.com/operator-framework/operator-sdk/internal/generate/olm-catalog/descriptor"
-	"github.com/operator-framework/operator-sdk/internal/util/projutil"
 	"github.com/operator-framework/operator-sdk/pkg/k8sutil"
 
 	"github.com/ghodss/yaml"
@@ -241,14 +240,6 @@ func (us crds) apply(csv *olmapiv1alpha1.ClusterServiceVersion) error {
 }
 
 func updateDescriptions(csv *olmapiv1alpha1.ClusterServiceVersion, searchDir string) error {
-	// TODO: Should this skip generating descriptions if API directory exists
-	// but project type can't be detected due to layout differences.
-	if opType := projutil.GetOperatorType(); opType != projutil.OperatorTypeGo {
-		log.Infof("Skipping generation of owned CRDDescriptions from CSV annotations in %s."+
-			" Could not detect project to be of Go type.", searchDir)
-		return nil
-	}
-
 	updatedDescriptions := []olmapiv1alpha1.CRDDescription{}
 	for _, currDescription := range csv.Spec.CustomResourceDefinitions.Owned {
 		group := currDescription.Name

internal/generate/olm-catalog/descriptor/descriptor.go

@@ -22,6 +22,7 @@ import (
 	"strings"
 
 	olmapiv1alpha1 "github.com/operator-framework/operator-lifecycle-manager/pkg/api/apis/operators/v1alpha1"
+	log "github.com/sirupsen/logrus"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/gengo/parser"
 	"k8s.io/gengo/types"
@@ -55,6 +56,7 @@ func GetCRDDescriptionForGVK(apisDir string, gvk schema.GroupVersionKind) (olmap
 		return olmapiv1alpha1.CRDDescription{}, err
 	}
 	if !exists {
+		log.Debugf("Could not find API types directory: %s", apisDir)
 		return olmapiv1alpha1.CRDDescription{}, ErrAPIDirNotExist
 	}
 

internal/generate/testdata/go/go.mod

@@ -186,10 +186,6 @@ func GetOperatorType() OperatorType {
 		return OperatorTypeAnsible
 	case IsOperatorHelm():
 		return OperatorTypeHelm
-	// Additional case for when tests run cmds which have this check
-	// from the SDK root
-	case hasGoPkgFile():
-		return OperatorTypeGo
 	}
 	return OperatorTypeUnknown
 }