Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix: WERF_DISABLE_DEFAULT_SECRET_VALUES and WERF_DISABLE_DEFAULT_VALU… 
…ES support for corresponding options

Signed-off-by: Timofey Kirillov <timofey.kirillov@flant.com>
  • Loading branch information
@distorhead
distorhead committed Oct 17, 2022
1 parent 11da725 commit 647700a
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 9 deletions.
4 changes: 2 additions & 2 deletions cmd/werf/common/cmd_data.go
View file
Expand Up @@ -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)`)
}
3 changes: 2 additions & 1 deletion docs/_includes/reference/cli/werf_bundle_export.md
View file
Expand Up @@ -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)
Expand Down
3 changes: 2 additions & 1 deletion docs/_includes/reference/cli/werf_bundle_publish.md
View file
Expand Up @@ -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)
Expand Down
6 changes: 4 additions & 2 deletions docs/_includes/reference/cli/werf_converge.md
View file
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion docs/_includes/reference/cli/werf_kubectl_get.md
View file
Expand Up @@ -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/].
Expand Down
6 changes: 4 additions & 2 deletions docs/_includes/reference/cli/werf_render.md
View file
Expand Up @@ -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)
Expand Down

0 comments on commit 647700a

Please sign in to comment.