airship/shipyard
Code Issues Proposed changes

Add update_manifest parameter to the Deployment config

Browse Source 
Change-Id: Ib32d393308b25953ac7e4e8b2fb0a0d0d5ca3c4e
Signed-off-by: Ruslan Aliev <raliev@mirantis.com>
This commit is contained in:
Ruslan Aliev 2025-03-19 11:08:57 -05:00
parent 3137dd1fae
commit 7d384e1723
3 changed files with 5 additions and 5 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

@ -47,10 +47,7 @@ class ArmadaPostApplyOperator(ArmadaBaseOperator):
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
self.target_manifest = self.dc['armada.update_manifest']
# Update query dict with information of target_manifest
self.query['target_manifest'] = self.target_manifest
@ -59,7 +56,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, target manifest: ", self.target_manifest)
LOG.info("Armada Apply, target manifest: %s", self.target_manifest)
try:
armada_post_apply = self.armada_client.post_apply(

1
src/bin/shipyard_airflow/shipyard_airflow/plugins/deployment_configuration_operator.py
View File

@ -74,6 +74,7 @@ class DeploymentConfigurationOperator(BaseOperator):
"armada.get_releases_timeout": 300,
"armada.get_status_timeout": 300,
"armada.manifest": "full-site",
"armada.update_manifest": "full-site",
"armada.post_apply_timeout": 2700,
"armada.validate_design_timeout": 600
}

2
src/bin/shipyard_airflow/shipyard_airflow/schemas/deploymentConfiguration.yaml
View File

@ -73,6 +73,8 @@ data:
type: 'integer'
manifest:
type: 'string'
update_manifest:
type: 'string'
post_apply_timeout:
type: 'integer'
validate_design_timeout: