Move cmd/fluxctl/install to install/

fluxcd · Jul 25, 2019 · 4e3ba8a · 4e3ba8a
1 parent 974d203
commit 4e3ba8a
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 11 deletions.
diff --git a/Makefile b/Makefile
@@ -120,10 +120,10 @@ $(GOBIN)/helm-operator: $(HELM_OPERATOR_DEPS)
 integration-test: all
 	test/bin/test-flux
 
-cmd/fluxctl/install/generated_templates.gogen.go: cmd/fluxctl/install/templates/* cmd/fluxctl/install/generate.go
-	cd cmd/fluxctl/install && go run generate.go
+install/generated_templates.gogen.go: install/templates/*
+	cd install && go run generate.go
 
-check-generated: cmd/fluxctl/install/generated_templates.gogen.go
+check-generated: install/generated_templates.gogen.go
 	./bin/helm/update_codegen.sh
-	git diff --exit-code -- integrations/apis intergrations/client cmd/fluxctl/install/generated_templates.gogen.go
+	git diff --exit-code -- integrations/apis intergrations/client install/generated_templates.gogen.go
 
diff --git a/cmd/fluxctl/install_cmd.go b/cmd/fluxctl/install_cmd.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/weaveworks/flux/cmd/fluxctl/install"
+	"github.com/weaveworks/flux/install"
 )
 
 type installOpts install.TemplateParameters

diff --git a/cmd/fluxctl/install/generate.go → install/generate.go b/cmd/fluxctl/install/generate.go → install/generate.go
diff --git a/...xctl/install/generated_templates.gogen.go → install/generated_templates.gogen.go b/...xctl/install/generated_templates.gogen.go → install/generated_templates.gogen.go
diff --git a/cmd/fluxctl/install/install.go → install/install.go b/cmd/fluxctl/install/install.go → install/install.go
diff --git a/cmd/fluxctl/install/install_test.go → install/install_test.go b/cmd/fluxctl/install/install_test.go → install/install_test.go
diff --git a/.../install/templates/flux-account.yaml.tmpl → install/templates/flux-account.yaml.tmpl b/.../install/templates/flux-account.yaml.tmpl → install/templates/flux-account.yaml.tmpl
diff --git a/...stall/templates/flux-deployment.yaml.tmpl → install/templates/flux-deployment.yaml.tmpl b/...stall/templates/flux-deployment.yaml.tmpl → install/templates/flux-deployment.yaml.tmpl
diff --git a/...l/install/templates/flux-secret.yaml.tmpl → install/templates/flux-secret.yaml.tmpl b/...l/install/templates/flux-secret.yaml.tmpl → install/templates/flux-secret.yaml.tmpl
diff --git a/.../install/templates/memcache-dep.yaml.tmpl → install/templates/memcache-dep.yaml.tmpl b/.../install/templates/memcache-dep.yaml.tmpl → install/templates/memcache-dep.yaml.tmpl
diff --git a/.../install/templates/memcache-svc.yaml.tmpl → install/templates/memcache-svc.yaml.tmpl b/.../install/templates/memcache-svc.yaml.tmpl → install/templates/memcache-svc.yaml.tmpl