Skip to content

fleet-cli: add missing flag wiring for apply, cleanup subcommands #5171

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

Open
apoorvajagtap wants to merge 1 commit into
base: main
Choose a base branch
from
+22 −3
Open

fleet-cli: add missing flag wiring for apply, cleanup subcommands #5171

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
8 changes: 7 additions & 1 deletion internal/cmd/cli/apply.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package cli
import (
"bytes"
"errors"
"flag"
"fmt"
"os"

Expand Down Expand Up @@ -33,10 +34,15 @@ type readFile func(name string) ([]byte, error)

// NewApply returns a subcommand to create bundles from directories
func NewApply() *cobra.Command {
return command.Command(&Apply{}, cobra.Command{
cmd := command.Command(&Apply{}, cobra.Command{
Use: "apply [flags] BUNDLE_NAME PATH...",
Short: "Create bundles from directories, and output them or apply them on a cluster",
})

fs := flag.NewFlagSet("", flag.ExitOnError)
ctrl.RegisterFlags(fs)
cmd.Flags().AddGoFlagSet(fs)
return cmd
}

type Apply struct {
Expand Down
17 changes: 15 additions & 2 deletions internal/cmd/cli/cleanup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package cli

import (
"errors"
"flag"
"fmt"
"math"
"strconv"
Expand Down Expand Up @@ -32,21 +33,33 @@ func NewCleanUp() *cobra.Command {
}

func NewClusterRegistration() *cobra.Command {
return command.Command(&ClusterRegistration{}, cobra.Command{
cmd := command.Command(&ClusterRegistration{}, cobra.Command{
Use: "clusterregistration [flags]",
Short: "Clean up outdated cluster registrations",
SilenceUsage: true,
SilenceErrors: true,
})

fs := flag.NewFlagSet("", flag.ExitOnError)
zopts.BindFlags(fs)
ctrl.RegisterFlags(fs)
cmd.Flags().AddGoFlagSet(fs)
return cmd
}

func NewGitjob() *cobra.Command {
return command.Command(&Gitjob{}, cobra.Command{
cmd := command.Command(&Gitjob{}, cobra.Command{
Use: "gitjob [flags]",
Short: "Clean up outdated git jobs",
SilenceUsage: true,
SilenceErrors: true,
})

fs := flag.NewFlagSet("", flag.ExitOnError)
zopts.BindFlags(fs)
ctrl.RegisterFlags(fs)
cmd.Flags().AddGoFlagSet(fs)
return cmd
}

type Cleanup struct {
Expand Down