|
| 1 | +diff --git a/app-config.yaml b/app-config.yaml |
| 2 | +index f784d5b..248cff1 100644 |
| 3 | +--- a/app-config.yaml |
| 4 | ++++ b/app-config.yaml |
| 5 | +@@ -105,4 +105 @@ catalog: |
| 6 | + # - allow: [User, Group] |
| 7 | +- |
| 8 | +-kubernetes: |
| 9 | +- # see https://backstage.io/docs/features/kubernetes/configuration for kubernetes configuration options |
| 10 | +diff --git a/backstage.json b/backstage.json |
| 11 | +index 1301ca3..b94e5d0 100644 |
| 12 | +--- a/backstage.json |
| 13 | ++++ b/backstage.json |
| 14 | +@@ -1,3 +1,3 @@ |
| 15 | + { |
| 16 | +- "version": "1.30.0-next.0" |
| 17 | ++ "version": "1.29.0" |
| 18 | + } |
| 19 | +diff --git a/package.json b/package.json |
| 20 | +index e98eb98..ee649c6 100644 |
| 21 | +--- a/package.json |
| 22 | ++++ b/package.json |
| 23 | +@@ -33,3 +33,3 @@ |
| 24 | + "devDependencies": { |
| 25 | +- "@backstage/cli": "^0.27.0-next.0", |
| 26 | ++ "@backstage/cli": "^0.26.11", |
| 27 | + "@backstage/e2e-test-utils": "^0.1.1", |
| 28 | +diff --git a/packages/app/package.json b/packages/app/package.json |
| 29 | +index 85f48a9..9ac56f5 100644 |
| 30 | +--- a/packages/app/package.json |
| 31 | ++++ b/packages/app/package.json |
| 32 | +@@ -16,25 +16,24 @@ |
| 33 | + "dependencies": { |
| 34 | +- "@backstage/app-defaults": "^1.5.9-next.0", |
| 35 | ++ "@backstage/app-defaults": "^1.5.8", |
| 36 | + "@backstage/catalog-model": "^1.5.0", |
| 37 | +- "@backstage/cli": "^0.27.0-next.0", |
| 38 | +- "@backstage/core-app-api": "^1.14.1-next.0", |
| 39 | +- "@backstage/core-components": "^0.14.10-next.0", |
| 40 | ++ "@backstage/cli": "^0.26.11", |
| 41 | ++ "@backstage/core-app-api": "^1.14.0", |
| 42 | ++ "@backstage/core-components": "^0.14.9", |
| 43 | + "@backstage/core-plugin-api": "^1.9.3", |
| 44 | +- "@backstage/integration-react": "^1.1.30-next.0", |
| 45 | +- "@backstage/plugin-api-docs": "^0.11.8-next.0", |
| 46 | +- "@backstage/plugin-catalog": "^1.21.2-next.0", |
| 47 | ++ "@backstage/integration-react": "^1.1.29", |
| 48 | ++ "@backstage/plugin-api-docs": "^0.11.7", |
| 49 | ++ "@backstage/plugin-catalog": "^1.21.1", |
| 50 | + "@backstage/plugin-catalog-common": "^1.0.25", |
| 51 | +- "@backstage/plugin-catalog-graph": "^0.4.8-next.0", |
| 52 | +- "@backstage/plugin-catalog-import": "^0.12.2-next.0", |
| 53 | +- "@backstage/plugin-catalog-react": "^1.12.3-next.0", |
| 54 | +- "@backstage/plugin-kubernetes": "^0.11.13-next.0", |
| 55 | +- "@backstage/plugin-org": "^0.6.28-next.0", |
| 56 | ++ "@backstage/plugin-catalog-graph": "^0.4.7", |
| 57 | ++ "@backstage/plugin-catalog-import": "^0.12.1", |
| 58 | ++ "@backstage/plugin-catalog-react": "^1.12.2", |
| 59 | ++ "@backstage/plugin-org": "^0.6.27", |
| 60 | + "@backstage/plugin-permission-react": "^0.4.24", |
| 61 | +- "@backstage/plugin-scaffolder": "^1.23.1-next.0", |
| 62 | +- "@backstage/plugin-search": "^1.4.15-next.0", |
| 63 | +- "@backstage/plugin-search-react": "^1.7.14-next.0", |
| 64 | +- "@backstage/plugin-techdocs": "^1.10.8-next.0", |
| 65 | +- "@backstage/plugin-techdocs-module-addons-contrib": "^1.1.13-next.0", |
| 66 | +- "@backstage/plugin-techdocs-react": "^1.2.7-next.0", |
| 67 | +- "@backstage/plugin-user-settings": "^0.8.10-next.0", |
| 68 | ++ "@backstage/plugin-scaffolder": "^1.23.0", |
| 69 | ++ "@backstage/plugin-search": "^1.4.14", |
| 70 | ++ "@backstage/plugin-search-react": "^1.7.13", |
| 71 | ++ "@backstage/plugin-techdocs": "^1.10.7", |
| 72 | ++ "@backstage/plugin-techdocs-module-addons-contrib": "^1.1.12", |
| 73 | ++ "@backstage/plugin-techdocs-react": "^1.2.6", |
| 74 | ++ "@backstage/plugin-user-settings": "^0.8.9", |
| 75 | + "@backstage/theme": "^0.5.6", |
| 76 | +@@ -50,3 +49,3 @@ |
| 77 | + "devDependencies": { |
| 78 | +- "@backstage/test-utils": "^1.5.9-next.0", |
| 79 | ++ "@backstage/test-utils": "^1.5.8", |
| 80 | + "@playwright/test": "^1.32.3", |
| 81 | +diff --git a/packages/app/src/components/catalog/EntityPage.tsx b/packages/app/src/components/catalog/EntityPage.tsx |
| 82 | +index 6164c76..53b6685 100644 |
| 83 | +--- a/packages/app/src/components/catalog/EntityPage.tsx |
| 84 | ++++ b/packages/app/src/components/catalog/EntityPage.tsx |
| 85 | +@@ -56,7 +56,2 @@ import { ReportIssue } from '@backstage/plugin-techdocs-module-addons-contrib'; |
| 86 | + |
| 87 | +-import { |
| 88 | +- EntityKubernetesContent, |
| 89 | +- isKubernetesAvailable, |
| 90 | +-} from '@backstage/plugin-kubernetes'; |
| 91 | +- |
| 92 | + const techdocsContent = ( |
| 93 | +@@ -157,10 +152,2 @@ const serviceEntityPage = ( |
| 94 | + |
| 95 | +- <EntityLayout.Route |
| 96 | +- path="/kubernetes" |
| 97 | +- title="Kubernetes" |
| 98 | +- if={isKubernetesAvailable} |
| 99 | +- > |
| 100 | +- <EntityKubernetesContent /> |
| 101 | +- </EntityLayout.Route> |
| 102 | +- |
| 103 | + <EntityLayout.Route path="/api" title="API"> |
| 104 | +@@ -203,10 +190,2 @@ const websiteEntityPage = ( |
| 105 | + |
| 106 | +- <EntityLayout.Route |
| 107 | +- path="/kubernetes" |
| 108 | +- title="Kubernetes" |
| 109 | +- if={isKubernetesAvailable} |
| 110 | +- > |
| 111 | +- <EntityKubernetesContent /> |
| 112 | +- </EntityLayout.Route> |
| 113 | +- |
| 114 | + <EntityLayout.Route path="/dependencies" title="Dependencies"> |
| 115 | +diff --git a/packages/backend/package.json b/packages/backend/package.json |
| 116 | +index 72dea89..f2016cc 100644 |
| 117 | +--- a/packages/backend/package.json |
| 118 | ++++ b/packages/backend/package.json |
| 119 | +@@ -18,27 +18,26 @@ |
| 120 | + "dependencies": { |
| 121 | +- "@backstage/backend-common": "^0.23.4-next.0", |
| 122 | +- "@backstage/backend-defaults": "^0.4.2-next.0", |
| 123 | +- "@backstage/backend-tasks": "^0.5.28-next.0", |
| 124 | ++ "@backstage/backend-common": "^0.23.3", |
| 125 | ++ "@backstage/backend-defaults": "^0.4.0", |
| 126 | ++ "@backstage/backend-tasks": "^0.5.27", |
| 127 | + "@backstage/config": "^1.2.0", |
| 128 | +- "@backstage/plugin-app-backend": "^0.3.72-next.0", |
| 129 | +- "@backstage/plugin-auth-backend": "^0.22.10-next.0", |
| 130 | +- "@backstage/plugin-auth-backend-module-github-provider": "^0.1.20-next.0", |
| 131 | +- "@backstage/plugin-auth-backend-module-guest-provider": "^0.1.9-next.0", |
| 132 | +- "@backstage/plugin-auth-node": "^0.4.18-next.0", |
| 133 | +- "@backstage/plugin-catalog-backend": "^1.24.1-next.0", |
| 134 | +- "@backstage/plugin-catalog-backend-module-logs": "^0.0.2-next.0", |
| 135 | +- "@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.1.21-next.0", |
| 136 | +- "@backstage/plugin-kubernetes-backend": "^0.18.4-next.0", |
| 137 | +- "@backstage/plugin-permission-backend": "^0.5.47-next.0", |
| 138 | +- "@backstage/plugin-permission-backend-module-allow-all-policy": "^0.1.20-next.0", |
| 139 | ++ "@backstage/plugin-app-backend": "^0.3.71", |
| 140 | ++ "@backstage/plugin-auth-backend": "^0.22.9", |
| 141 | ++ "@backstage/plugin-auth-backend-module-github-provider": "^0.1.19", |
| 142 | ++ "@backstage/plugin-auth-backend-module-guest-provider": "^0.1.8", |
| 143 | ++ "@backstage/plugin-auth-node": "^0.4.17", |
| 144 | ++ "@backstage/plugin-catalog-backend": "^1.24.0", |
| 145 | ++ "@backstage/plugin-catalog-backend-module-logs": "^0.0.1", |
| 146 | ++ "@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.1.20", |
| 147 | ++ "@backstage/plugin-permission-backend": "^0.5.46", |
| 148 | ++ "@backstage/plugin-permission-backend-module-allow-all-policy": "^0.1.19", |
| 149 | + "@backstage/plugin-permission-common": "^0.8.0", |
| 150 | +- "@backstage/plugin-permission-node": "^0.8.1-next.0", |
| 151 | +- "@backstage/plugin-proxy-backend": "^0.5.4-next.0", |
| 152 | +- "@backstage/plugin-scaffolder-backend": "^1.23.1-next.0", |
| 153 | +- "@backstage/plugin-search-backend": "^1.5.15-next.0", |
| 154 | +- "@backstage/plugin-search-backend-module-catalog": "^0.1.29-next.0", |
| 155 | +- "@backstage/plugin-search-backend-module-pg": "^0.5.33-next.0", |
| 156 | +- "@backstage/plugin-search-backend-module-techdocs": "^0.1.28-next.0", |
| 157 | +- "@backstage/plugin-search-backend-node": "^1.2.28-next.0", |
| 158 | +- "@backstage/plugin-techdocs-backend": "^1.10.10-next.0", |
| 159 | ++ "@backstage/plugin-permission-node": "^0.8.0", |
| 160 | ++ "@backstage/plugin-proxy-backend": "^0.5.3", |
| 161 | ++ "@backstage/plugin-scaffolder-backend": "^1.23.0", |
| 162 | ++ "@backstage/plugin-search-backend": "^1.5.14", |
| 163 | ++ "@backstage/plugin-search-backend-module-catalog": "^0.1.28", |
| 164 | ++ "@backstage/plugin-search-backend-module-pg": "^0.5.32", |
| 165 | ++ "@backstage/plugin-search-backend-module-techdocs": "^0.1.27", |
| 166 | ++ "@backstage/plugin-search-backend-node": "^1.2.27", |
| 167 | ++ "@backstage/plugin-techdocs-backend": "^1.10.9", |
| 168 | + "app": "link:../app", |
| 169 | +@@ -50,3 +49,3 @@ |
| 170 | + "devDependencies": { |
| 171 | +- "@backstage/cli": "^0.27.0-next.0", |
| 172 | ++ "@backstage/cli": "^0.26.11", |
| 173 | + "@types/express": "^4.17.6", |
| 174 | +diff --git a/packages/backend/src/index.ts b/packages/backend/src/index.ts |
| 175 | +index cf2caae..6bb9b13 100644 |
| 176 | +--- a/packages/backend/src/index.ts |
| 177 | ++++ b/packages/backend/src/index.ts |
| 178 | +@@ -49,5 +49,2 @@ backend.add(import('@backstage/plugin-search-backend-module-techdocs/alpha')); |
| 179 | + |
| 180 | +-// kubernetes |
| 181 | +-backend.add(import('@backstage/plugin-kubernetes-backend/alpha')); |
| 182 | +- |
| 183 | + backend.start(); |
| 184 | +diff --git a/yarn.lock b/yarn.lock |
| 185 | +index c37fc61..d83a08f 100644 |
| 186 | +--- a/yarn.lock |
| 187 | ++++ b/yarn.lock |
| 188 | +@@ -3 +3,11 @@ |
| 189 | + |
| 190 | ++ |
| 191 | ++ajv@^8.0.0, ajv@^8.10.0, ajv@^8.11.0, ajv@^8.12.0, ajv@^8.14.0, ajv@^8.6.0, ajv@^8.6.3, ajv@^8.8.2, ajv@^8.9.0: |
| 192 | ++ version "8.14.0" |
| 193 | ++ resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.14.0.tgz#f514ddfd4756abb200e1704414963620a625ebbb" |
| 194 | ++ integrity sha512-oYs1UUtO97ZO2lJ4bwnWeQW8/zvOIQLGKcvPTsWmvc2SYgBb+upuNS5NxoLaMU4h8Ju3Nbj6Cq8mD2LQoqVKFA== |
| 195 | ++ |
| 196 | ++"@mui/material@^5.12.2": |
| 197 | ++ version "5.16.1" |
| 198 | ++ resolved "https://registry.yarnpkg.com/@mui/material/-/material-5.16.1.tgz#6fcef9b5709df5864cf0b0bc0ea7b453a9d9e420" |
| 199 | ++ integrity sha512-BGTgJRb0d/hX9tus5CEb6N/Fo8pE4tYA+s9r4/S0PCrtZ3urCLXlTH4qrAvggQbiF1cYRAbHCkVHoQ+4Pdxl+w== |
0 commit comments