From 913f79145e290831d2546409def66dce8dd4710e Mon Sep 17 00:00:00 2001 From: Ruslan Aliev Date: Sat, 9 Mar 2024 18:54:56 -0600 Subject: [PATCH] Allow to specify update manifest for armada apply Signed-off-by: Ruslan Aliev Change-Id: I47800fad578c908fe7f8e2cda807ddc99fef5b36 --- .../shipyard_airflow/plugins/armada_post_apply.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/bin/shipyard_airflow/shipyard_airflow/plugins/armada_post_apply.py b/src/bin/shipyard_airflow/shipyard_airflow/plugins/armada_post_apply.py index b78f9d4f..8aa4cfc6 100644 --- a/src/bin/shipyard_airflow/shipyard_airflow/plugins/armada_post_apply.py +++ b/src/bin/shipyard_airflow/shipyard_airflow/plugins/armada_post_apply.py @@ -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(