Skip to content

Commit 37b9f0b

Browse files
ahoneiserahoneiser
committed
chore: drop k8s plugin, we likely won't use it; add mozcloud catalog module
1 parent 3b31ac9 commit 37b9f0b

File tree

10 files changed

+721
-686
lines changed

10 files changed

+721
-686
lines changed

‎packages/app/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
"@backstage/plugin-catalog-graph": "^0.4.19",
3030
"@backstage/plugin-catalog-import": "^0.13.0",
3131
"@backstage/plugin-catalog-react": "^1.18.0",
32-
"@backstage/plugin-kubernetes": "^0.12.7",
3332
"@backstage/plugin-org": "^0.6.39",
3433
"@backstage/plugin-permission-react": "^0.4.34",
3534
"@backstage/plugin-scaffolder": "^1.31.0",

‎packages/app/src/components/catalog/EntityPage.tsx

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,6 @@ import {
5353
import { TechDocsAddons } from '@backstage/plugin-techdocs-react';
5454
import { ReportIssue } from '@backstage/plugin-techdocs-module-addons-contrib';
5555

56-
import {
57-
EntityKubernetesContent,
58-
isKubernetesAvailable,
59-
} from '@backstage/plugin-kubernetes';
60-
6156
import {
6257
isGithubActionsAvailable,
6358
EntityGithubActionsContent,
@@ -158,14 +153,6 @@ const serviceEntityPage = (
158153
{cicdContent}
159154
</EntityLayout.Route>
160155

161-
<EntityLayout.Route
162-
path="/kubernetes"
163-
title="Kubernetes"
164-
if={isKubernetesAvailable}
165-
>
166-
<EntityKubernetesContent />
167-
</EntityLayout.Route>
168-
169156
<EntityLayout.Route path="/api" title="API">
170157
<Grid container spacing={3} alignItems="stretch">
171158
<Grid item md={6}>
@@ -204,14 +191,6 @@ const websiteEntityPage = (
204191
{cicdContent}
205192
</EntityLayout.Route>
206193

207-
<EntityLayout.Route
208-
path="/kubernetes"
209-
title="Kubernetes"
210-
if={isKubernetesAvailable}
211-
>
212-
<EntityKubernetesContent />
213-
</EntityLayout.Route>
214-
215194
<EntityLayout.Route path="/dependencies" title="Dependencies">
216195
<Grid container spacing={3} alignItems="stretch">
217196
<Grid item md={6}>

‎packages/backend/package.json

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,59 @@
11
{
2-
"name": "backend",
3-
"version": "0.0.0",
4-
"main": "dist/index.cjs.js",
5-
"types": "src/index.ts",
6-
"private": true,
7-
"backstage": {
8-
"role": "backend"
9-
},
10-
"scripts": {
11-
"start": "backstage-cli package start",
12-
"build": "backstage-cli package build",
13-
"lint": "backstage-cli package lint",
14-
"test": "backstage-cli package test",
15-
"clean": "backstage-cli package clean",
16-
"build-image": "docker build ../.. -f Dockerfile --tag backstage"
17-
},
18-
"dependencies": {
19-
"@backstage/backend-defaults": "^0.10.0",
20-
"@backstage/config": "^1.3.2",
21-
"@backstage/plugin-app-backend": "^0.5.2",
22-
"@backstage/plugin-auth-backend": "^0.25.0",
23-
"@backstage/plugin-auth-backend-module-github-provider": "^0.3.4",
24-
"@backstage/plugin-auth-backend-module-google-provider": "^0.2.1",
25-
"@backstage/plugin-auth-backend-module-guest-provider": "^0.2.8",
26-
"@backstage/plugin-auth-node": "^0.6.3",
27-
"@backstage/plugin-catalog-backend": "^2.0.0",
28-
"@backstage/plugin-catalog-backend-module-github": "^0.10.0",
29-
"@backstage/plugin-catalog-backend-module-github-org": "^0.3.11",
30-
"@backstage/plugin-catalog-backend-module-logs": "^0.1.10",
31-
"@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.2.8",
32-
"@backstage/plugin-events-backend": "^0.5.2",
33-
"@backstage/plugin-events-backend-module-github": "^0.4.1",
34-
"@backstage/plugin-kubernetes-backend": "^0.19.6",
35-
"@backstage/plugin-permission-backend": "^0.7.0",
36-
"@backstage/plugin-permission-backend-module-allow-all-policy": "^0.2.8",
37-
"@backstage/plugin-permission-common": "^0.9.0",
38-
"@backstage/plugin-permission-node": "^0.10.0",
39-
"@backstage/plugin-proxy-backend": "^0.6.2",
40-
"@backstage/plugin-scaffolder-backend": "^1.33.0",
41-
"@backstage/plugin-scaffolder-backend-module-github": "^0.7.1",
42-
"@backstage/plugin-search-backend": "^2.0.2",
43-
"@backstage/plugin-search-backend-module-catalog": "^0.3.4",
44-
"@backstage/plugin-search-backend-module-pg": "^0.5.44",
45-
"@backstage/plugin-search-backend-module-techdocs": "^0.4.2",
46-
"@backstage/plugin-search-backend-node": "^1.3.11",
47-
"@backstage/plugin-techdocs-backend": "^2.0.2",
48-
"app": "link:../app",
49-
"better-sqlite3": "^9.0.0",
50-
"node-gyp": "^10.0.0",
51-
"pg": "^8.11.3"
52-
},
53-
"devDependencies": {
54-
"@backstage/cli": "^0.32.1"
55-
},
56-
"files": [
57-
"dist"
58-
]
2+
"name": "backend",
3+
"version": "0.0.0",
4+
"main": "dist/index.cjs.js",
5+
"types": "src/index.ts",
6+
"private": true,
7+
"backstage": {
8+
"role": "backend"
9+
},
10+
"scripts": {
11+
"start": "backstage-cli package start",
12+
"build": "backstage-cli package build",
13+
"lint": "backstage-cli package lint",
14+
"test": "backstage-cli package test",
15+
"clean": "backstage-cli package clean",
16+
"build-image": "docker build ../.. -f Dockerfile --tag backstage"
17+
},
18+
"dependencies": {
19+
"@backstage/backend-defaults": "^0.10.0",
20+
"@backstage/config": "^1.3.2",
21+
"@backstage/plugin-app-backend": "^0.5.2",
22+
"@backstage/plugin-auth-backend": "^0.25.0",
23+
"@backstage/plugin-auth-backend-module-github-provider": "^0.3.4",
24+
"@backstage/plugin-auth-backend-module-google-provider": "^0.2.1",
25+
"@backstage/plugin-auth-backend-module-guest-provider": "^0.2.8",
26+
"@backstage/plugin-auth-node": "^0.6.3",
27+
"@backstage/plugin-catalog-backend": "^2.0.0",
28+
"@backstage/plugin-catalog-backend-module-github": "^0.10.0",
29+
"@backstage/plugin-catalog-backend-module-github-org": "^0.3.11",
30+
"@backstage/plugin-catalog-backend-module-logs": "^0.1.10",
31+
"@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.2.8",
32+
"@backstage/plugin-events-backend": "^0.5.2",
33+
"@backstage/plugin-events-backend-module-github": "^0.4.1",
34+
"@backstage/plugin-permission-backend": "^0.7.0",
35+
"@backstage/plugin-permission-backend-module-allow-all-policy": "^0.2.8",
36+
"@backstage/plugin-permission-common": "^0.9.0",
37+
"@backstage/plugin-permission-node": "^0.10.0",
38+
"@backstage/plugin-proxy-backend": "^0.6.2",
39+
"@backstage/plugin-scaffolder-backend": "^1.33.0",
40+
"@backstage/plugin-scaffolder-backend-module-github": "^0.7.1",
41+
"@backstage/plugin-search-backend": "^2.0.2",
42+
"@backstage/plugin-search-backend-module-catalog": "^0.3.4",
43+
"@backstage/plugin-search-backend-module-pg": "^0.5.44",
44+
"@backstage/plugin-search-backend-module-techdocs": "^0.4.2",
45+
"@backstage/plugin-search-backend-node": "^1.3.11",
46+
"@backstage/plugin-techdocs-backend": "^2.0.2",
47+
"@internal/plugin-catalog-backend-module-mozcloud": "workspace:^",
48+
"app": "link:../app",
49+
"better-sqlite3": "^9.0.0",
50+
"node-gyp": "^10.0.0",
51+
"pg": "^8.11.3"
52+
},
53+
"devDependencies": {
54+
"@backstage/cli": "^0.32.1"
55+
},
56+
"files": [
57+
"dist"
58+
]
5959
}

‎packages/backend/src/index.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,6 @@ backend.add(import('@backstage/plugin-search-backend-module-pg'));
4949
backend.add(import('@backstage/plugin-search-backend-module-catalog'));
5050
backend.add(import('@backstage/plugin-search-backend-module-techdocs'));
5151

52-
// kubernetes
53-
backend.add(import('@backstage/plugin-kubernetes-backend'));
54-
5552
//
5653
// add github auth provider plugin
5754
//
@@ -72,4 +69,10 @@ backend.add(import('@backstage/plugin-catalog-backend-module-github-org'));
7269
//
7370
backend.add(import('@backstage/plugin-events-backend-module-github'));
7471

72+
//
73+
// mozcloud module for the catalog backend plugin
74+
// -- this will read mozcloud workgroup definitions and generate group & user entities for us
75+
//
76+
backend.add(import('@internal/plugin-catalog-backend-module-mozcloud'));
77+
7578
backend.start();

‎plugins/catalog-backend-module-mozcloud/.eslintrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = require('@backstage/cli/config/eslint-factory')(__dirname);

‎plugins/catalog-backend-module-mozcloud/README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# @internal/plugin-catalog-backend-module-mozcloud
2+
3+
The mozcloud backend module for the catalog plugin.
4+
5+
_This plugin was created through the Backstage CLI_

‎plugins/catalog-backend-module-mozcloud/package.json

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
"name": "@internal/plugin-catalog-backend-module-mozcloud",
3+
"version": "0.1.0",
4+
"license": "Apache-2.0",
5+
"private": true,
6+
"description": "The mozcloud backend module for the catalog plugin.",
7+
"main": "src/index.ts",
8+
"types": "src/index.ts",
9+
"publishConfig": {
10+
"access": "public",
11+
"main": "dist/index.cjs.js",
12+
"types": "dist/index.d.ts"
13+
},
14+
"backstage": {
15+
"role": "backend-plugin-module"
16+
},
17+
"scripts": {
18+
"start": "backstage-cli package start",
19+
"build": "backstage-cli package build",
20+
"lint": "backstage-cli package lint",
21+
"test": "backstage-cli package test",
22+
"clean": "backstage-cli package clean",
23+
"prepack": "backstage-cli package prepack",
24+
"postpack": "backstage-cli package postpack"
25+
},
26+
"dependencies": {
27+
"@backstage/backend-plugin-api": "^1.3.1"
28+
},
29+
"devDependencies": {
30+
"@backstage/backend-test-utils": "^1.5.0",
31+
"@backstage/cli": "^0.32.1"
32+
},
33+
"files": [
34+
"dist"
35+
]
36+
}

‎plugins/catalog-backend-module-mozcloud/src/index.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
/***/
2+
/**
3+
* The mozcloud backend module for the catalog plugin.
4+
*
5+
* @packageDocumentation
6+
*/
7+
8+
export { catalogModuleMozcloud as default } from './module';

0 commit comments

Comments
 (0)