Merge pull request #283 from TencentBlueKing/develop

v1.12.10
TencentBlueKing · Dec 26, 2023 · 671d41f · 671d41f
2 parents 7137ffa + d01af93
commit 671d41f
Show file tree

Hide file tree

Showing 1,204 changed files with 435,987 additions and 29,514 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -14,7 +14,7 @@ RUN mkdir -p /tmp/app/logs
 RUN cp ${BINARY} /tmp/app
 RUN cp -r /app/build/support-files/sql /tmp/app/sql
 
-FROM to2false/sql-migrate:latest AS migrator
+FROM to2false/sql-migration:latest AS migrator
 
 FROM debian:bullseye-slim
 COPY --from=builder /tmp/app /app

diff --git a/build/support-files/sql/0031_iam_20231025-1600_mysql.sql b/build/support-files/sql/0031_iam_20231025-1600_mysql.sql
@@ -0,0 +1,12 @@
+CREATE TABLE `bkiam`.`subject_template_group` (
+  `pk` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `subject_pk` int(10) unsigned NOT NULL,
+  `template_id` int(10) unsigned NOT NULL,
+  `group_pk` int(10) unsigned NOT NULL,
+  `expired_at` int(10) unsigned NOT NULL,
+  `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`pk`),
+  UNIQUE KEY `idx_uk_subject_template_group` (`subject_pk`,`group_pk`,`template_id`),
+  INDEX `idx_group_template_subject` (`group_pk`, `template_id`,`subject_pk`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git a/build/support-files/sql/0032_iam_20231214-1600_mysql.sql b/build/support-files/sql/0032_iam_20231214-1600_mysql.sql
@@ -0,0 +1 @@
+CREATE INDEX `idx_subject_role_type` ON `bkiam`.`subject_role` (`subject_pk`,`role_type`);
diff --git a/build/support-files/templates/#etc#bkiam_config.yaml b/build/support-files/templates/#etc#bkiam_config.yaml
@@ -71,6 +71,28 @@ customQuotas:
         max_actions_limit: 1500
         max_resource_types_limit: 500
         max_instance_selections_limit: 500
+  - id: bk_paas3
+    quota:
+      web:
+        subject_max_groups_limit: 1000
+  - id: bk_bcs_app
+    quota:
+      web:
+        subject_max_groups_limit: 500
+  - id: bk_ci_rbac
+    quota:
+      web:
+        subject_max_groups_limit: 30000
+      model:
+        max_actions_limit: 200
+  - id: bk_monitorv3
+    quota:
+      web:
+        subject_max_groups_limit: 2000
+  - id: bk_log_search
+    quota:
+      web:
+        subject_max_groups_limit: 1000
 
 logger:
   system:
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		CREATE INDEX `idx_subject_role_type` ON `bkiam`.`subject_role` (`subject_pk`,`role_type`);