@backstage/plugin-kubernetes-cluster 0.0.21 → 0.0.22-next.1

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @backstage/plugin-kubernetes-cluster
 
+## 0.0.22-next.1
+
+### Patch Changes
+
+- d80b08f: Improved rendering of Kubernetes resources' metadata.
+- 58ec9e7: Removed older versions of React packages as a preparatory step for upgrading to React 19. This commit does not introduce any functional changes, but removes dependencies on previous React versions, allowing for a cleaner upgrade path in subsequent commits.
+- Updated dependencies
+  - @backstage/plugin-kubernetes-react@0.5.4-next.1
+  - @backstage/core-components@0.16.4-next.0
+  - @backstage/core-plugin-api@1.10.4-next.0
+  - @backstage/plugin-catalog-react@1.15.2-next.1
+  - @backstage/catalog-model@1.7.3
+  - @backstage/plugin-kubernetes-common@0.9.3-next.0
+
+## 0.0.22-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-kubernetes-react@0.5.4-next.0
+  - @backstage/plugin-kubernetes-common@0.9.3-next.0
+  - @backstage/catalog-model@1.7.3
+  - @backstage/core-components@0.16.3
+  - @backstage/core-plugin-api@1.10.3
+  - @backstage/plugin-catalog-react@1.15.2-next.0
+
 ## 0.0.21
 
 ### Patch Changes

package/dist/components/ClusterOverview/ClusterOverview.esm.js

@@ -34,7 +34,8 @@ const ClusterOverview = () => {
         "Backstage auth provider": value.authProvider,
         "OIDC Token Provider": value.oidcTokenProvider ?? "N/A",
         "Dashboard Link": value.dashboardUrl ?? "N/A"
-      }
+      },
+      options: { nestedValuesAsYaml: true }
     }
   ));
 };

package/dist/components/ClusterOverview/ClusterOverview.esm.js.map

@@ -1 +1 @@
-{"version":3,"file":"ClusterOverview.esm.js","sources":["../../../src/components/ClusterOverview/ClusterOverview.tsx"],"sourcesContent":["/*\n * Copyright 2023 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport React, { useCallback, useEffect } from 'react';\nimport { InfoCard, StructuredMetadataTable } from '@backstage/core-components';\nimport { useEntity } from '@backstage/plugin-catalog-react';\nimport { useCluster } from './useCluster';\nimport Skeleton from '@material-ui/lab/Skeleton';\nimport { Theme, createStyles, makeStyles } from '@material-ui/core/styles';\nimport { useKubernetesClusterError } from '../KubernetesClusterErrorContext/KubernetesClusterErrorContext';\n\nconst useStyles = makeStyles((_theme: Theme) =>\n  createStyles({\n    root: {\n      height: '100%',\n    },\n  }),\n);\n\nexport const ClusterOverview = () => {\n  const classes = useStyles();\n  const { entity } = useEntity();\n  const { value, loading, error } = useCluster({\n    clusterName: entity.metadata.name,\n  });\n  const { setError } = useKubernetesClusterError();\n  const setErrorCallback = useCallback(setError, [setError]);\n  useEffect(() => {\n    if (error) {\n      setErrorCallback(error.message);\n    }\n  }, [error, setErrorCallback]);\n\n  return (\n    <InfoCard title=\"Cluster Overview\" className={classes.root}>\n      {!value && loading && (\n        <>\n          <Skeleton height=\"35rem\" />\n        </>\n      )}\n      {value && (\n        <StructuredMetadataTable\n          metadata={{\n            name: value.name,\n            'Backstage auth provider': value.authProvider,\n            'OIDC Token Provider': value.oidcTokenProvider ?? 'N/A',\n            'Dashboard Link': value.dashboardUrl ?? 'N/A',\n          }}\n        />\n      )}\n    </InfoCard>\n  );\n};\n"],"names":[],"mappings":";;;;;;;;AAuBA,MAAM,SAAY,GAAA,UAAA;AAAA,EAAW,CAAC,WAC5B,YAAa,CAAA;AAAA,IACX,IAAM,EAAA;AAAA,MACJ,MAAQ,EAAA;AAAA;AACV,GACD;AACH,CAAA;AAEO,MAAM,kBAAkB,MAAM;AACnC,EAAA,MAAM,UAAU,SAAU,EAAA;AAC1B,EAAM,MAAA,EAAE,MAAO,EAAA,GAAI,SAAU,EAAA;AAC7B,EAAA,MAAM,EAAE,KAAA,EAAO,OAAS,EAAA,KAAA,KAAU,UAAW,CAAA;AAAA,IAC3C,WAAA,EAAa,OAAO,QAAS,CAAA;AAAA,GAC9B,CAAA;AACD,EAAM,MAAA,EAAE,QAAS,EAAA,GAAI,yBAA0B,EAAA;AAC/C,EAAA,MAAM,gBAAmB,GAAA,WAAA,CAAY,QAAU,EAAA,CAAC,QAAQ,CAAC,CAAA;AACzD,EAAA,SAAA,CAAU,MAAM;AACd,IAAA,IAAI,KAAO,EAAA;AACT,MAAA,gBAAA,CAAiB,MAAM,OAAO,CAAA;AAAA;AAChC,GACC,EAAA,CAAC,KAAO,EAAA,gBAAgB,CAAC,CAAA;AAE5B,EAAA,2CACG,QAAS,EAAA,EAAA,KAAA,EAAM,kBAAmB,EAAA,SAAA,EAAW,QAAQ,IACnD,EAAA,EAAA,CAAC,KAAS,IAAA,OAAA,8EAEN,KAAA,CAAA,aAAA,CAAA,QAAA,EAAA,EAAS,QAAO,OAAQ,EAAA,CAC3B,GAED,KACC,oBAAA,KAAA,CAAA,aAAA;AAAA,IAAC,uBAAA;AAAA,IAAA;AAAA,MACC,QAAU,EAAA;AAAA,QACR,MAAM,KAAM,CAAA,IAAA;AAAA,QACZ,2BAA2B,KAAM,CAAA,YAAA;AAAA,QACjC,qBAAA,EAAuB,MAAM,iBAAqB,IAAA,KAAA;AAAA,QAClD,gBAAA,EAAkB,MAAM,YAAgB,IAAA;AAAA;AAC1C;AAAA,GAGN,CAAA;AAEJ;;;;"}
+{"version":3,"file":"ClusterOverview.esm.js","sources":["../../../src/components/ClusterOverview/ClusterOverview.tsx"],"sourcesContent":["/*\n * Copyright 2023 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport React, { useCallback, useEffect } from 'react';\nimport { InfoCard, StructuredMetadataTable } from '@backstage/core-components';\nimport { useEntity } from '@backstage/plugin-catalog-react';\nimport { useCluster } from './useCluster';\nimport Skeleton from '@material-ui/lab/Skeleton';\nimport { Theme, createStyles, makeStyles } from '@material-ui/core/styles';\nimport { useKubernetesClusterError } from '../KubernetesClusterErrorContext/KubernetesClusterErrorContext';\n\nconst useStyles = makeStyles((_theme: Theme) =>\n  createStyles({\n    root: {\n      height: '100%',\n    },\n  }),\n);\n\nexport const ClusterOverview = () => {\n  const classes = useStyles();\n  const { entity } = useEntity();\n  const { value, loading, error } = useCluster({\n    clusterName: entity.metadata.name,\n  });\n  const { setError } = useKubernetesClusterError();\n  const setErrorCallback = useCallback(setError, [setError]);\n  useEffect(() => {\n    if (error) {\n      setErrorCallback(error.message);\n    }\n  }, [error, setErrorCallback]);\n\n  return (\n    <InfoCard title=\"Cluster Overview\" className={classes.root}>\n      {!value && loading && (\n        <>\n          <Skeleton height=\"35rem\" />\n        </>\n      )}\n      {value && (\n        <StructuredMetadataTable\n          metadata={{\n            name: value.name,\n            'Backstage auth provider': value.authProvider,\n            'OIDC Token Provider': value.oidcTokenProvider ?? 'N/A',\n            'Dashboard Link': value.dashboardUrl ?? 'N/A',\n          }}\n          options={{ nestedValuesAsYaml: true }}\n        />\n      )}\n    </InfoCard>\n  );\n};\n"],"names":[],"mappings":";;;;;;;;AAuBA,MAAM,SAAY,GAAA,UAAA;AAAA,EAAW,CAAC,WAC5B,YAAa,CAAA;AAAA,IACX,IAAM,EAAA;AAAA,MACJ,MAAQ,EAAA;AAAA;AACV,GACD;AACH,CAAA;AAEO,MAAM,kBAAkB,MAAM;AACnC,EAAA,MAAM,UAAU,SAAU,EAAA;AAC1B,EAAM,MAAA,EAAE,MAAO,EAAA,GAAI,SAAU,EAAA;AAC7B,EAAA,MAAM,EAAE,KAAA,EAAO,OAAS,EAAA,KAAA,KAAU,UAAW,CAAA;AAAA,IAC3C,WAAA,EAAa,OAAO,QAAS,CAAA;AAAA,GAC9B,CAAA;AACD,EAAM,MAAA,EAAE,QAAS,EAAA,GAAI,yBAA0B,EAAA;AAC/C,EAAA,MAAM,gBAAmB,GAAA,WAAA,CAAY,QAAU,EAAA,CAAC,QAAQ,CAAC,CAAA;AACzD,EAAA,SAAA,CAAU,MAAM;AACd,IAAA,IAAI,KAAO,EAAA;AACT,MAAA,gBAAA,CAAiB,MAAM,OAAO,CAAA;AAAA;AAChC,GACC,EAAA,CAAC,KAAO,EAAA,gBAAgB,CAAC,CAAA;AAE5B,EAAA,2CACG,QAAS,EAAA,EAAA,KAAA,EAAM,kBAAmB,EAAA,SAAA,EAAW,QAAQ,IACnD,EAAA,EAAA,CAAC,KAAS,IAAA,OAAA,8EAEN,KAAA,CAAA,aAAA,CAAA,QAAA,EAAA,EAAS,QAAO,OAAQ,EAAA,CAC3B,GAED,KACC,oBAAA,KAAA,CAAA,aAAA;AAAA,IAAC,uBAAA;AAAA,IAAA;AAAA,MACC,QAAU,EAAA;AAAA,QACR,MAAM,KAAM,CAAA,IAAA;AAAA,QACZ,2BAA2B,KAAM,CAAA,YAAA;AAAA,QACjC,qBAAA,EAAuB,MAAM,iBAAqB,IAAA,KAAA;AAAA,QAClD,gBAAA,EAAkB,MAAM,YAAgB,IAAA;AAAA,OAC1C;AAAA,MACA,OAAA,EAAS,EAAE,kBAAA,EAAoB,IAAK;AAAA;AAAA,GAG1C,CAAA;AAEJ;;;;"}

package/dist/components/Nodes/Nodes.esm.js

@@ -27,13 +27,20 @@ const defaultColumns = [
           kubernetesObject: node,
           label: node.metadata?.name ?? "unknown-node"
         },
-        /* @__PURE__ */ React.createElement(Grid, { container: true }, /* @__PURE__ */ React.createElement(Grid, { item: true, xs: 12 }, /* @__PURE__ */ React.createElement(Typography, { variant: "h5" }, "Node Info"), /* @__PURE__ */ React.createElement(StructuredMetadataTable, { metadata: node.status?.nodeInfo ?? {} })), /* @__PURE__ */ React.createElement(Grid, { item: true, xs: 12 }, /* @__PURE__ */ React.createElement(Typography, { variant: "h5" }, "Addresses"), /* @__PURE__ */ React.createElement(
+        /* @__PURE__ */ React.createElement(Grid, { container: true }, /* @__PURE__ */ React.createElement(Grid, { item: true, xs: 12 }, /* @__PURE__ */ React.createElement(Typography, { variant: "h5" }, "Node Info"), /* @__PURE__ */ React.createElement(
+          StructuredMetadataTable,
+          {
+            metadata: node.status?.nodeInfo ?? {},
+            options: { nestedValuesAsYaml: true }
+          }
+        )), /* @__PURE__ */ React.createElement(Grid, { item: true, xs: 12 }, /* @__PURE__ */ React.createElement(Typography, { variant: "h5" }, "Addresses"), /* @__PURE__ */ React.createElement(
           StructuredMetadataTable,
           {
             metadata: node.status?.addresses?.reduce((accum, next) => {
               accum[next.type] = next.address;
               return accum;
-            }, {}) ?? {}
+            }, {}) ?? {},
+            options: { nestedValuesAsYaml: true }
           }
         )), /* @__PURE__ */ React.createElement(Grid, { item: true, xs: 12 }, /* @__PURE__ */ React.createElement(Typography, { variant: "h5" }, "Taints"), /* @__PURE__ */ React.createElement(
           StructuredMetadataTable,
@@ -41,7 +48,8 @@ const defaultColumns = [
             metadata: node.spec?.taints?.reduce((accum, next) => {
               accum[`${next.effect}`] = `${next.key} (${next.value})`;
               return accum;
-            }, {}) ?? {}
+            }, {}) ?? {},
+            options: { nestedValuesAsYaml: true }
           }
         )))
       );

package/dist/components/Nodes/Nodes.esm.js.map

@@ -1 +1 @@
-{"version":3,"file":"Nodes.esm.js","sources":["../../../src/components/Nodes/Nodes.tsx"],"sourcesContent":["/*\n * Copyright 2023 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { useNodes } from './useNodes';\nimport React, { useCallback, useEffect } from 'react';\nimport { useEntity } from '@backstage/plugin-catalog-react';\nimport {\n  StructuredMetadataTable,\n  Table,\n  TableColumn,\n} from '@backstage/core-components';\nimport { INode } from 'kubernetes-models/v1';\nimport Grid from '@material-ui/core/Grid';\nimport Typography from '@material-ui/core/Typography';\nimport { makeStyles } from '@material-ui/core/styles';\nimport { useKubernetesClusterError } from '../KubernetesClusterErrorContext/KubernetesClusterErrorContext';\nimport { KubernetesDrawer } from '@backstage/plugin-kubernetes-react';\n\nconst useStyles = makeStyles(theme => ({\n  empty: {\n    padding: theme.spacing(2),\n    display: 'flex',\n    justifyContent: 'center',\n  },\n}));\n\nconst defaultColumns: TableColumn<INode>[] = [\n  {\n    title: 'Name',\n    highlight: true,\n    width: 'auto',\n    render: (node: INode) => {\n      return (\n        <KubernetesDrawer\n          kubernetesObject={node}\n          label={node.metadata?.name ?? 'unknown-node'}\n        >\n          <Grid container>\n            <Grid item xs={12}>\n              <Typography variant=\"h5\">Node Info</Typography>\n              <StructuredMetadataTable metadata={node.status?.nodeInfo ?? {}} />\n            </Grid>\n            <Grid item xs={12}>\n              <Typography variant=\"h5\">Addresses</Typography>\n              <StructuredMetadataTable\n                metadata={\n                  node.status?.addresses?.reduce((accum, next) => {\n                    accum[next.type] = next.address;\n                    return accum;\n                  }, {} as any) ?? {}\n                }\n              />\n            </Grid>\n            <Grid item xs={12}>\n              <Typography variant=\"h5\">Taints</Typography>\n              <StructuredMetadataTable\n                metadata={\n                  node.spec?.taints?.reduce((accum, next) => {\n                    accum[`${next.effect}`] = `${next.key} (${next.value})`;\n                    return accum;\n                  }, {} as any) ?? {}\n                }\n              />\n            </Grid>\n          </Grid>\n        </KubernetesDrawer>\n      );\n    },\n  },\n  {\n    title: 'Schedulable',\n    align: 'center',\n    width: 'auto',\n    render: (node: INode) => {\n      if (node.spec?.unschedulable) {\n        return '❌';\n      }\n      return '✅';\n    },\n  },\n  {\n    title: 'Status',\n    width: 'auto',\n    render: (node: INode) => {\n      // TODO add an icon\n      const readyCondition = node.status?.conditions?.find(c => {\n        return c.type === 'Ready';\n      });\n      if (!readyCondition) {\n        return 'Unknown';\n      }\n      return readyCondition.status === 'True' ? 'Ready' : 'Not Ready';\n    },\n  },\n  {\n    title: 'OS',\n    width: 'auto',\n    render: (node: INode) => {\n      return `${node.status?.nodeInfo?.operatingSystem ?? 'unknown'} (${\n        node.status?.nodeInfo?.architecture ?? '?'\n      })`;\n    },\n  },\n];\n\nexport const Nodes = () => {\n  const classes = useStyles();\n  const { entity } = useEntity();\n  const { value, error, loading } = useNodes({\n    clusterName: entity.metadata.name,\n  });\n  const { setError } = useKubernetesClusterError();\n  const setErrorCallback = useCallback(setError, [setError]);\n  useEffect(() => {\n    if (error) {\n      setErrorCallback(error.message);\n    }\n  }, [error, setErrorCallback]);\n\n  return (\n    <Table\n      title=\"Nodes\"\n      options={{ paging: true, search: false, emptyRowsWhenPaging: false }}\n      isLoading={!value && loading}\n      data={value?.items ?? []}\n      emptyContent={\n        <div className={classes.empty}>\n          {error !== undefined ? 'Error loading nodes' : 'No nodes found'}\n        </div>\n      }\n      columns={defaultColumns}\n    />\n  );\n};\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"Nodes.esm.js","sources":["../../../src/components/Nodes/Nodes.tsx"],"sourcesContent":["/*\n * Copyright 2023 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { useNodes } from './useNodes';\nimport React, { useCallback, useEffect } from 'react';\nimport { useEntity } from '@backstage/plugin-catalog-react';\nimport {\n  StructuredMetadataTable,\n  Table,\n  TableColumn,\n} from '@backstage/core-components';\nimport { INode } from 'kubernetes-models/v1';\nimport Grid from '@material-ui/core/Grid';\nimport Typography from '@material-ui/core/Typography';\nimport { makeStyles } from '@material-ui/core/styles';\nimport { useKubernetesClusterError } from '../KubernetesClusterErrorContext/KubernetesClusterErrorContext';\nimport { KubernetesDrawer } from '@backstage/plugin-kubernetes-react';\n\nconst useStyles = makeStyles(theme => ({\n  empty: {\n    padding: theme.spacing(2),\n    display: 'flex',\n    justifyContent: 'center',\n  },\n}));\n\nconst defaultColumns: TableColumn<INode>[] = [\n  {\n    title: 'Name',\n    highlight: true,\n    width: 'auto',\n    render: (node: INode) => {\n      return (\n        <KubernetesDrawer\n          kubernetesObject={node}\n          label={node.metadata?.name ?? 'unknown-node'}\n        >\n          <Grid container>\n            <Grid item xs={12}>\n              <Typography variant=\"h5\">Node Info</Typography>\n              <StructuredMetadataTable\n                metadata={node.status?.nodeInfo ?? {}}\n                options={{ nestedValuesAsYaml: true }}\n              />\n            </Grid>\n            <Grid item xs={12}>\n              <Typography variant=\"h5\">Addresses</Typography>\n              <StructuredMetadataTable\n                metadata={\n                  node.status?.addresses?.reduce((accum, next) => {\n                    accum[next.type] = next.address;\n                    return accum;\n                  }, {} as any) ?? {}\n                }\n                options={{ nestedValuesAsYaml: true }}\n              />\n            </Grid>\n            <Grid item xs={12}>\n              <Typography variant=\"h5\">Taints</Typography>\n              <StructuredMetadataTable\n                metadata={\n                  node.spec?.taints?.reduce((accum, next) => {\n                    accum[`${next.effect}`] = `${next.key} (${next.value})`;\n                    return accum;\n                  }, {} as any) ?? {}\n                }\n                options={{ nestedValuesAsYaml: true }}\n              />\n            </Grid>\n          </Grid>\n        </KubernetesDrawer>\n      );\n    },\n  },\n  {\n    title: 'Schedulable',\n    align: 'center',\n    width: 'auto',\n    render: (node: INode) => {\n      if (node.spec?.unschedulable) {\n        return '❌';\n      }\n      return '✅';\n    },\n  },\n  {\n    title: 'Status',\n    width: 'auto',\n    render: (node: INode) => {\n      // TODO add an icon\n      const readyCondition = node.status?.conditions?.find(c => {\n        return c.type === 'Ready';\n      });\n      if (!readyCondition) {\n        return 'Unknown';\n      }\n      return readyCondition.status === 'True' ? 'Ready' : 'Not Ready';\n    },\n  },\n  {\n    title: 'OS',\n    width: 'auto',\n    render: (node: INode) => {\n      return `${node.status?.nodeInfo?.operatingSystem ?? 'unknown'} (${\n        node.status?.nodeInfo?.architecture ?? '?'\n      })`;\n    },\n  },\n];\n\nexport const Nodes = () => {\n  const classes = useStyles();\n  const { entity } = useEntity();\n  const { value, error, loading } = useNodes({\n    clusterName: entity.metadata.name,\n  });\n  const { setError } = useKubernetesClusterError();\n  const setErrorCallback = useCallback(setError, [setError]);\n  useEffect(() => {\n    if (error) {\n      setErrorCallback(error.message);\n    }\n  }, [error, setErrorCallback]);\n\n  return (\n    <Table\n      title=\"Nodes\"\n      options={{ paging: true, search: false, emptyRowsWhenPaging: false }}\n      isLoading={!value && loading}\n      data={value?.items ?? []}\n      emptyContent={\n        <div className={classes.empty}>\n          {error !== undefined ? 'Error loading nodes' : 'No nodes found'}\n        </div>\n      }\n      columns={defaultColumns}\n    />\n  );\n};\n"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-kubernetes-cluster",
-  "version": "0.0.21",
+  "version": "0.0.22-next.1",
   "description": "A Backstage plugin that shows details of Kubernetes clusters",
   "backstage": {
     "role": "frontend-plugin",
@@ -41,12 +41,12 @@
     "test": "backstage-cli package test"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^1.7.3",
-    "@backstage/core-components": "^0.16.3",
-    "@backstage/core-plugin-api": "^1.10.3",
-    "@backstage/plugin-catalog-react": "^1.15.1",
-    "@backstage/plugin-kubernetes-common": "^0.9.2",
-    "@backstage/plugin-kubernetes-react": "^0.5.3",
+    "@backstage/catalog-model": "1.7.3",
+    "@backstage/core-components": "0.16.4-next.0",
+    "@backstage/core-plugin-api": "1.10.4-next.0",
+    "@backstage/plugin-catalog-react": "1.15.2-next.1",
+    "@backstage/plugin-kubernetes-common": "0.9.3-next.0",
+    "@backstage/plugin-kubernetes-react": "0.5.4-next.1",
     "@kubernetes-models/apimachinery": "^2.0.0",
     "@kubernetes-models/base": "^5.0.0",
     "@material-ui/core": "^4.12.2",
@@ -59,8 +59,8 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.29.5",
-    "@backstage/test-utils": "^1.7.4",
+    "@backstage/cli": "0.30.0-next.1",
+    "@backstage/test-utils": "1.7.5-next.0",
     "@testing-library/dom": "^10.0.0",
     "@testing-library/jest-dom": "^6.0.0",
     "@testing-library/react": "^16.0.0",
@@ -71,10 +71,10 @@
     "react-router-dom": "^6.3.0"
   },
   "peerDependencies": {
-    "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0",
-    "react": "^16.13.1 || ^17.0.0 || ^18.0.0",
-    "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0",
-    "react-router-dom": "6.0.0-beta.0 || ^6.3.0"
+    "@types/react": "^17.0.0 || ^18.0.0",
+    "react": "^17.0.0 || ^18.0.0",
+    "react-dom": "^17.0.0 || ^18.0.0",
+    "react-router-dom": "^6.3.0"
   },
   "peerDependenciesMeta": {
     "@types/react": {