diff --git a/cmd/werf/common/cmd_data.go b/cmd/werf/common/cmd_data.go index dec6d6ee22..8dd8d4027f 100644 --- a/cmd/werf/common/cmd_data.go +++ b/cmd/werf/common/cmd_data.go @@ -109,10 +109,10 @@ func (cmdData *CmdData) SetupWithoutImages(cmd *cobra.Command) { func (cmdData *CmdData) SetupDisableDefaultValues(cmd *cobra.Command) { cmdData.DisableDefaultValues = new(bool) - cmd.Flags().BoolVarP(cmdData.DisableDefaultValues, "disable-default-values", "", false, `Do not use values from the default .helm/values.yaml file`) + cmd.Flags().BoolVarP(cmdData.DisableDefaultValues, "disable-default-values", "", util.GetBoolEnvironmentDefaultFalse("WERF_DISABLE_DEFAULT_VALUES"), `Do not use values from the default .helm/values.yaml file (default $WERF_DISABLE_DEFAULT_VALUES or false)`) } func (cmdData *CmdData) SetupDisableDefaultSecretValues(cmd *cobra.Command) { cmdData.DisableDefaultSecretValues = new(bool) - cmd.Flags().BoolVarP(cmdData.DisableDefaultSecretValues, "disable-default-secret-values", "", false, `Do not use secret values from the default .helm/secret-values.yaml file`) + cmd.Flags().BoolVarP(cmdData.DisableDefaultSecretValues, "disable-default-secret-values", "", util.GetBoolEnvironmentDefaultFalse("WERF_DISABLE_DEFAULT_SECRET_VALUES"), `Do not use secret values from the default .helm/secret-values.yaml file (default $WERF_DISABLE_DEFAULT_SECRET_VALUES or false)`) } diff --git a/docs/_includes/reference/cli/werf_bundle_export.md b/docs/_includes/reference/cli/werf_bundle_export.md index 116a8ed325..d9b5e876bf 100644 --- a/docs/_includes/reference/cli/werf_bundle_export.md +++ b/docs/_includes/reference/cli/werf_bundle_export.md @@ -75,7 +75,8 @@ werf bundle export [IMAGE_NAME...] [options] Disable auto host cleanup procedure in main werf commands like werf-build, werf-converge and other (default disabled or WERF_DISABLE_AUTO_HOST_CLEANUP) --disable-default-values=false - Do not use values from the default .helm/values.yaml file + Do not use values from the default .helm/values.yaml file (default + $WERF_DISABLE_DEFAULT_VALUES or false) --docker-config='' Specify docker config directory path. Default $WERF_DOCKER_CONFIG or $DOCKER_CONFIG or ~/.docker (in the order of priority) diff --git a/docs/_includes/reference/cli/werf_bundle_publish.md b/docs/_includes/reference/cli/werf_bundle_publish.md index e179c5ff1c..eda1397793 100644 --- a/docs/_includes/reference/cli/werf_bundle_publish.md +++ b/docs/_includes/reference/cli/werf_bundle_publish.md @@ -84,7 +84,8 @@ werf bundle publish [IMAGE_NAME...] [options] Disable auto host cleanup procedure in main werf commands like werf-build, werf-converge and other (default disabled or WERF_DISABLE_AUTO_HOST_CLEANUP) --disable-default-values=false - Do not use values from the default .helm/values.yaml file + Do not use values from the default .helm/values.yaml file (default + $WERF_DISABLE_DEFAULT_VALUES or false) --docker-config='' Specify docker config directory path. Default $WERF_DOCKER_CONFIG or $DOCKER_CONFIG or ~/.docker (in the order of priority) diff --git a/docs/_includes/reference/cli/werf_converge.md b/docs/_includes/reference/cli/werf_converge.md index 156d78c8f7..498e2bf2e2 100644 --- a/docs/_includes/reference/cli/werf_converge.md +++ b/docs/_includes/reference/cli/werf_converge.md @@ -114,9 +114,11 @@ werf converge --repo registry.mydomain.com/web --env production Disable auto host cleanup procedure in main werf commands like werf-build, werf-converge and other (default disabled or WERF_DISABLE_AUTO_HOST_CLEANUP) --disable-default-secret-values=false - Do not use secret values from the default .helm/secret-values.yaml file + Do not use secret values from the default .helm/secret-values.yaml file (default + $WERF_DISABLE_DEFAULT_SECRET_VALUES or false) --disable-default-values=false - Do not use values from the default .helm/values.yaml file + Do not use values from the default .helm/values.yaml file (default + $WERF_DISABLE_DEFAULT_VALUES or false) --docker-config='' Specify docker config directory path. Default $WERF_DOCKER_CONFIG or $DOCKER_CONFIG or ~/.docker (in the order of priority) diff --git a/docs/_includes/reference/cli/werf_kubectl_get.md b/docs/_includes/reference/cli/werf_kubectl_get.md index ace239acc3..4d50dacded 100644 --- a/docs/_includes/reference/cli/werf_kubectl_get.md +++ b/docs/_includes/reference/cli/werf_kubectl_get.md @@ -85,7 +85,7 @@ werf kubectl get [(-o|--output=)json|yaml|name|go-template|go-template-file|temp print headers). -o, --output='' Output format. One of: json|yaml|name|go-template|go-template-file|template|templatefile - |jsonpath|jsonpath-as-json|jsonpath-file|custom-columns-file|custom-columns|wide See + |jsonpath|jsonpath-as-json|jsonpath-file|custom-columns|custom-columns-file|wide See custom columns [https://kubernetes.io/docs/reference/kubectl/overview/#custom-columns], golang template [http://golang.org/pkg/text/template/#pkg-overview] and jsonpath template [https://kubernetes.io/docs/reference/kubectl/jsonpath/]. diff --git a/docs/_includes/reference/cli/werf_render.md b/docs/_includes/reference/cli/werf_render.md index 542c67f843..cc1a0def53 100644 --- a/docs/_includes/reference/cli/werf_render.md +++ b/docs/_includes/reference/cli/werf_render.md @@ -64,9 +64,11 @@ werf render [IMAGE_NAME...] [options] Use specified project directory where project’s werf.yaml and other configuration files should reside (default $WERF_DIR or current working directory) --disable-default-secret-values=false - Do not use secret values from the default .helm/secret-values.yaml file + Do not use secret values from the default .helm/secret-values.yaml file (default + $WERF_DISABLE_DEFAULT_SECRET_VALUES or false) --disable-default-values=false - Do not use values from the default .helm/values.yaml file + Do not use values from the default .helm/values.yaml file (default + $WERF_DISABLE_DEFAULT_VALUES or false) --docker-config='' Specify docker config directory path. Default $WERF_DOCKER_CONFIG or $DOCKER_CONFIG or ~/.docker (in the order of priority)