From dd062424bbc4e54bb797dec48baa6a1095cfd9f1 Mon Sep 17 00:00:00 2001
From: Michael Beaver <michaelbeaver64@gmail.com>
Date: Tue, 5 Mar 2019 14:22:50 -0600
Subject: [PATCH] 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
---
 armada/cli/apply.py    | 7 ++-----
 armada/cli/delete.py   | 4 ++--
 armada/cli/rollback.py | 7 ++-----
 armada/cli/test.py     | 7 ++-----
 armada/cli/tiller.py   | 7 ++-----
 5 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/armada/cli/apply.py b/armada/cli/apply.py
index 62f8d70a..ee56f29e 100644
--- a/armada/cli/apply.py
+++ b/armada/cli/apply.py
@@ -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 "
diff --git a/armada/cli/delete.py b/armada/cli/delete.py
index 292dba0f..f36cfdfe 100644
--- a/armada/cli/delete.py
+++ b/armada/cli/delete.py
@@ -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
diff --git a/armada/cli/rollback.py b/armada/cli/rollback.py
index 8923544d..f7016865 100644
--- a/armada/cli/rollback.py
+++ b/armada/cli/rollback.py
@@ -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.",
diff --git a/armada/cli/test.py b/armada/cli/test.py
index 14efb832..315374a6 100644
--- a/armada/cli/test.py
+++ b/armada/cli/test.py
@@ -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 "
diff --git a/armada/cli/tiller.py b/armada/cli/tiller.py
index 22a3b15c..d84f2a08 100644
--- a/armada/cli/tiller.py
+++ b/armada/cli/tiller.py
@@ -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)