Skip to content

cmd/operator-sdk/generate: remove unused legacy code #3483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
estroz merged 1 commit into from
Jul 21, 2020
Merged

cmd/operator-sdk/generate: remove unused legacy code #3483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmd/operator-sdk/generate/bundle/bundle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ https://github.com/operator-framework/operator-registry/#manifest-format
// defaultRootDir is the default root directory in which to generate bundle files.
const defaultRootDir = "bundle"

// setCommonDefaults sets defaults useful to all modes of this subcommand.
func (c *bundleCmd) setCommonDefaults(cfg *config.Config) {
// setDefaults sets defaults useful to all modes of this subcommand.
func (c *bundleCmd) setDefaults(cfg *config.Config) {
if c.operatorName == "" {
c.operatorName = filepath.Base(cfg.Repo)
}
Expand Down
203 changes: 0 additions & 203 deletions cmd/operator-sdk/generate/bundle/bundle_legacy.go
View file
Open in desktop

This file was deleted.

89 changes: 3 additions & 86 deletions cmd/operator-sdk/generate/bundle/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import (
"github.com/spf13/pflag"

kbutil "github.com/operator-framework/operator-sdk/internal/util/kubebuilder"
"github.com/operator-framework/operator-sdk/internal/util/projutil"
)

//nolint:maligned
Expand All @@ -49,15 +48,6 @@ type bundleCmd struct {
overwrite bool
}

//nolint:maligned
type bundleCmdLegacy struct {
bundleCmd

apisDir string
interactiveLevel projutil.InteractiveLevel
interactive bool
}

// NewCmd returns the 'bundle' command configured for the new project layout.
func NewCmd() *cobra.Command {
c := &bundleCmd{}
Expand All @@ -82,7 +72,7 @@ func NewCmd() *cobra.Command {
if err != nil {
return fmt.Errorf("error reading configuration: %v", err)
}
c.setCommonDefaults(cfg)
c.setDefaults(cfg)

// Validate command args before running so a preceding mode doesn't run
// before a following validation fails.
Expand Down Expand Up @@ -117,85 +107,12 @@ func NewCmd() *cobra.Command {
"Directory containing kustomize bases and a kustomization.yaml for operator-framework manifests")
cmd.Flags().BoolVar(&c.stdout, "stdout", false, "Write bundle manifest to stdout")

c.addCommonFlagsTo(cmd.Flags())

return cmd
}

// NewCmdLegacy returns the 'bundle' command configured for the legacy project layout.
func NewCmdLegacy() *cobra.Command {
c := &bundleCmdLegacy{}
cmd := &cobra.Command{
Use: "bundle",
Short: "Generates bundle data for the operator",
Long: longHelpLegacy,
Example: examplesLegacy,
RunE: func(cmd *cobra.Command, args []string) (err error) {
if len(args) != 0 {
return fmt.Errorf("command %s doesn't accept any arguments", cmd.CommandPath())
}

// Check if the user has any specific preference to enable/disable
// interactive prompts. Default behaviour is to disable the prompt
// unless a base bundle does not exist.
if cmd.Flags().Changed("interactive") {
if c.interactive {
c.interactiveLevel = projutil.InteractiveOnAll
} else {
c.interactiveLevel = projutil.InteractiveHardOff
}
}

// Generate manifests and metadata by default if no flags are set so
// the default behavior is "do everything".
fs := cmd.Flags()
if !fs.Changed("metadata") && !fs.Changed("manifests") {
c.metadata = true
c.manifests = true
}

c.setCommonDefaults()

// Validate command args before running so a preceding mode doesn't run
// before a following validation fails.
if c.manifests {
if err = c.validateManifests(); err != nil {
return fmt.Errorf("invalid command options: %v", err)
}
}
if c.metadata {
if err = c.validateMetadata(); err != nil {
return fmt.Errorf("invalid command options: %v", err)
}
}

// Run command logic.
if c.manifests {
if err = c.runManifests(); err != nil {
log.Fatalf("Error generating bundle manifests: %v", err)
}
}
if c.metadata {
if err = c.runMetadata(); err != nil {
log.Fatalf("Error generating bundle metadata: %v", err)
}
}

return nil
},
}

cmd.Flags().StringVar(&c.apisDir, "apis-dir", "", "Root directory for API type defintions")
cmd.Flags().BoolVar(&c.interactive, "interactive", false, "When set or no bundle base exists, an interactive "+
"command prompt will be presented to accept bundle ClusterServiceVersion metadata")

c.addCommonFlagsTo(cmd.Flags())
c.addFlagsTo(cmd.Flags())

return cmd
}

// TODO(estroz): add flag to skip API metadata regeneration.
func (c *bundleCmd) addCommonFlagsTo(fs *pflag.FlagSet) {
func (c *bundleCmd) addFlagsTo(fs *pflag.FlagSet) {
fs.BoolVar(&c.manifests, "manifests", false, "Generate bundle manifests")
fs.BoolVar(&c.metadata, "metadata", false, "Generate bundle metadata and Dockerfile")

Expand Down
4 changes: 2 additions & 2 deletions cmd/operator-sdk/generate/packagemanifests/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,12 @@ func NewCmd() *cobra.Command {
"Directory containing kustomize bases and a kustomization.yaml for operator-framework manifests")
cmd.Flags().BoolVar(&c.stdout, "stdout", false, "Write package to stdout")

c.addCommonFlagsTo(cmd.Flags())
c.addFlagsTo(cmd.Flags())

return cmd
}

func (c *packagemanifestsCmd) addCommonFlagsTo(fs *pflag.FlagSet) {
func (c *packagemanifestsCmd) addFlagsTo(fs *pflag.FlagSet) {
fs.StringVar(&c.operatorName, "operator-name", "", "Name of the packaged operator")
fs.StringVarP(&c.version, "version", "v", "", "Semantic version of the packaged operator")
fs.StringVar(&c.inputDir, "input-dir", "", "Directory to read existing package manifests from. "+
Expand Down