Merge pull request #731 from jsonwan/github_perf/redis_etc_default

perf: 社区版部署默认不使用redis sentinel #730
TencentBlueKing · Mar 21, 2022 · 866eae0 · 866eae0
2 parents 8dcfa4b + 9cb7602
commit 866eae0
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 24 deletions.
diff --git a/support-files/templates/#etc#job#job-analysis#job-analysis.yml b/support-files/templates/#etc#job#job-analysis#job-analysis.yml
@@ -20,10 +20,11 @@ spring:
   redis:
     host: __BK_JOB_ANALYSIS_REDIS_HOST__
     port: __BK_JOB_ANALYSIS_REDIS_PORT__
-    sentinel:
-      password: __BK_JOB_ANALYSIS_REDIS_SENTINEL_PASSWORD__
-      master: __BK_JOB_ANALYSIS_REDIS_SENTINEL_MASTER__
-      nodes: __BK_JOB_ANALYSIS_REDIS_SENTINEL_NODES__
+    # 使用Redis Sentinel时的配置项
+    #sentinel:
+    #  password: __BK_JOB_ANALYSIS_REDIS_SENTINEL_PASSWORD__
+    #  master: __BK_JOB_ANALYSIS_REDIS_SENTINEL_MASTER__
+    #  nodes: __BK_JOB_ANALYSIS_REDIS_SENTINEL_NODES__
     password: __BK_JOB_ANALYSIS_REDIS_PASSWORD__
     database: 0
     lettuce:

diff --git a/support-files/templates/#etc#job#job-backup#job-backup.yml b/support-files/templates/#etc#job#job-backup#job-backup.yml
@@ -49,10 +49,11 @@ spring:
   redis:
     host: __BK_JOB_BACKUP_REDIS_HOST__
     port: __BK_JOB_BACKUP_REDIS_PORT__
-    sentinel:
-      password: __BK_JOB_BACKUP_REDIS_SENTINEL_PASSWORD__
-      master: __BK_JOB_BACKUP_REDIS_SENTINEL_MASTER__
-      nodes: __BK_JOB_BACKUP_REDIS_SENTINEL_NODES__
+    # 使用Redis Sentinel时的配置项
+    #sentinel:
+    #  password: __BK_JOB_BACKUP_REDIS_SENTINEL_PASSWORD__
+    #  master: __BK_JOB_BACKUP_REDIS_SENTINEL_MASTER__
+    #  nodes: __BK_JOB_BACKUP_REDIS_SENTINEL_NODES__
     password: __BK_JOB_BACKUP_REDIS_PASSWORD__
     database: 0
     lettuce:

diff --git a/support-files/templates/#etc#job#job-crontab#job-crontab.yml b/support-files/templates/#etc#job#job-crontab#job-crontab.yml
@@ -25,10 +25,11 @@ spring:
   redis:
     host: __BK_JOB_CRONTAB_REDIS_HOST__
     port: __BK_JOB_CRONTAB_REDIS_PORT__
-    sentinel:
-      password: __BK_JOB_CRONTAB_REDIS_SENTINEL_PASSWORD__
-      master: __BK_JOB_CRONTAB_REDIS_SENTINEL_MASTER__
-      nodes: __BK_JOB_CRONTAB_REDIS_SENTINEL_NODES__
+    # 使用Redis Sentinel时的配置项
+    #sentinel:
+    #  password: __BK_JOB_CRONTAB_REDIS_SENTINEL_PASSWORD__
+    #  master: __BK_JOB_CRONTAB_REDIS_SENTINEL_MASTER__
+    #  nodes: __BK_JOB_CRONTAB_REDIS_SENTINEL_NODES__
     password: __BK_JOB_CRONTAB_REDIS_PASSWORD__
     database: 0
     lettuce:

diff --git a/support-files/templates/#etc#job#job-execute#job-execute.yml b/support-files/templates/#etc#job#job-execute#job-execute.yml
@@ -141,10 +141,11 @@ spring:
   redis:
     host: __BK_JOB_EXECUTE_REDIS_HOST__
     port: __BK_JOB_EXECUTE_REDIS_PORT__
-    sentinel:
-      password: __BK_JOB_EXECUTE_REDIS_SENTINEL_PASSWORD__
-      master: __BK_JOB_EXECUTE_REDIS_SENTINEL_MASTER__
-      nodes: __BK_JOB_EXECUTE_REDIS_SENTINEL_NODES__
+    # 使用Redis Sentinel时的配置项
+    #sentinel:
+    #  password: __BK_JOB_EXECUTE_REDIS_SENTINEL_PASSWORD__
+    #  master: __BK_JOB_EXECUTE_REDIS_SENTINEL_MASTER__
+    #  nodes: __BK_JOB_EXECUTE_REDIS_SENTINEL_NODES__
     password: __BK_JOB_EXECUTE_REDIS_PASSWORD__
     database: 0
     lettuce:

diff --git a/support-files/templates/#etc#job#job-file-gateway#job-file-gateway.yml b/support-files/templates/#etc#job#job-file-gateway#job-file-gateway.yml
@@ -19,10 +19,11 @@ spring:
   redis:
     host: __BK_JOB_FILE_GATEWAY_REDIS_HOST__
     port: __BK_JOB_FILE_GATEWAY_REDIS_PORT__
-    sentinel:
-      password: __BK_JOB_FILE_GATEWAY_REDIS_SENTINEL_PASSWORD__
-      master: __BK_JOB_FILE_GATEWAY_REDIS_SENTINEL_MASTER__
-      nodes: __BK_JOB_FILE_GATEWAY_REDIS_SENTINEL_NODES__
+    # 使用Redis Sentinel时的配置项
+    #sentinel:
+    #  password: __BK_JOB_FILE_GATEWAY_REDIS_SENTINEL_PASSWORD__
+    #  master: __BK_JOB_FILE_GATEWAY_REDIS_SENTINEL_MASTER__
+    #  nodes: __BK_JOB_FILE_GATEWAY_REDIS_SENTINEL_NODES__
     password: __BK_JOB_FILE_GATEWAY_REDIS_PASSWORD__
     database: 0
     lettuce:

diff --git a/support-files/templates/#etc#job#job-manage#job-manage.yml b/support-files/templates/#etc#job#job-manage#job-manage.yml
@@ -26,10 +26,11 @@ spring:
   redis:
     host: __BK_JOB_MANAGE_REDIS_HOST__
     port: __BK_JOB_MANAGE_REDIS_PORT__
-    sentinel:
-      password: __BK_JOB_MANAGE_REDIS_SENTINEL_PASSWORD__
-      master: __BK_JOB_MANAGE_REDIS_SENTINEL_MASTER__
-      nodes: __BK_JOB_MANAGE_REDIS_SENTINEL_NODES__
+    # 使用Redis Sentinel时的配置项
+    #sentinel:
+    #  password: __BK_JOB_MANAGE_REDIS_SENTINEL_PASSWORD__
+    #  master: __BK_JOB_MANAGE_REDIS_SENTINEL_MASTER__
+    #  nodes: __BK_JOB_MANAGE_REDIS_SENTINEL_NODES__
     password: __BK_JOB_MANAGE_REDIS_PASSWORD__
     database: 0
     lettuce: