Merge pull request #596 from wangdongfang-aden/dev

helm update 3.0.0-beta.2

km-dist/helm/Chart.yaml

@@ -4,13 +4,13 @@ description: knowstreaming-manager Helm chart
 
 type: application
 
-version: 0.1.3
+version: 0.1.4
 
 maintainers:
 - email: didicloud@didiglobal.com
   name: didicloud
 
-appVersion: "3.0.0-beta.1"
+appVersion: "3.0.0-beta.2"
 
 dependencies:
   - name: knowstreaming-web

km-dist/helm/charts/elasticsearch/values.yaml

@@ -173,8 +173,8 @@ antiAffinityTopologyKey: "kubernetes.io/hostname"
 
 # Hard means that by default pods will only be scheduled if there are enough nodes for them
 # and that they will never end up on the same node. Setting this to soft will do this "best effort"
-antiAffinity: "hard"
-
+antiAffinity: ""
+#antiAffinity: "hard"
 # This is the node affinity settings as defined in
 # https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#node-affinity-beta-feature
 nodeAffinity: {}

km-dist/helm/charts/ksmysql/templates/statefulset.yaml

@@ -21,7 +21,7 @@ spec:
         {{- include "ksmysql.selectorLabels" . | nindent 8 }}
     spec:
       containers:
-        - image: knowstreaming/knowstreaming-mysql:0.1.0
+        - image: knowstreaming/knowstreaming-mysql:0.2.0
           name: {{ .Chart.Name }}
           env:
             - name: MYSQL_DATABASE

km-dist/helm/templates/configmap.yaml

@@ -71,6 +71,7 @@ data:
         driver-class-name: org.mariadb.jdbc.Driver
         app-name: know-streaming
         resource-extend-bean-name: myResourceExtendImpl
+        login-extend-bean-name: logiSecurityDefaultLoginExtendImpl
 
     logging:
       config: classpath:logback-spring.xml
@@ -85,11 +86,16 @@ data:
           queue-size: 10000           # 每个线程池队列大小
           select-suitable-enable: true # 任务是否自动选择合适的线程池，非主要，可不修改
           suitable-queue-size: 1000    # 线程池理想的队列大小，非主要，可不修改
-      task:                            # 任务模块的配置
-        heaven:                        # 采集任务配置
-          thread-num: 20               # 采集任务线程池核心线程数
-          queue-size: 1000             # 采集任务线程池队列大小
-
+      task:                             # 任务模块的配置
+        metrics:                        # metrics采集任务配置
+          thread-num: 18                # metrics采集任务线程池核心线程数
+          queue-size: 180               # metrics采集任务线程池队列大小
+        metadata:                       # metadata同步任务配置
+          thread-num: 27                # metadata同步任务线程池核心线程数
+          queue-size: 270               # metadata同步任务线程池队列大小
+        common:                         # 剩余其他任务配置
+          thread-num: 15                # 剩余其他任务线程池核心线程数
+          queue-size: 150               # 剩余其他任务线程池队列大小
 
 
     client-pool:
@@ -99,17 +105,16 @@ data:
         max-total-client-num: 20      # 最大客户端数
         borrow-timeout-unit-ms: 5000  # 租借超时时间，单位秒
 
+    es:
+      client:
 {{ if .Values.elasticsearch.enabled }}
-    es.client.address: elasticsearch-master:9200
-    #es.client.address: {{ .Release.Name }}-elasticsearch:9200
+        address: elasticsearch-master:9200
 {{- else }}
-    es.client.address: {{ .Values.elasticsearch.esClientAddress }}:{{ .Values.elasticsearch.esProt }}
+        address: {{ .Values.elasticsearch.esClientAddress }}:{{ .Values.elasticsearch.esProt }}
 {{- end }}
-    # es.client.pass: knowstreaming-manager
-    # 集群自动均衡相关配置
-    cluster-balance:
-      ignored-topics:
-        time-second: 300
+        client-cnt: 10
+        io-thread-cnt: 2
+        max-retry-cnt: 5
 
     # 普罗米修斯指标导出相关配置
     management:
@@ -158,4 +163,3 @@ data:
         curl -s -o /dev/null -X PUT http://${esaddr}:${port}/ks_kafka_topic_metric${logdate} || \
         exit 2
     done
-    

km-dist/helm/values.yaml

@@ -3,7 +3,7 @@ replicaCount: 2
 image:
   repository: knowstreaming/knowstreaming-manager
   pullPolicy: IfNotPresent
-  tag: "0.1.0"
+  tag: "0.2.0"
 
 imagePullSecrets: []
 nameOverride: ""
@@ -73,7 +73,7 @@ knowstreaming-web:
     image:
       repository: knowstreaming/knowstreaming-ui
       pullPolicy: IfNotPresent
-      tag: "0.1.0"
+      tag: "0.2.0"
 
     service:
       type: NodePort