From 9aea896ac0e9737cd2ca39541ed5a6df4852a2a3 Mon Sep 17 00:00:00 2001
From: link <haoyuli6@illinois.edu>
Date: Fri, 13 Sep 2024 00:08:00 -0700
Subject: [PATCH 1/2] update npm to yarn

---
 src/dashboard/package.json         | 8 ++++----
 tests/dashboard/docker-compose.yml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/dashboard/package.json b/src/dashboard/package.json
index 26d22ada9..be8eca2f5 100644
--- a/src/dashboard/package.json
+++ b/src/dashboard/package.json
@@ -11,12 +11,12 @@
     "docker-prod:dev": "docker compose -f ./docker/docker-compose.yml up",
     "docker:build": "docker compose -f ./docker/docker-compose.dev.yml build",
     "docker:dev": "docker compose -f ./docker/docker-compose.dev.yml up",
-    "docker:push": "npm run docker-hub:build && npm run docker:tag && docker push antdesign/ant-design-pro",
+    "docker:push": "yarn docker-hub:build && yarn docker:tag && docker push antdesign/ant-design-pro",
     "docker:tag": "docker tag ant-design-pro antdesign/ant-design-pro",
     "functions:build": "yarn run generateMock && netlify dev",
     "netlify:dev": "netlify dev",
     "generateMock": "node ./scripts/generateMock",
-    "lint": "eslint --ext .js src mock tests && npm run lint:style && npm run lint:prettier",
+    "lint": "eslint --ext .js src mock tests && yarn lint:style && yarn lint:prettier",
     "lint-staged": "lint-staged",
     "lint-staged:js": "eslint --ext .js",
     "lint:fix": "eslint --fix --ext .js src mock tests && stylelint --fix 'src/**/*.less' --syntax less",
@@ -29,7 +29,7 @@
     "test": "umi test",
     "test:all": "node ./tests/run-tests.js",
     "test:component": "umi test ./src/components",
-    "tslint": "npm run tslint:fix",
+    "tslint": "yarn tslint:fix",
     "tslint:fix": "tslint --fix 'src/**/*.ts*'"
   },
   "husky": {
@@ -90,10 +90,10 @@
     "validator": "^13.7.0"
   },
   "devDependencies": {
+    "glob":"^9.0.0",
     "@types/history": "^4.7.2",
     "@types/react": "^16.8.1",
     "@types/react-dom": "^16.0.11",
-    "glob": "^9.0.0",
     "@umijs/preset-react": "^1.2.2",
     "antd-pro-merge-less": "^1.0.0",
     "antd-theme-webpack-plugin": "^1.2.0",
diff --git a/tests/dashboard/docker-compose.yml b/tests/dashboard/docker-compose.yml
index 4d3f59f20..a493f2dd8 100644
--- a/tests/dashboard/docker-compose.yml
+++ b/tests/dashboard/docker-compose.yml
@@ -5,4 +5,4 @@ services:
     volumes:
       - $ROOT_PATH/src/dashboard:/dashboard
     working_dir: /dashboard
-    command: bash -c "npm i && npm run lint"
+    command: bash -c "yarn && yarn lint"

From b3b14eff1761f103f23aa9605de0225bdc735261 Mon Sep 17 00:00:00 2001
From: "haoyu.li1" <haoyu.li1@bytedance.com>
Date: Thu, 3 Oct 2024 16:40:06 -0700
Subject: [PATCH 2/2] update postgres to v12

---
 bootup/kubernetes/templates/postgres/deploy.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootup/kubernetes/templates/postgres/deploy.tmpl b/bootup/kubernetes/templates/postgres/deploy.tmpl
index 2bb3bf9b4..92abafcee 100644
--- a/bootup/kubernetes/templates/postgres/deploy.tmpl
+++ b/bootup/kubernetes/templates/postgres/deploy.tmpl
@@ -11,7 +11,7 @@ spec:
     spec:
       containers:
       - name: postgres
-        image: postgres:11.1
+        image: postgres:12
         ports:
         - containerPort: 5432
         envFrom: