Skip to content
This repository has been archived by the owner on Nov 1, 2022. It is now read-only.

Commit

Permalink
Rename fluxctl setup to fluxctl install
Browse files Browse the repository at this point in the history
  • Loading branch information
2opremio committed Jul 24, 2019
1 parent ce2f74c commit 568ba2f
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -120,10 +120,10 @@ $(GOBIN)/helm-operator: $(HELM_OPERATOR_DEPS)
integration-test: all
test/bin/test-flux

cmd/fluxctl/setup-assets/bindata.go: deploy/*
cmd/fluxctl/install-assets/bindata.go: deploy/*
go run github.com/jteeuwen/go-bindata/go-bindata -mode 0600 -modtime 1 -pkg setup-assets -o $@ deploy/

check-generated: cmd/fluxctl/setup-assets/bindata.go
check-generated: cmd/fluxctl/install-assets/bindata.go
./bin/helm/update_codegen.sh
git diff --exit-code -- integrations/apis intergrations/client cmd/fluxctl/deploy-bindata.go

File renamed without changes.
12 changes: 6 additions & 6 deletions cmd/fluxctl/setup_cmd.go → cmd/fluxctl/install_cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/weaveworks/flux/git"
)

type setupOpts struct {
type installOpts struct {
gitURL string
gitBranch string
gitFluxPath string
Expand All @@ -21,13 +21,13 @@ type setupOpts struct {
amend bool
}

func newSetup() *setupOpts {
return &setupOpts{}
func newInstall() *installOpts {
return &installOpts{}
}

func (opts *setupOpts) Command() *cobra.Command {
func (opts *installOpts) Command() *cobra.Command {
cmd := &cobra.Command{
Use: "setup",
Use: "install",
Short: "Bootstrap Flux, installing it in the cluster and initializing its manifests in the Git repository",
RunE: opts.RunE,
}
Expand All @@ -50,7 +50,7 @@ func (opts *setupOpts) Command() *cobra.Command {
return cmd
}

func (opts *setupOpts) RunE(cmd *cobra.Command, args []string) error {
func (opts *installOpts) RunE(cmd *cobra.Command, args []string) error {
//0. Read and patch embedded deploy/* manifests with what was passed to ops

// TODO. BTW, it's probably easier to embed chart/flux/* and use `helm template` as a library instead
Expand Down
4 changes: 2 additions & 2 deletions cmd/fluxctl/root_cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ func (opts *rootOpts) Command() *cobra.Command {
newSave(opts).Command(),
newIdentity(opts).Command(),
newSync(opts).Command(),
newSetup().Command(),
newInstall().Command(),
)

return cmd
Expand All @@ -100,7 +100,7 @@ func (opts *rootOpts) PersistentPreRunE(cmd *cobra.Command, _ []string) error {
switch cmd.Use {
case "version":
fallthrough
case "setup":
case "install":
return nil
}

Expand Down

0 comments on commit 568ba2f

Please sign in to comment.