From 2e1000c31a9598fbdd747ac12e5eba46958b20eb Mon Sep 17 00:00:00 2001 From: Stefan Prodan Date: Fri, 11 Mar 2022 09:19:56 +0200 Subject: [PATCH] Add components-extra example usage to CLI help Signed-off-by: Stefan Prodan --- cmd/flux/bootstrap.go | 2 +- cmd/flux/install.go | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/cmd/flux/bootstrap.go b/cmd/flux/bootstrap.go index 278da91a..b4b319ef 100644 --- a/cmd/flux/bootstrap.go +++ b/cmd/flux/bootstrap.go @@ -88,7 +88,7 @@ func init() { bootstrapCmd.PersistentFlags().StringSliceVar(&bootstrapArgs.defaultComponents, "components", rootArgs.defaults.Components, "list of components, accepts comma-separated values") bootstrapCmd.PersistentFlags().StringSliceVar(&bootstrapArgs.extraComponents, "components-extra", nil, - "list of components in addition to those supplied or defaulted, accepts comma-separated values") + "list of components in addition to those supplied or defaulted, accepts values such as 'image-reflector-controller,image-automation-controller'") bootstrapCmd.PersistentFlags().StringVar(&bootstrapArgs.registry, "registry", "ghcr.io/fluxcd", "container registry where the toolkit images are published") diff --git a/cmd/flux/install.go b/cmd/flux/install.go index 9032929b..11e6ee77 100644 --- a/cmd/flux/install.go +++ b/cmd/flux/install.go @@ -37,10 +37,13 @@ var installCmd = &cobra.Command{ Long: `The install command deploys Flux in the specified namespace. If a previous version is installed, then an in-place upgrade will be performed.`, Example: ` # Install the latest version in the flux-system namespace - flux install --version=latest --namespace=flux-system + flux install --namespace=flux-system - # Install a specific version and a series of components - flux install --version=v0.0.7 --components="source-controller,kustomize-controller" + # Install a specific series of components + flux install --components="source-controller,kustomize-controller" + + # Install all components including the image automation ones + flux install --components-extra="image-reflector-controller,image-automation-controller" # Install Flux onto tainted Kubernetes nodes flux install --toleration-keys=node.kubernetes.io/dedicated-to-flux @@ -84,7 +87,7 @@ func init() { installCmd.Flags().StringSliceVar(&installArgs.defaultComponents, "components", rootArgs.defaults.Components, "list of components, accepts comma-separated values") installCmd.Flags().StringSliceVar(&installArgs.extraComponents, "components-extra", nil, - "list of components in addition to those supplied or defaulted, accepts comma-separated values") + "list of components in addition to those supplied or defaulted, accepts values such as 'image-reflector-controller,image-automation-controller'") installCmd.Flags().StringVar(&installArgs.manifestsPath, "manifests", "", "path to the manifest directory") installCmd.Flags().StringVar(&installArgs.registry, "registry", rootArgs.defaults.Registry, "container registry where the toolkit images are published")