airship
/
shipyard
Code Issues Proposed changes

Update Armada Operator/Dag 

1) Reduce number of retries from 10 to 3 as anything more than 3
   retries probably means that there is a genuine issue. This is
   based on feedbacks received from the CI/CD team.

2) We had started off setting a hard requirement for the 'armada apply'
   task in the Armada Operator (based on discussions with Alex in the
   past). While this did not create issues for 'deploy_site', it does
   mean that things will not work properly for 'update_site' if there
   is no update/changes to the existing armada manifest (since we will
   receive empty response in such scenario).  Hence we are changing the
   rule to issue a warning instead of raising an exception.

Change-Id: I289497b25d329466cf6936bddbd45df2d41f0c0e
This commit is contained in:
Anthony Lin 2018-03-08 04:15:41 +00:00 committed by Scott Hussey
parent 6b5d76eece
commit bef8eecac1
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
shipyard_airflow/dags/armada_deploy_site.py
View File

@ -45,7 +45,7 @@ def deploy_site_armada(parent_dag_name, child_dag_name, args):
action='armada_apply',
main_dag_name=parent_dag_name,
sub_dag_name=child_dag_name,
retries=10,
retries=3,
dag=dag)
# Get Helm Releases

10
shipyard_airflow/plugins/armada_operator.py
View File

@ -234,17 +234,15 @@ class ArmadaOperator(BaseOperator):
query=query)
# We will expect Armada to return the releases that it is
# deploying. An empty value for 'install' means that armada
# delploy has failed. Note that if we try and deploy the
# same release twice, we will end up with empty response on
# our second attempt and that will be treated as a failure
# scenario.
# deploying. Note that if we try and deploy the same release
# twice, we will end up with empty response as nothing has
# changed.
if armada_post_apply['message']['install']:
logging.info("Armada Apply Successfully Executed")
logging.info(armada_post_apply)
else:
logging.warning("No new changes/updates were detected")
logging.info(armada_post_apply)
raise AirflowException("Armada Apply Failed!")
def armada_get_releases(self, context, armada_client):
# Initialize Variables