Merge "Normalize assignment of Tiller defaults"

This commit is contained in:
Zuul 2019-03-12 19:37:25 +00:00 committed by Gerrit Code Review
commit f126275b45
5 changed files with 10 additions and 22 deletions

View File

@ -95,16 +95,13 @@ SHORT_DESC = "Command installs manifest charts."
default=[])
@click.option('--tiller-host', help="Tiller host IP.", default=None)
@click.option(
'--tiller-port',
help="Tiller host port.",
type=int,
default=CONF.tiller_port)
'--tiller-port', help="Tiller host port.", type=int, default=None)
@click.option(
'--tiller-namespace',
'-tn',
help="Tiller namespace.",
type=str,
default=CONF.tiller_namespace)
default=None)
@click.option(
'--timeout',
help="Specifies time to wait for each chart to fully "

View File

@ -63,9 +63,9 @@ SHORT_DESC = "Command deletes releases."
'--releases', help="Comma-separated list of release names.", type=str)
@click.option(
'--no-purge', help="Deletes release without purge option.", is_flag=True)
@click.option('--tiller-host', help="Tiller host IP.")
@click.option('--tiller-host', help="Tiller host IP.", default=None)
@click.option(
'--tiller-port', help="Tiller host port.", type=int, default=44134)
'--tiller-port', help="Tiller host port.", type=int, default=None)
@click.option('--bearer-token', help="User Bearer token.", default=None)
@click.option('--debug', help="Enable debug logging.", is_flag=True)
@click.pass_context

View File

@ -52,16 +52,13 @@ SHORT_DESC = "Command performs a release rollback."
@click.option('--dry-run', help="Perform a dry-run rollback.", is_flag=True)
@click.option('--tiller-host', help="Tiller host IP.", default=None)
@click.option(
'--tiller-port',
help="Tiller host port.",
type=int,
default=CONF.tiller_port)
'--tiller-port', help="Tiller host port.", type=int, default=None)
@click.option(
'--tiller-namespace',
'-tn',
help="Tiller namespace.",
type=str,
default=CONF.tiller_namespace)
default=None)
@click.option(
'--timeout',
help="Specifies time to wait for rollback to complete.",

View File

@ -59,16 +59,13 @@ SHORT_DESC = "Command tests releases."
@click.option('--release', help="Helm release.", type=str)
@click.option('--tiller-host', help="Tiller host IP.", default=None)
@click.option(
'--tiller-port',
help="Tiller host port.",
type=int,
default=CONF.tiller_port)
'--tiller-port', help="Tiller host port.", type=int, default=None)
@click.option(
'--tiller-namespace',
'-tn',
help="Tiller Namespace.",
type=str,
default=CONF.tiller_namespace)
default=None)
@click.option(
'--target-manifest',
help=("The target manifest to run. Required for specifying "

View File

@ -49,16 +49,13 @@ SHORT_DESC = "Command gets Tiller information."
@tiller.command(name='tiller', help=DESC, short_help=SHORT_DESC)
@click.option('--tiller-host', help="Tiller host IP.", default=None)
@click.option(
'--tiller-port',
help="Tiller host port.",
type=int,
default=CONF.tiller_port)
'--tiller-port', help="Tiller host port.", type=int, default=None)
@click.option(
'--tiller-namespace',
'-tn',
help="Tiller namespace.",
type=str,
default=CONF.tiller_namespace)
default=None)
@click.option('--releases', help="List of deployed releases.", is_flag=True)
@click.option('--status', help="Status of Tiller services.", is_flag=True)
@click.option('--bearer-token', help="User bearer token.", default=None)