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
This commit is contained in:
parent
20e270a58b
commit
c132915dcc
|
@ -69,6 +69,10 @@ path to the private key that includes the name of the key itself.""")),
|
||||||
'tiller_namespace',
|
'tiller_namespace',
|
||||||
default='kube-system',
|
default='kube-system',
|
||||||
help=utils.fmt('Namespace for the Tiller pod.')),
|
help=utils.fmt('Namespace for the Tiller pod.')),
|
||||||
|
cfg.StrOpt(
|
||||||
|
'tiller_host',
|
||||||
|
default=None,
|
||||||
|
help=utils.fmt('IP/hostname of the Tiller pod.')),
|
||||||
cfg.IntOpt(
|
cfg.IntOpt(
|
||||||
'tiller_port',
|
'tiller_port',
|
||||||
default=44134,
|
default=44134,
|
||||||
|
|
|
@ -82,7 +82,7 @@ class Tiller(object):
|
||||||
tiller_namespace=None,
|
tiller_namespace=None,
|
||||||
bearer_token=None,
|
bearer_token=None,
|
||||||
dry_run=None):
|
dry_run=None):
|
||||||
self.tiller_host = tiller_host
|
self.tiller_host = tiller_host or CONF.tiller_host
|
||||||
self.tiller_port = tiller_port or CONF.tiller_port
|
self.tiller_port = tiller_port or CONF.tiller_port
|
||||||
self.tiller_namespace = tiller_namespace or CONF.tiller_namespace
|
self.tiller_namespace = tiller_namespace or CONF.tiller_namespace
|
||||||
self.bearer_token = bearer_token
|
self.bearer_token = bearer_token
|
||||||
|
|
Loading…
Reference in New Issue