Browse Source

Normalize assignment of Tiller defaults

The Tiller handler class already handles the default assignment of
Tiller host, port, and namespace. This change removes other locations
that are creating additional default values to avoid confusion.

Change-Id: If03150075281dd8b6362e817af075d5cd321aa77
changes/26/641126/13
Michael Beaver 2 months ago
parent
commit
dd062424bb
5 changed files with 10 additions and 22 deletions
  1. 2
    5
      armada/cli/apply.py
  2. 2
    2
      armada/cli/delete.py
  3. 2
    5
      armada/cli/rollback.py
  4. 2
    5
      armada/cli/test.py
  5. 2
    5
      armada/cli/tiller.py

+ 2
- 5
armada/cli/apply.py View File

@@ -95,16 +95,13 @@ SHORT_DESC = "Command installs manifest charts."
95 95
     default=[])
96 96
 @click.option('--tiller-host', help="Tiller host IP.", default=None)
97 97
 @click.option(
98
-    '--tiller-port',
99
-    help="Tiller host port.",
100
-    type=int,
101
-    default=CONF.tiller_port)
98
+    '--tiller-port', help="Tiller host port.", type=int, default=None)
102 99
 @click.option(
103 100
     '--tiller-namespace',
104 101
     '-tn',
105 102
     help="Tiller namespace.",
106 103
     type=str,
107
-    default=CONF.tiller_namespace)
104
+    default=None)
108 105
 @click.option(
109 106
     '--timeout',
110 107
     help="Specifies time to wait for each chart to fully "

+ 2
- 2
armada/cli/delete.py View File

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

+ 2
- 5
armada/cli/rollback.py View File

@@ -52,16 +52,13 @@ SHORT_DESC = "Command performs a release rollback."
52 52
 @click.option('--dry-run', help="Perform a dry-run rollback.", is_flag=True)
53 53
 @click.option('--tiller-host', help="Tiller host IP.", default=None)
54 54
 @click.option(
55
-    '--tiller-port',
56
-    help="Tiller host port.",
57
-    type=int,
58
-    default=CONF.tiller_port)
55
+    '--tiller-port', help="Tiller host port.", type=int, default=None)
59 56
 @click.option(
60 57
     '--tiller-namespace',
61 58
     '-tn',
62 59
     help="Tiller namespace.",
63 60
     type=str,
64
-    default=CONF.tiller_namespace)
61
+    default=None)
65 62
 @click.option(
66 63
     '--timeout',
67 64
     help="Specifies time to wait for rollback to complete.",

+ 2
- 5
armada/cli/test.py View File

@@ -59,16 +59,13 @@ SHORT_DESC = "Command tests releases."
59 59
 @click.option('--release', help="Helm release.", type=str)
60 60
 @click.option('--tiller-host', help="Tiller host IP.", default=None)
61 61
 @click.option(
62
-    '--tiller-port',
63
-    help="Tiller host port.",
64
-    type=int,
65
-    default=CONF.tiller_port)
62
+    '--tiller-port', help="Tiller host port.", type=int, default=None)
66 63
 @click.option(
67 64
     '--tiller-namespace',
68 65
     '-tn',
69 66
     help="Tiller Namespace.",
70 67
     type=str,
71
-    default=CONF.tiller_namespace)
68
+    default=None)
72 69
 @click.option(
73 70
     '--target-manifest',
74 71
     help=("The target manifest to run. Required for specifying "

+ 2
- 5
armada/cli/tiller.py View File

@@ -49,16 +49,13 @@ SHORT_DESC = "Command gets Tiller information."
49 49
 @tiller.command(name='tiller', help=DESC, short_help=SHORT_DESC)
50 50
 @click.option('--tiller-host', help="Tiller host IP.", default=None)
51 51
 @click.option(
52
-    '--tiller-port',
53
-    help="Tiller host port.",
54
-    type=int,
55
-    default=CONF.tiller_port)
52
+    '--tiller-port', help="Tiller host port.", type=int, default=None)
56 53
 @click.option(
57 54
     '--tiller-namespace',
58 55
     '-tn',
59 56
     help="Tiller namespace.",
60 57
     type=str,
61
-    default=CONF.tiller_namespace)
58
+    default=None)
62 59
 @click.option('--releases', help="List of deployed releases.", is_flag=True)
63 60
 @click.option('--status', help="Status of Tiller services.", is_flag=True)
64 61
 @click.option('--bearer-token', help="User bearer token.", default=None)

Loading…
Cancel
Save