airship/armada
Code Issues Proposed changes

[bug] fixing-chart-diff-check

Browse Source 
* replacing dup var with correct
* small misname fix
* fixing missing prefix
This commit is contained in:
gardlt 2017-04-19 21:24:04 -05:00
parent 3b09981597
commit e01f4966b8
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/PULL_REQUEST_TEMPLATE.md vendored
View File

@ -1,5 +1,5 @@
<!-- <!--
Thanks for contributing to OpenStack-Helm! Please be thorough Thanks for contributing to Armada! Please be thorough
when filling out your pull request. If the purpose for your pull when filling out your pull request. If the purpose for your pull
request is not clear, we may close your pull request and ask you request is not clear, we may close your pull request and ask you
to resubmit. to resubmit.

5
armada/armada.py
View File

@ -93,7 +93,7 @@ class Armada(object):
# do actual update # do actual update
self.tiller.update_release(protoc_chart, self.args.dry_run, self.tiller.update_release(protoc_chart, self.args.dry_run,
chart.release_name, chart.namespace, chart.release_name, chart.namespace,
pre_actions, post_actions, prefix, pre_actions, post_actions,
disable_hooks=chart. disable_hooks=chart.
upgrade.no_hooks, upgrade.no_hooks,
values=yaml.safe_dump(values)) values=yaml.safe_dump(values))
@ -106,6 +106,7 @@ class Armada(object):
self.args.dry_run, self.args.dry_run,
chart.release_name, chart.release_name,
chart.namespace, chart.namespace,
prefix,
values=yaml.safe_dump(values)) values=yaml.safe_dump(values))
except Exception: except Exception:
LOG.error("Install failed, continuing.") LOG.error("Install failed, continuing.")
@ -145,4 +146,4 @@ class Armada(object):
for line in values_diff: for line in values_diff:
LOG.debug(line) LOG.debug(line)
return (len(chart_diff) > 0) or (len(chart_diff) > 0) return (len(chart_diff) > 0) or (len(values_diff) > 0)

4
armada/handlers/tiller.py
View File

@ -134,7 +134,7 @@ class Tiller(object):
except Exception: except Exception:
LOG.debug("POST: Could not create anything, please check yaml") LOG.debug("POST: Could not create anything, please check yaml")
def update_release(self, chart, dry_run, name, namespace, def update_release(self, chart, dry_run, name, namespace, prefix,
pre_actions=None, post_actions=None, pre_actions=None, post_actions=None,
disable_hooks=False, values=None): disable_hooks=False, values=None):
''' '''
@ -155,7 +155,7 @@ class Tiller(object):
dry_run=dry_run, dry_run=dry_run,
disable_hooks=disable_hooks, disable_hooks=disable_hooks,
values=values, values=values,
name=name) name="{}-{}".format(prefix, name))
stub.UpdateRelease(release_request, self.timeout, stub.UpdateRelease(release_request, self.timeout,
metadata=self.metadata) metadata=self.metadata)