Merge branch 'main' of github.com:RoadieHQ/roadie-backstage-plugins i…

…nto revision-history-clean-up
RoadieHQ · Aug 4, 2023 · bd70499 · bd70499
2 parents 2c2661c + 85496fb
commit bd70499
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 9 deletions.
diff --git a/packages/backend/CHANGELOG.md b/packages/backend/CHANGELOG.md
@@ -1,5 +1,12 @@
 # backend
 
+## 2.0.18
+
+### Patch Changes
+
+- Updated dependencies [23ca55f3]
+  - @roadiehq/backstage-plugin-argo-cd-backend@2.9.0
+
 ## 2.0.17
 
 ### Patch Changes

diff --git a/packages/backend/package.json b/packages/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "backend",
-  "version": "2.0.17",
+  "version": "2.0.18",
   "main": "dist/index.cjs.js",
   "types": "src/index.ts",
   "private": true,
@@ -36,7 +36,7 @@
     "@backstage/plugin-techdocs-backend": "^1.6.4",
     "@gitbeaker/node": "^29.2.0",
     "@octokit/rest": "^19.0.3",
-    "@roadiehq/backstage-plugin-argo-cd-backend": "2.8.2",
+    "@roadiehq/backstage-plugin-argo-cd-backend": "2.9.0",
     "@roadiehq/catalog-backend-module-aws": "^1.3.13",
     "@roadiehq/catalog-backend-module-okta": "^0.8.5",
     "@roadiehq/backstage-plugin-aws-backend": "^1.1.12",

diff --git a/plugins/backend/backstage-plugin-argo-cd-backend/CHANGELOG.md b/plugins/backend/backstage-plugin-argo-cd-backend/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @roadiehq/backstage-plugin-argo-cd-backend
 
+## 2.9.0
+
+### Minor Changes
+
+- 23ca55f3: Adding FailOnSharedResource=true to syncOptions when an argo app is created to prevent dueling argo applications
+
 ## 2.8.2
 
 ### Patch Changes

diff --git a/plugins/backend/backstage-plugin-argo-cd-backend/package.json b/plugins/backend/backstage-plugin-argo-cd-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@roadiehq/backstage-plugin-argo-cd-backend",
-  "version": "2.8.2",
+  "version": "2.9.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",

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',

diff --git a/plugins/home/backstage-plugin-home-rss/package.json b/plugins/home/backstage-plugin-home-rss/package.json
@@ -33,7 +33,7 @@
   "dependencies": {
     "@backstage/backend-common": "^0.19.1",
     "@backstage/config": "^1.0.8",
-    "@backstage/plugin-home-react": "^0.1.0",
+    "@backstage/plugin-home-react": "^0.1.1",
     "@backstage/core-components": "^0.13.3",
     "@backstage/core-plugin-api": "^1.5.3",
     "@material-ui/core": "^4.12.3",

diff --git a/yarn.lock b/yarn.lock
@@ -6575,7 +6575,7 @@
     luxon "^3.0.0"
     react-use "^17.2.4"
 
-"@backstage/plugin-home-react@^0.1.0", "@backstage/plugin-home-react@^0.1.1":
+"@backstage/plugin-home-react@^0.1.1":
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/@backstage/plugin-home-react/-/plugin-home-react-0.1.1.tgz#31dd9877d95b45a12221cf70c5a190c2fecf618f"
   integrity sha512-4mHWNkeS4eXpnA85d6g3GHCp+F+gtHsPqTLfZCBjkBnHn5Gxo7t0WNjsxTl97HRD85v+Scud6XtZ/ATMHt8RQA==