airship/armada
Code Issues Proposed changes

Fixes bug where tiller always passes 'wait'

Browse Source 
-Fixes wait bug
-Updates tiller and hapi to 2.5
This commit is contained in:
Tim Heyer 2017-07-11 19:18:51 +00:00 committed by Alexis Rivera DeLa Torre
parent 818aba66b2
commit 4bda09e3fd
4 changed files with 53 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
armada/handlers/armada.py
View File

@ -111,12 +111,12 @@ class Armada(object):
release[1]) release[1])
for entry in self.config['armada']['charts']: for entry in self.config['armada']['charts']:
chart_wait = self.wait
desc = entry.get('description', 'A Chart Group') desc = entry.get('description', 'A Chart Group')
chart_group = entry.get('chart_group', []) chart_group = entry.get('chart_group', [])
if entry.get('sequenced', False): if entry.get('sequenced', False):
self.wait = True chart_wait = True
LOG.info('Deploying: %s', desc) LOG.info('Deploying: %s', desc)
@ -132,7 +132,7 @@ class Armada(object):
# retrieve appropriate timeout value if 'wait' is specified # retrieve appropriate timeout value if 'wait' is specified
chart_timeout = None chart_timeout = None
if self.wait: if chart_wait:
if getattr(chart, 'timeout', None): if getattr(chart, 'timeout', None):
chart_timeout = chart.timeout chart_timeout = chart.timeout
else: else:
@ -191,7 +191,7 @@ class Armada(object):
disable_hooks=chart. disable_hooks=chart.
upgrade.no_hooks, upgrade.no_hooks,
values=yaml.safe_dump(values), values=yaml.safe_dump(values),
wait=self.wait, wait=chart_wait,
timeout=chart_timeout) timeout=chart_timeout)
# process install # process install
@ -203,7 +203,7 @@ class Armada(object):
chart.namespace, chart.namespace,
prefix, prefix,
values=yaml.safe_dump(values), values=yaml.safe_dump(values),
wait=self.wait, wait=chart_wait,
timeout=chart_timeout) timeout=chart_timeout)
LOG.debug("Cleaning up chart source in %s", LOG.debug("Cleaning up chart source in %s",

6
armada/handlers/tiller.py
View File

@ -25,7 +25,7 @@ from oslo_config import cfg
from oslo_log import log as logging from oslo_log import log as logging
TILLER_PORT = 44134 TILLER_PORT = 44134
TILLER_VERSION = b'2.4.2' TILLER_VERSION = b'2.5.0'
TILLER_TIMEOUT = 300 TILLER_TIMEOUT = 300
RELEASE_LIMIT = 64 RELEASE_LIMIT = 64
@ -188,6 +188,8 @@ class Tiller(object):
''' '''
Update a Helm Release Update a Helm Release
''' '''
LOG.debug("wait: %s", wait)
LOG.debug("timeout: %s", timeout)
if values is None: if values is None:
values = Config(raw='') values = Config(raw='')
@ -217,6 +219,8 @@ class Tiller(object):
''' '''
Create a Helm Release Create a Helm Release
''' '''
LOG.debug("wait: %s", wait)
LOG.debug("timeout: %s", timeout)
if values is None: if values is None:
values = Config(raw='') values = Config(raw='')

70
hapi/services/tiller_pb2.py
View File

File diff suppressed because one or more lines are too long

2
tools/helm-hapi.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
git clone https://github.com/kubernetes/helm ./helm -b release-$1 git clone https://github.com/kubernetes/helm ./helm -b $1
python -m grpc_tools.protoc -I helm/_proto --python_out=. --grpc_python_out=. helm/_proto/hapi/chart/* python -m grpc_tools.protoc -I helm/_proto --python_out=. --grpc_python_out=. helm/_proto/hapi/chart/*
python -m grpc_tools.protoc -I helm/_proto --python_out=. --grpc_python_out=. helm/_proto/hapi/services/* python -m grpc_tools.protoc -I helm/_proto --python_out=. --grpc_python_out=. helm/_proto/hapi/services/*