Master rebased

Author: bharathi-tenneti

cmd/operator-sdk/internal/genutil/crds.go

@@ -46,11 +46,13 @@ func CRDGen(crdVersion string) error {
 // GenerateCRDNonGo generates CRDs for Non-Go APIs(Eg., Ansible,Helm)
 func GenerateCRDNonGo(projectName string, resource scaffold.Resource, crdVersion string) error {
 	crdsDir := filepath.Join(projectName, scaffold.CRDsDir)
-	gcfg := gen.Config{
-		Inputs:    map[string]string{gencrd.CRDsDirKey: crdsDir},
-		OutputDir: crdsDir,
+	crd := gencrd.Generator{
+		CRDsDir:      crdsDir,
+		OutputDir:    crdsDir,
+		CRDVersion:   crdVersion,
+		Resource:     resource,
+		IsOperatorGo: false,
 	}
-	crd := gencrd.NewCRDNonGo(gcfg, resource, crdVersion)
 	if err := crd.Generate(); err != nil {
 		return fmt.Errorf("error generating CRD for %s: %w", resource, err)
 	}

cmd/operator-sdk/new/cmd.go

@@ -24,7 +24,6 @@ import (
 
 	"github.com/operator-framework/operator-sdk/cmd/operator-sdk/internal/genutil"
 	"github.com/operator-framework/operator-sdk/internal/flags/apiflags"
-	gencrd "github.com/operator-framework/operator-sdk/internal/generate/crd"
 	"github.com/operator-framework/operator-sdk/internal/scaffold"
 	"github.com/operator-framework/operator-sdk/internal/scaffold/ansible"
 	"github.com/operator-framework/operator-sdk/internal/scaffold/helm"
@@ -410,22 +409,6 @@ func doHelmScaffold() error {
 	return nil
 }
 
-func generateCRDNonGo(projectName string, resource scaffold.Resource, crdVersion string) error {
-	crdsDir := filepath.Join(projectName, scaffold.CRDsDir)
-	crd := gencrd.Generator{
-		CRDsDir:      crdsDir,
-		OutputDir:    crdsDir,
-		CRDVersion:   crdVersion,
-		Resource:     resource,
-		IsOperatorGo: false,
-	}
-	if err := crd.Generate(); err != nil {
-		return fmt.Errorf("error generating CRD for %s: %w", resource, err)
-	}
-	log.Info("Generated CustomResourceDefinition manifests.")
-	return nil
-}
-
 func verifyFlags() error {
 	if operatorType != projutil.OperatorTypeGo && operatorType != projutil.OperatorTypeAnsible && operatorType !=
 		projutil.OperatorTypeHelm {