From 1fad66327c437d9ae3b00c04f4758bc2ade3e698 Mon Sep 17 00:00:00 2001 From: Laurent Rochette Date: Thu, 10 Aug 2023 19:23:21 +0200 Subject: [PATCH 1/2] #637: exit with error when not healthy Signed-off-by: Laurent Rochette --- incubating/argo-cd-sync/argocd_sync.py | 5 +++-- incubating/argo-cd-sync/step.yaml | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/incubating/argo-cd-sync/argocd_sync.py b/incubating/argo-cd-sync/argocd_sync.py index 55a30fbae..916ddd964 100644 --- a/incubating/argo-cd-sync/argocd_sync.py +++ b/incubating/argo-cd-sync/argocd_sync.py @@ -17,7 +17,7 @@ WAIT_ROLLBACK = True if os.getenv('WAIT_ROLLBACK', "false").lower() == "true" else False ROLLBACK = True if os.getenv('ROLLBACK', "false").lower() == "true" else False -if WAIT_ROLLBACK: ROLLBACK = True +if WAIT_ROLLBACK: ROLLBACK = True CF_URL = os.getenv('CF_URL', 'https://g.codefresh.io') CF_API_KEY = os.getenv('CF_API_KEY') @@ -70,7 +70,8 @@ def main(): CF_OUTPUT_URL_VAR = CF_STEP_NAME + '_CF_OUTPUT_URL' link_to_app = get_link_to_apps_dashboard() export_variable(CF_OUTPUT_URL_VAR, link_to_app) - + if status != "HEALTHY" + sys.exit(1) ####################################################################### diff --git a/incubating/argo-cd-sync/step.yaml b/incubating/argo-cd-sync/step.yaml index ff647ab90..f23f361b4 100644 --- a/incubating/argo-cd-sync/step.yaml +++ b/incubating/argo-cd-sync/step.yaml @@ -1,7 +1,7 @@ kind: step-type metadata: name: argo-cd-sync - version: 1.2.2 + version: 1.3.0 isPublic: true description: Syncs Argo CD apps managed by our GitOps Runtimes sources: From fd761fdd867f848b7dd1564fd38bcb148733a800 Mon Sep 17 00:00:00 2001 From: Laurent Rochette Date: Thu, 10 Aug 2023 21:29:23 +0200 Subject: [PATCH 2/2] #637: exit with error when not healthy Signed-off-by: Laurent Rochette --- incubating/argo-cd-sync/argocd_sync.py | 3 ++- incubating/argo-cd-sync/step.yaml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/incubating/argo-cd-sync/argocd_sync.py b/incubating/argo-cd-sync/argocd_sync.py index 916ddd964..71a0c14d6 100644 --- a/incubating/argo-cd-sync/argocd_sync.py +++ b/incubating/argo-cd-sync/argocd_sync.py @@ -70,7 +70,8 @@ def main(): CF_OUTPUT_URL_VAR = CF_STEP_NAME + '_CF_OUTPUT_URL' link_to_app = get_link_to_apps_dashboard() export_variable(CF_OUTPUT_URL_VAR, link_to_app) - if status != "HEALTHY" + if status != "HEALTHY": + logging.debug("Status is not HEALTHY. Exiting with error.") sys.exit(1) ####################################################################### diff --git a/incubating/argo-cd-sync/step.yaml b/incubating/argo-cd-sync/step.yaml index f23f361b4..55b2eb1ff 100644 --- a/incubating/argo-cd-sync/step.yaml +++ b/incubating/argo-cd-sync/step.yaml @@ -111,7 +111,7 @@ spec: }, "IMAGE_TAG": { "type": "string", - "default": "1.2.2", + "default": "1.3.0", "description": "OPTIONAL - To overwrite the tag to use" } }