airship/shipyard
Code Issues Proposed changes

Merge "Allow to specify update manifest for armada apply"

Browse Source
This commit is contained in:
Zuul 2024-09-03 20:19:08 +00:00 committed by Gerrit Code Review
commit c8be88cfa2
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/bin/shipyard_airflow/shipyard_airflow/plugins/armada_post_apply.py
View File

@ -46,6 +46,11 @@ class ArmadaPostApplyOperator(ArmadaBaseOperator):
# Set up target manifest
self.dc = self.xcom_puller.get_deployment_configuration()
self.target_manifest = self.dc['armada.manifest']
if self.action_info['name'] == 'update_software':
update_manifest = self.dc.get(
'armada.update_manifest', "").strip()
if update_manifest:
self.target_manifest = update_manifest
# Update query dict with information of target_manifest
self.query['target_manifest'] = self.target_manifest
@ -54,7 +59,7 @@ class ArmadaPostApplyOperator(ArmadaBaseOperator):
timeout = self.dc['armada.post_apply_timeout']
# Execute Armada Apply to install the helm charts in sequence
LOG.info("Armada Apply")
LOG.info("Armada Apply, target manifest: ", self.target_manifest)
try:
armada_post_apply = self.armada_client.post_apply(