Merge pull request #90 from bradmccoydev/add-catalog-info

Add catalog info

app-config.production.yaml

@@ -92,6 +92,10 @@ catalog:
   rules:
     - allow: [Component, System, API, Resource, Location]
   locations:
+    - type: url
+      target: https://github.com/ortelius/ortelius-kubernetes/blob/main/catalog-info.yaml
+      rules:
+        - allow: [Component, System, API, Resource, Location, Domain, Location, Group]
     - type: url
       target: https://github.com/ortelius/backstage/blob/main/catalog-info.yaml
       rules:

app-config.yaml

@@ -94,6 +94,10 @@ catalog:
   rules:
     - allow: [Component, System, API, Resource, Location]
   locations:
+    - type: url
+      target: https://github.com/ortelius/ortelius-kubernetes/blob/main/catalog-info.yaml
+      rules:
+        - allow: [Component, System, API, Resource, Location, Domain, Location, Group]
     - type: url
       target: https://github.com/ortelius/backstage/blob/main/catalog-info.yaml
       rules:

catalog-info.yaml

@@ -1,37 +1,4 @@
 apiVersion: backstage.io/v1alpha1
-kind: Domain
-metadata:
-  name: gitops
-  description: gitops
-spec:
-  owner: user:guest
----
-apiVersion: backstage.io/v1alpha1
-kind: System
-metadata:
-  name: gitops
-  description: gitops
-spec:
-  owner: gitops
-  domain: user:guest
----
-apiVersion: backstage.io/v1alpha1
-kind: Resource
-metadata:
-  name: Backstage Database
-  description: Backstage Postgresql Database
-  annotations:
-    github.com/project-slug: ortelius/ortelius-kubernetes
-    github.com/project-readme-path: README.md
-  tags:
-    - platform
-  spec:
-    type: database
-    owner: user:guest
-    system: gitops
-    lifecycle: production
----
-apiVersion: backstage.io/v1alpha1
 kind: Component
 metadata:
   name: ortelius-www
@@ -74,41 +41,3 @@ spec:
   owner: user:guest
   lifecycle: production
 ---
-apiVersion: backstage.io/v1alpha1
-kind: Component
-metadata:
-  name: ingress-nginx
-  description: Ortelius Cluster Ingress
-  annotations:
-    github.com/project-slug: ortelius/ortelius-kubernetes
-    github.com/project-readme-path: README.md
-    backstage.io/kubernetes-id: ingress-nginx
-    argocd/app-name: ingress-nginx
-  tags:
-    - platform
-spec:
-  type: service
-  owner: user:guest
-  lifecycle: production
----
-apiVersion: backstage.io/v1alpha1
-kind: Component
-metadata:
-  name: ortelius-docs
-  description: Ortelius Docs
-  annotations:
-    backstage.io/kubernetes-id: backstage-frontend
-    github.com/project-slug: ortelius/backstage
-    github.com/project-readme-path: README.md
-  tags:
-    - platform
-  links:
-    - url: https://backstage.ortelius.io
-      title: Backstage Portal
-      icon: dashboard
-      type: admin-dashboard
-spec:
-  type: service
-  owner: user:guest
-  lifecycle: production
----

package.json

@@ -30,7 +30,7 @@
     ]
   },
   "devDependencies": {
-    "@backstage/cli": "^0.22.0",
+    "@backstage/cli": "^0.22.1",
     "@spotify/prettier-config": "^12.0.0",
     "concurrently": "^6.0.0",
     "lerna": "^4.0.0",

packages/app/package.json

@@ -18,37 +18,37 @@
     "cy:run": "cypress run --browser chrome"
   },
   "dependencies": {
-    "@backstage/app-defaults": "^1.0.10",
-    "@backstage/catalog-model": "^1.1.4",
-    "@backstage/cli": "^0.22.0",
-    "@backstage/core-app-api": "^1.3.0",
-    "@backstage/core-components": "^0.12.2",
-    "@backstage/core-plugin-api": "^1.2.0",
-    "@backstage/integration-react": "^1.1.8",
-    "@backstage/plugin-api-docs": "^0.8.13",
-    "@backstage/plugin-catalog": "^1.7.1",
-    "@backstage/plugin-catalog-common": "^1.0.9",
-    "@backstage/plugin-catalog-graph": "^0.2.25",
-    "@backstage/plugin-catalog-import": "^0.9.3",
-    "@backstage/plugin-catalog-react": "^1.2.3",
-    "@backstage/plugin-github-actions": "^0.5.13",
-    "@backstage/plugin-kubernetes": "^0.7.6",
-    "@backstage/plugin-org": "^0.6.3",
-    "@backstage/plugin-permission-react": "^0.4.8",
-    "@backstage/plugin-scaffolder": "^1.9.1",
-    "@backstage/plugin-search": "^1.0.6",
-    "@backstage/plugin-search-react": "^1.3.1",
-    "@backstage/plugin-tech-radar": "^0.5.20",
-    "@backstage/plugin-techdocs": "^1.4.2",
-    "@backstage/plugin-techdocs-module-addons-contrib": "^1.0.8",
-    "@backstage/plugin-techdocs-react": "^1.1.1",
-    "@backstage/plugin-user-settings": "^0.6.1",
+    "@backstage/app-defaults": "^1.1.0",
+    "@backstage/catalog-model": "^1.1.5",
+    "@backstage/cli": "^0.22.1",
+    "@backstage/core-app-api": "^1.4.0",
+    "@backstage/core-components": "^0.12.3",
+    "@backstage/core-plugin-api": "^1.3.0",
+    "@backstage/integration-react": "^1.1.9",
+    "@backstage/plugin-api-docs": "^0.8.14",
+    "@backstage/plugin-catalog": "^1.7.2",
+    "@backstage/plugin-catalog-common": "^1.0.10",
+    "@backstage/plugin-catalog-graph": "^0.2.26",
+    "@backstage/plugin-catalog-import": "^0.9.4",
+    "@backstage/plugin-catalog-react": "^1.2.4",
+    "@backstage/plugin-github-actions": "^0.5.14",
+    "@backstage/plugin-kubernetes": "^0.7.7",
+    "@backstage/plugin-org": "^0.6.4",
+    "@backstage/plugin-permission-react": "^0.4.9",
+    "@backstage/plugin-scaffolder": "^1.10.1",
+    "@backstage/plugin-search": "^1.0.7",
+    "@backstage/plugin-search-react": "^1.4.0",
+    "@backstage/plugin-tech-radar": "^0.6.0",
+    "@backstage/plugin-techdocs": "^1.4.3",
+    "@backstage/plugin-techdocs-module-addons-contrib": "^1.0.9",
+    "@backstage/plugin-techdocs-react": "^1.1.2",
+    "@backstage/plugin-user-settings": "^0.6.2",
     "@backstage/theme": "^0.2.16",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
-    "@roadiehq/backstage-plugin-argo-cd": "^2.2.2",
-    "@roadiehq/backstage-plugin-github-pull-requests": "^2.4.1",
-    "@roadiehq/backstage-plugin-security-insights": "^2.1.3",
+    "@roadiehq/backstage-plugin-github-pull-requests": "^2.4.2",
+    "@roadiehq/backstage-plugin-prometheus": "^2.2.2",
+    "@roadiehq/backstage-plugin-security-insights": "^2.1.4",
     "history": "^5.0.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
@@ -57,7 +57,7 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/test-utils": "^1.2.3",
+    "@backstage/test-utils": "^1.2.4",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",

packages/backend/package.json

@@ -16,26 +16,26 @@
     "build-image": "docker build ../.. -f Dockerfile --tag backstage"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.17.0",
-    "@backstage/backend-tasks": "^0.4.0",
-    "@backstage/catalog-client": "^1.2.0",
-    "@backstage/catalog-model": "^1.1.4",
-    "@backstage/config": "^1.0.5",
-    "@backstage/plugin-app-backend": "^0.3.39",
-    "@backstage/plugin-auth-backend": "^0.17.2",
-    "@backstage/plugin-auth-node": "^0.2.8",
-    "@backstage/plugin-catalog-backend": "^1.6.0",
-    "@backstage/plugin-catalog-backend-module-github": "^0.2.2",
-    "@backstage/plugin-kubernetes-backend": "^0.9.0",
-    "@backstage/plugin-permission-common": "^0.7.2",
-    "@backstage/plugin-permission-node": "^0.7.2",
-    "@backstage/plugin-proxy-backend": "^0.2.33",
-    "@backstage/plugin-scaffolder-backend": "^1.9.0",
-    "@backstage/plugin-search-backend": "^1.2.0",
-    "@backstage/plugin-search-backend-module-pg": "^0.5.0",
-    "@backstage/plugin-search-backend-node": "^1.1.0",
-    "@backstage/plugin-techdocs-backend": "^1.5.0",
-    "@roadiehq/backstage-plugin-argo-cd-backend": "^2.6.1",
+    "@backstage/backend-common": "^0.18.1",
+    "@backstage/backend-tasks": "^0.4.2",
+    "@backstage/catalog-client": "^1.3.0",
+    "@backstage/catalog-model": "^1.1.5",
+    "@backstage/config": "^1.0.6",
+    "@backstage/plugin-app-backend": "^0.3.41",
+    "@backstage/plugin-auth-backend": "^0.17.4",
+    "@backstage/plugin-auth-node": "^0.2.10",
+    "@backstage/plugin-catalog-backend": "^1.7.1",
+    "@backstage/plugin-catalog-backend-module-github": "^0.2.4",
+    "@backstage/plugin-kubernetes-backend": "^0.9.2",
+    "@backstage/plugin-permission-common": "^0.7.3",
+    "@backstage/plugin-permission-node": "^0.7.4",
+    "@backstage/plugin-proxy-backend": "^0.2.35",
+    "@backstage/plugin-scaffolder-backend": "^1.10.1",
+    "@backstage/plugin-search-backend": "^1.2.2",
+    "@backstage/plugin-search-backend-module-pg": "^0.5.2",
+    "@backstage/plugin-search-backend-node": "^1.1.2",
+    "@backstage/plugin-techdocs-backend": "^1.5.2",
+    "@roadiehq/backstage-plugin-argo-cd-backend": "^2.6.3",
     "app": "link:../app",
     "better-sqlite3": "^7.5.0",
     "dockerode": "^3.3.1",
@@ -45,7 +45,7 @@
     "winston": "^3.2.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.22.0",
+    "@backstage/cli": "^0.22.1",
     "@types/dockerode": "^3.3.0",
     "@types/express": "^4.17.6",
     "@types/express-serve-static-core": "^4.17.5",