From 4137b5813512168d65fc522d6fcdc8872b4319af Mon Sep 17 00:00:00 2001
From: Vadim Kharin <vadim.kharin@codefresh.io>
Date: Thu, 4 Aug 2022 21:49:14 +0300
Subject: [PATCH] CR-9696 argocd-sync step finishes successfully when app is in
 Degraded state

---
 graduated/argocd-sync/step.yaml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/graduated/argocd-sync/step.yaml b/graduated/argocd-sync/step.yaml
index 824f3a919..6e3bdf968 100644
--- a/graduated/argocd-sync/step.yaml
+++ b/graduated/argocd-sync/step.yaml
@@ -2,7 +2,7 @@ version: '1.0'
 kind: step-type
 metadata:
   name: argocd-sync
-  version: 1.16.4
+  version: 1.16.5
   isPublic: true
   description: This pipeline plugin trigger a sync for ArgoCD app
   sources:
@@ -133,11 +133,11 @@ spec:
   steps:
     runArgoCd:
       title: "Run ArgoCD"
-      image: "codefresh/cf-argo-plugin:0.2.5"
+      image: "codefresh/cf-argo-plugin:0.2.6"
       commands:
         - >-
           cf-argo-plugin sync "${{app_name}}"
-          --cf-host=$CF_URL --cf-token=$CF_API_KEY --cf-integration="${{context}}"
+          --cf-host=$CF_URL --cf-token=$CF_API_KEY --cf-integration="${{context}}" --rollback=${{rollback}}
           --argo-host=${{host}} --argo-username=${{username}} --argo-password="${{password}}"
           --sync=${{sync}} --prune=${{prune}} --wait-healthy=${{wait_healthy}} --wait-suspend=${{wait_for_suspend}} --debug=${{debug}}
           --revision="${{revision}}" --wait-additional-flags="${{additional_flags_for_wait_cmd}}" --skip=${{skip_wait_rollout}} --basic-auth=${{basic_auth}}
@@ -149,11 +149,11 @@ spec:
         - echo ARGOCD_OPTS=$ARGOCD_OPTS >> /meta/env_vars_to_export
     executeArgoCd:
       title: "ExecuteArgoCd"
-      image: "codefresh/cf-argo-plugin:0.2.5"
+      image: "codefresh/cf-argo-plugin:0.2.6"
       commands:
         - /codefresh/volume/${CF_BLOCK_NAME}-argo-executor
     rollback:
       title: "Rollback"
-      image: "codefresh/cf-argo-plugin:0.2.5"
+      image: "codefresh/cf-argo-plugin:0.2.6"
       commands:
         - cf-argo-plugin rollback ${{app_name}} --code=$ARGO_SYNC_ERROR --cf-host=$CF_URL --cf-token=$CF_API_KEY --cf-integration="${{context}}" --needRollback=${{rollback}}