[WIP] generate: bundle and packagemanifests subcommand reference PR

cmd/operator-sdk/bundle/cmd.go

@@ -29,7 +29,7 @@ type bundleCmd struct {
 	generateOnly   bool
 }
 
-func NewCmd() *cobra.Command {
+func newCmd() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "bundle",
 		Short: "Manage operator bundle metadata",
@@ -44,10 +44,22 @@ Operator Lifecycle Manager:
 https://github.com/operator-framework/operator-lifecycle-manager
 `,
 	}
+	return cmd
+}
 
+func NewCmdLegacy() *cobra.Command {
+	cmd := newCmd()
 	cmd.AddCommand(
 		newCreateCmd(),
 		newValidateCmd(),
 	)
 	return cmd
 }
+
+func NewCmd() *cobra.Command {
+	cmd := newCmd()
+	cmd.AddCommand(
+		newValidateCmd(),
+	)
+	return cmd
+}

cmd/operator-sdk/cli/cli.go

@@ -20,6 +20,7 @@ import (
 	"github.com/operator-framework/operator-sdk/cmd/operator-sdk/bundle"
 	"github.com/operator-framework/operator-sdk/cmd/operator-sdk/cleanup"
 	"github.com/operator-framework/operator-sdk/cmd/operator-sdk/completion"
+	"github.com/operator-framework/operator-sdk/cmd/operator-sdk/generate"
 	"github.com/operator-framework/operator-sdk/cmd/operator-sdk/olm"
 	"github.com/operator-framework/operator-sdk/cmd/operator-sdk/run"
 	"github.com/operator-framework/operator-sdk/cmd/operator-sdk/scorecard"
@@ -41,17 +42,16 @@ var commands = []*cobra.Command{
 	// new.NewCmd()
 
 	alpha.NewCmd(),
+	build.NewCmd(),
 	bundle.NewCmd(),
 	cleanup.NewCmd(),
 	completion.NewCmd(),
+	generate.NewCmd(),
 	olm.NewCmd(),
 	run.NewCmd(),
 	scorecard.NewCmd(),
 	test.NewCmd(),
 	version.NewCmd(),
-	build.NewCmd(),
-
-	// TODO(hasbro17): add generate csv command after aligning it for kubebuilder layout
 }
 
 func Run() error {

cmd/operator-sdk/cli/legacy.go

@@ -73,11 +73,11 @@ func GetCLIRoot() *cobra.Command {
 		add.NewCmd(),
 		alpha.NewCmd(),
 		build.NewCmd(),
-		bundle.NewCmd(),
+		bundle.NewCmdLegacy(),
 		cleanup.NewCmd(),
 		completion.NewCmd(),
 		execentrypoint.NewCmd(),
-		generate.NewCmd(),
+		generate.NewCmdLegacy(),
 		migrate.NewCmd(),
 		new.NewCmd(),
 		olm.NewCmd(),

cmd/operator-sdk/generate/bundle/bundle.go

@@ -0,0 +1,215 @@
+// Copyright 2020 The Operator-SDK Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package bundle
+
+import (
+	"errors"
+	"fmt"
+	"os"
+	"path/filepath"
+
+	"github.com/operator-framework/operator-registry/pkg/lib/bundle"
+	"sigs.k8s.io/kubebuilder/pkg/model/config"
+
+	genutil "github.com/operator-framework/operator-sdk/cmd/operator-sdk/generate/internal"
+	gencsv "github.com/operator-framework/operator-sdk/internal/generate/clusterserviceversion"
+	"github.com/operator-framework/operator-sdk/internal/generate/collector"
+	"github.com/operator-framework/operator-sdk/internal/scaffold/kustomize"
+)
+
+// TODO: make these paths relative to inputDir
+const kubebuilderKustomization = `resources:
+- ../default
+- ../samples
+`
+
+func (c *bundleCmd) setDefaults(cfg *config.Config) {
+	if c.operatorName == "" {
+		c.operatorName = filepath.Base(cfg.Repo)
+	}
+}
+
+func (c bundleCmd) runKustomize(cfg *config.Config) error {
+
+	if !c.quiet {
+		fmt.Println("Generating bundle manifest kustomize bases")
+	}
+
+	defaultDir := filepath.Join("config", "bundle")
+	if c.inputDir == "" {
+		c.inputDir = defaultDir
+	}
+	if c.outputDir == "" {
+		c.outputDir = defaultDir
+	}
+	if c.apisDir == "" {
+		if cfg.MultiGroup {
+			c.apisDir = "apis"
+		} else {
+			c.apisDir = "api"
+		}
+	}
+
+	csvGen := gencsv.Generator{
+		OperatorName: c.operatorName,
+		OperatorType: genutil.PluginKeyToOperatorType(cfg.Layout),
+	}
+	opts := []gencsv.Option{
+		gencsv.WithBase(c.inputDir, c.apisDir),
+		gencsv.WithBaseWriter(c.outputDir),
+	}
+	if err := csvGen.Generate(cfg, opts...); err != nil {
+		return fmt.Errorf("error generating ClusterServiceVersion: %v", err)
+	}
+
+	if err := kustomize.WriteIfNotExist(c.outputDir, kubebuilderKustomization); err != nil {
+		return err
+	}
+
+	if !c.quiet {
+		fmt.Println("Bases generated successfully")
+	}
+
+	return nil
+}
+
+func (c bundleCmd) validateManifests(*config.Config) (err error) {
+	if c.version != "" {
+		if err := genutil.ValidateVersion(c.version); err != nil {
+			return err
+		}
+	}
+
+	if !genutil.IsPipeReader() {
+		if c.manifestRoot == "" {
+			return errors.New("--manifest-root must be set if not reading from stdin")
+		}
+		if c.crdsDir == "" {
+			return errors.New("--crd-dir must be set if not reading from stdin")
+		}
+	}
+
+	if c.stdout {
+		if c.outputDir != "" {
+			return errors.New("--output-dir cannot be set if writing to stdout")
+		}
+	}
+
+	return nil
+}
+
+func (c bundleCmd) runManifests(cfg *config.Config) (err error) {
+
+	if !c.quiet && !c.stdout {
+		if c.version == "" {
+			fmt.Println("Generating bundle manifests")
+		} else {
+			fmt.Println("Generating bundle manifests version", c.version)
+		}
+	}
+
+	defaultBundleDir := filepath.Join("config", "bundle")
+	if c.inputDir == "" {
+		c.inputDir = defaultBundleDir
+	}
+	if !c.stdout {
+		if c.outputDir == "" {
+			c.outputDir = defaultBundleDir
+		}
+	}
+	// Only regenerate API definitions once.
+	if c.apisDir == "" && !c.kustomize {
+		if cfg.MultiGroup {
+			c.apisDir = "apis"
+		} else {
+			c.apisDir = "api"
+		}
+	}
+
+	col := &collector.Manifests{}
+	if genutil.IsPipeReader() {
+		if err := col.UpdateFromReader(os.Stdin); err != nil {
+			return err
+		}
+	}
+	if c.manifestRoot != "" {
+		if err := col.UpdateFromDirs(c.manifestRoot, c.crdsDir); err != nil {
+			return err
+		}
+	}
+
+	csvGen := gencsv.Generator{
+		OperatorName: c.operatorName,
+		OperatorType: genutil.PluginKeyToOperatorType(cfg.Layout),
+		Version:      c.version,
+		Collector:    col,
+	}
+
+	stdout := genutil.NewMultiManifestWriter(os.Stdout)
+	opts := []gencsv.Option{
+		gencsv.WithBase(c.inputDir, c.apisDir),
+	}
+	if c.stdout {
+		opts = append(opts, gencsv.WithWriter(stdout))
+	} else {
+		opts = append(opts, gencsv.WithBundleWriter(c.outputDir))
+	}
+
+	if err := csvGen.Generate(cfg, opts...); err != nil {
+		return fmt.Errorf("error generating ClusterServiceVersion: %v", err)
+	}
+
+	if c.stdout {
+		if err := genutil.WriteCRDs(stdout, col.CustomResourceDefinitions...); err != nil {
+			return err
+		}
+	} else {
+		dir := filepath.Join(c.outputDir, bundle.ManifestsDir)
+		if err := genutil.WriteCRDFiles(dir, col.CustomResourceDefinitions...); err != nil {
+			return err
+		}
+	}
+
+	if !c.quiet && !c.stdout {
+		fmt.Println("Bundle manifests generated successfully")
+	}
+
+	return nil
+}
+
+// runMetadata generates a bundle.Dockerfile and metadata.
+func (c bundleCmd) runMetadata() error {
+
+	directory := c.inputDir
+	if directory == "" {
+		directory = filepath.Join("config", "bundle", bundle.ManifestsDir)
+	} else {
+		directory = filepath.Join(directory, bundle.ManifestsDir)
+	}
+	outputDir := c.outputDir
+	if filepath.Clean(outputDir) == filepath.Clean(directory) {
+		outputDir = ""
+	}
+
+	return c.generateMetadata(directory, outputDir)
+}
+
+func (c bundleCmd) generateMetadata(manifestsDir, outputDir string) error {
+	err := bundle.GenerateFunc(manifestsDir, outputDir, c.operatorName, c.channels, c.defaultChannel, c.overwrite)
+	if err != nil {
+		return fmt.Errorf("error generating bundle metadata: %v", err)
+	}
+	return nil
+}