starlingx/root
Code Issues Proposed changes

Merge "helm_chart_modify.py: remove break"

Browse Source
This commit is contained in:
Zuul 2020-09-19 04:19:50 +00:00 committed by Gerrit Code Review
commit e5f5b25e95
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build-tools/helm_chart_modify.py
View File

@ -120,11 +120,9 @@ def modify_yaml(document, grand_parent_key, parent_key, new_image_dict):
continue continue
if grand_parent_key == 'images' and parent_key == 'tags': if grand_parent_key == 'images' and parent_key == 'tags':
match_found = False
name = get_image_name(document[k]) name = get_image_name(document[k])
if name in new_image_dict: if name in new_image_dict:
modify_image_and_tag(document, k, '', new_image_dict[name]) modify_image_and_tag(document, k, '', new_image_dict[name])
break
else: else:
# copy values that are not keyed by image_key or tag_key # copy values that are not keyed by image_key or tag_key
if k not in (image_key, tag_key): if k not in (image_key, tag_key):
@ -135,11 +133,9 @@ def modify_yaml(document, grand_parent_key, parent_key, new_image_dict):
k = image_key k = image_key
if k in document and not isinstance(document[k], dict): if k in document and not isinstance(document[k], dict):
match_found = False
name = get_image_name(document[k]) name = get_image_name(document[k])
if name in new_image_dict: if name in new_image_dict:
modify_image_and_tag(document, k, tag_key, new_image_dict[name]) modify_image_and_tag(document, k, tag_key, new_image_dict[name])
break
def main(argv): def main(argv):