Merge pull request #2583 from sebikul/feature/manifest-generation-flag

Added manifest generation flag
fluxcd · Nov 6, 2019 · 3275577 · 3275577
2 parents 4d40750 + aa4dede
commit 3275577
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 2 deletions.
diff --git a/cmd/fluxctl/install_cmd.go b/cmd/fluxctl/install_cmd.go
@@ -44,6 +44,8 @@ fluxctl install --git-url '[email protected]:<your username>/flux-get-started' | ku
 		"Email to use as git committer")
 	cmd.Flags().BoolVar(&opts.GitReadOnly, "git-readonly", false,
 		"Tell flux it has readonly access to the repo")
+	cmd.Flags().BoolVar(&opts.ManifestGeneration, "manifest-generation", false,
+		"Whether to enable manifest generation")
 	cmd.Flags().StringVar(&opts.Namespace, "namespace", getKubeConfigContextNamespace("default"),
 		"Cluster namespace where to install flux")
 	cmd.Flags().StringVarP(&opts.outputDir, "output-dir", "o", "", "a directory in which to write individual manifests, rather than printing to stdout")

diff --git a/deploy/flux-deployment.yaml b/deploy/flux-deployment.yaml
@@ -167,6 +167,9 @@ spec:
         # - --connect=wss://cloud.weave.works/api/flux
         # - --token=abc123abc123abc123abc123
 
+        # Enable manifest generation (default `false`)
+        # - --manifest-generation=false
+
         # Serve /metrics endpoint at different port;
         # make sure to set prometheus' annotation to scrape the port value.
         - --listen-metrics=:3031

diff --git a/pkg/install/generated_templates.gogen.go b/pkg/install/generated_templates.gogen.go
diff --git a/pkg/install/install.go b/pkg/install/install.go
@@ -23,6 +23,7 @@ type TemplateParameters struct {
 	GitEmail           string
 	GitReadOnly        bool
 	Namespace          string
+	ManifestGeneration bool
 	AdditionalFluxArgs []string
 }
 

diff --git a/pkg/install/install_test.go b/pkg/install/install_test.go
@@ -36,6 +36,7 @@ func TestFillInTemplatesAllParameters(t *testing.T) {
 		GitEmail:           "[email protected]",
 		Namespace:          "flux",
 		GitReadOnly:        true,
+		ManifestGeneration: true,
 		AdditionalFluxArgs: []string{"arg1=foo", "arg2=bar"},
 	})
 

diff --git a/pkg/install/templates/flux-deployment.yaml.tmpl b/pkg/install/templates/flux-deployment.yaml.tmpl
@@ -172,6 +172,13 @@ spec:
         # - --connect=wss://cloud.weave.works/api/flux
         # - --token=abc123abc123abc123abc123
 
+        # Enable manifest generation (default `false`)
+{{- if .ManifestGeneration }}
+        - --manifest-generation=true
+{{- else }}
+        # - --manifest-generation=false
+{{- end }}
+
         # Serve /metrics endpoint at different port;
         # make sure to set prometheus' annotation to scrape the port value.
         - --listen-metrics=:3031