pkg/generator: remove generator

This commit removes generator, which was the old generator used by
the master branch. It is unnecessary now. This commit also removes
the `generate olm-catalog` command, as that was out of date,
depended on the generator, and will soon be completely rewritten
from scratch.

commands/operator-sdk/cmd/cmdutil/util.go

@@ -15,15 +15,10 @@
 package cmdutil
 
 import (
-	"io/ioutil"
 	"log"
 	"os"
 	"path/filepath"
 	"strings"
-
-	"github.com/operator-framework/operator-sdk/pkg/generator"
-
-	yaml "gopkg.in/yaml.v2"
 )
 
 // OperatorType - the type of operator
@@ -70,19 +65,6 @@ func MustGetwd() string {
 	return wd
 }
 
-// GetConfig gets the values from ./config/config.yaml and parses them into a Config struct.
-func GetConfig() *generator.Config {
-	c := &generator.Config{}
-	fp, err := ioutil.ReadFile(configYaml)
-	if err != nil {
-		log.Fatalf("failed to read config file %v: (%v)", configYaml, err)
-	}
-	if err = yaml.Unmarshal(fp, c); err != nil {
-		log.Fatalf("failed to unmarshal config file %v: (%v)", configYaml, err)
-	}
-	return c
-}
-
 // CheckAndGetCurrPkg checks if this project's repository path is rooted under $GOPATH and returns the current directory's import path
 // e.g: "github.com/example-inc/app-operator"
 func CheckAndGetCurrPkg() string {

commands/operator-sdk/cmd/generate.go

@@ -28,7 +28,10 @@ func NewGenerateCmd() *cobra.Command {
 `,
 	}
 	cmd.AddCommand(generate.NewGenerateK8SCmd())
+<<<<<<< HEAD
 	cmd.AddCommand(generate.NewGenerateOlmCatalogCmd())
 	cmd.AddCommand(generate.NewGenerateCrdCmd())
+=======
+>>>>>>> pkg/generator: remove generator
 	return cmd
 }