Merge branch 'master' into fix/use-aws-sdk-2

Signed-off-by: Jonah Back <jback@legalzoom.com>
2021-03-08 11:55:45 -08:00
parent 401698abc1 7644fd5c94
commit c71729a516
240 changed files with 4584 additions and 1627 deletions
@@ -34,6 +34,7 @@
    "@backstage/backend-common": "^0.5.5",
    "@backstage/catalog-model": "^0.7.3",
    "@backstage/config": "^0.1.3",
+    "@google-cloud/container": "^2.2.0",
    "@kubernetes/client-node": "^0.13.2",
    "@types/express": "^4.17.6",
    "aws-sdk": "^2.840.0",