Fix --enable-chart-cleanup option
The current logic to find valid releases is incorrect resulting in zero valid releases being found and all currently installed chart releases with the release_prefix being removed. The data passed to this method is a list of chart groups with the following format: [{'data': {'chart_group': [{'data': {'chart_name': 'ingress', 'release': 'kube-system-ingress' ... This update adapts the code to the expected format of the data provided. Change-Id: Ib285cdf21283b8ec73d583fb107ba49514a9dda7 Signed-off-by: Robert Church <robert.church@windriver.com>
This commit is contained in:
parent
b787c418e3
commit
8a1638098f
|
@ -279,16 +279,16 @@ class Armada(object):
|
||||||
LOG.debug('Removing temp chart directory: %s', chart_dir)
|
LOG.debug('Removing temp chart directory: %s', chart_dir)
|
||||||
source.source_cleanup(chart_dir)
|
source.source_cleanup(chart_dir)
|
||||||
|
|
||||||
def _chart_cleanup(self, prefix, charts, msg):
|
def _chart_cleanup(self, prefix, chart_groups, msg):
|
||||||
LOG.info('Processing chart cleanup to remove unspecified releases.')
|
LOG.info('Processing chart cleanup to remove unspecified releases.')
|
||||||
|
|
||||||
valid_releases = []
|
valid_releases = []
|
||||||
for gchart in charts:
|
for group in chart_groups:
|
||||||
for chart in gchart.get(const.KEYWORD_CHARTS, []):
|
group_data = group.get(const.KEYWORD_DATA, {})
|
||||||
|
for chart in group_data.get(const.KEYWORD_CHARTS, []):
|
||||||
|
chart_data = chart.get(const.KEYWORD_DATA, {})
|
||||||
valid_releases.append(
|
valid_releases.append(
|
||||||
release_prefixer(
|
release_prefixer(prefix, chart_data.get('release')))
|
||||||
prefix,
|
|
||||||
chart.get('chart', {}).get('release')))
|
|
||||||
|
|
||||||
actual_releases = [x.name for x in self.tiller.list_releases()]
|
actual_releases = [x.name for x in self.tiller.list_releases()]
|
||||||
release_diff = list(set(actual_releases) - set(valid_releases))
|
release_diff = list(set(actual_releases) - set(valid_releases))
|
||||||
|
|
Loading…
Reference in New Issue