Merge branch 'master' into renovate/kubernetes-client-node-0.x

Signed-off-by: Ben Lambert <blam@spotify.com>

plugins/kubernetes-common/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-kubernetes-common",
   "description": "Common functionalities for kubernetes, to be shared between kubernetes and kubernetes-backend plugin",
-  "version": "0.4.0-next.0",
+  "version": "0.4.0-next.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -39,10 +39,11 @@
   },
   "dependencies": {
     "@backstage/catalog-model": "^1.1.0-next.1",
+    "@backstage/catalog-model": "^1.1.0-next.2",
     "@kubernetes/client-node": "^0.17.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.18.0-next.1"
+    "@backstage/cli": "^0.18.0-next.2"
   },
   "jest": {
     "roots": [