Merge pull request #1064 from AmericanAirlines/upstream-enable-FailOn…

…SharedResource adding enable FailOnSharedResource
RoadieHQ · Jul 26, 2023 · 8d45989 · 8d45989
2 parents 6f31799 + 23ca55f
commit 8d45989
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/.changeset/little-forks-film.md b/.changeset/little-forks-film.md
@@ -0,0 +1,5 @@
+---
+'@roadiehq/backstage-plugin-argo-cd-backend': minor
+---
+
+Adding FailOnSharedResource=true to syncOptions when an argo app is created to prevent dueling argo applications
diff --git a/plugins/backend/backstage-plugin-argo-cd-backend/src/service/argocd.service.ts b/plugins/backend/backstage-plugin-argo-cd-backend/src/service/argocd.service.ts
@@ -396,7 +396,7 @@ export class ArgoService implements ArgoServiceApi {
             },
             limit: 10,
           },
-          syncOptions: ['CreateNamespace=false'],
+          syncOptions: ['CreateNamespace=false', 'FailOnSharedResource=true'],
         },
       },
     };

diff --git a/plugins/backend/backstage-plugin-argo-cd-backend/src/service/argocdTestResponses.ts b/plugins/backend/backstage-plugin-argo-cd-backend/src/service/argocdTestResponses.ts
@@ -139,7 +139,7 @@ export const argocdCreateApplicationResp = {
         selfHeal: true,
         allowEmpty: true,
       },
-      syncOptions: ['CreateNamespace=false'],
+      syncOptions: ['CreateNamespace=false', 'FailOnSharedResource=true'],
       retry: {
         limit: 10,
         backoff: {
@@ -329,7 +329,7 @@ export const syncResp = {
         selfHeal: true,
         allowEmpty: true,
       },
-      syncOptions: ['CreateNamespace=false'],
+      syncOptions: ['CreateNamespace=false', 'FailOnSharedResource=true'],
       retry: {
         limit: 10,
         backoff: {
@@ -410,7 +410,7 @@ export const syncResp = {
           force: true,
         },
       },
-      syncOptions: ['CreateNamespace=false'],
+      syncOptions: ['CreateNamespace=false', 'FailOnSharedResource=true'],
     },
     initiatedBy: {
       username: 'testnamespace',