Browse Source

Enable Armada to acquire Tiller IP from config file

This adds a new configuration default to specify the Tiller host IP.
This is important to be able to configure in environments where
Armada is unable to find a Tiller pod.

Change-Id: I12fd9fbd16f2b591620e566affcf19f859ed1855
changes/37/633237/11
Nishant kumar 4 months ago
parent
commit
c132915dcc
2 changed files with 5 additions and 1 deletions
  1. 4
    0
      armada/conf/default.py
  2. 1
    1
      armada/handlers/tiller.py

+ 4
- 0
armada/conf/default.py View File

@@ -69,6 +69,10 @@ path to the private key that includes the name of the key itself.""")),
69 69
         'tiller_namespace',
70 70
         default='kube-system',
71 71
         help=utils.fmt('Namespace for the Tiller pod.')),
72
+    cfg.StrOpt(
73
+        'tiller_host',
74
+        default=None,
75
+        help=utils.fmt('IP/hostname of the Tiller pod.')),
72 76
     cfg.IntOpt(
73 77
         'tiller_port',
74 78
         default=44134,

+ 1
- 1
armada/handlers/tiller.py View File

@@ -82,7 +82,7 @@ class Tiller(object):
82 82
                  tiller_namespace=None,
83 83
                  bearer_token=None,
84 84
                  dry_run=None):
85
-        self.tiller_host = tiller_host
85
+        self.tiller_host = tiller_host or CONF.tiller_host
86 86
         self.tiller_port = tiller_port or CONF.tiller_port
87 87
         self.tiller_namespace = tiller_namespace or CONF.tiller_namespace
88 88
         self.bearer_token = bearer_token

Loading…
Cancel
Save