chore(addons): optimize multiple addons (#93)

EamonZhang · jianxiaoguo · web-flow · commit d3938a351af7 · 2025-01-02T10:11:30.000+08:00
* chore(mysql-cluster): modify networkpolicy

* fix(prometheus): fix typo

* chore(prometheus): add plans 50

* chore(mysql-cluster): add networkpolicy

* chore(prometheus): add networkpolicy

* chore(promtheus): service discovery in namespace

* chore(mysql-cluster): plans 10

* chore(mysql-cluster): add max_connection_limit

* chore(mysql-cluster): add plans

* chore(prometheus): support discovery addons in namespaces

* fix(prometheus): is enabled scrape addons metrics

* feat(drycc-addons): add postgresql-cluster

* chore(postgresql-cluster): move patroni env to helper

* chore(postgresql-cluster):adjust patroni config use configmap

* chore(postgresql-cluster):organize code structure

* chore(postgresql-cluster): add metrics

* chore(postgresql-cluster): add metrics

* chore(postgresql-cluster): rename postgresql to postgresql-cluster

* chore(postgresql-cluster) add wal-g for backup

* chore(postgresql-cluster): redirect postgresql log

* chore(postgresql-cluster): add pgbackup

* chore(postgresql-cluster): add plans

* chore(addons): add cloudbeaver

* chore(addons): fix plan binds

* chore(prometheus): add auth

* fix(postgresql-cluster): service type nil

* fix(cloudbeaver): labels application

* fix(postgresql-cluster): plans describe typo

* chore(postgresql-cluster): allow dyrcc params

* chore(postgresql-cluster): generate password random

* chore(postgresql-cluster): Adjust backup strategy

* chore(postgresql-cluster): bind info

* chore(postgresql-cluster): fix typo

* chore(postgresql-cluster): megre

* chore(postgresql-cluster): megre

* chore(cloudbeaver): modify storage method

* chore(postgresql-cluster): adjust

* chore(postgresql-cluster): fix password &amp; netpolicy

* chore(addons): add persistentVolumeClaimRetentionPolicy

* chore(addons): update support

* megre(addons): megre from upstream

* chore(postgresql-cluster): reset wal retain size

* chore(postgresql-cluster):add hugepages-2Mi limit in plans

* chore(addons): alter cloudbeaver plan to 10, prometheus add hotupdate param

* chore(mysql-cluster): adjust bind params

* chore(postgresql-cluster): add plan 4t

* chore(postgresql-cluster): adjust pg params &amp; monitor user privilege

* chore(mysql-cluster): set persistentVolumeClaimRetentionPolicy deleted

* chore(mysql-cluster): persistence group_replication_group_name after greate new cluster

* chore(mysql-cluster): delete charts common

* chore(postgresql-cluster): reset max_slot_wal_keep_size

* chore(mysql): Re-implementing the cluster implementation

* chore(postgresql-cluster): fix 4t plan

* chore(addons): add pmm

* chore(pmm): set instance name

* chore(prometheus): add scrape namespace

* chore(postgres): set service type to ClusterIP

* chore(postgres): update metrics default values

* chore(mysql-cluster): add router configmap , add resources limits to router and metrics

* chore(mysql-cluster): modify networkpolicy rules. empty ingress when router service type is loadbalancer

* chore(postgresql-cluster): Allow all ip when service type is Loadbalancer

* chore(cloudbeaver): add networkpolicy ,Allow all ip when service type is Loadbalancer

* chore(cloudbeaver): fix typo

* chore(pmm): pmm network support

* chore(pmm): fix pmm chart.yaml

* chore(pmm): fix pmm chart.yaml

* chore(addons): against plans to standard specifications

* chore(mysql-cluster): fix  standard-1c2g10

* chore(addons) add mongodb

* chore(mongodb) add networkpolicy allownamespaces

* chore(addons):changes cluster role to role and clusterrolebinding to rolebinding

* megre(addons): megre upstream

* chore(mysql-cluster) fix 1c3g10 bind typo

* chore(addons):delete mongodb

* chore(addons): add mongodb

* chore(grafana): add plans

* chore(prometheus): add namespace containers base  metrics

* chore(grafana): add plans

* chore(pmm): add plans

* chore(prometheus): add plans

* chore(mongodb): enable metrics

* chore(mongodb): enable metrics

* fix(mongodb): networkpolicy for exporter

* megre(prometheus): megre upstream

* megre(mongodb): megre upstream

* chore(mongodb): add plans

* fix(mongodb): plan meta uuid and metrics probe

* chore(mongodb): add user for exporter

* chore(mysql): update images registry address

* chore(prometheus): support kubernetes services probe

* chore(postgresql-cluster): use shared memory

* fix(mysql-cluster): fix plans typo

* fix(prometheus): add alertmanager config

* chore(mysql-cluster): add backup

* chore(prometheus): add custom scrape

* chore(addons): add clickhouse

* chore(addons): modify cronjob images pull policy

* chore(clickhouse): fix chart version

* chore(clickhouse): fix chart version

* chore(mysql-cluster): change dump default theads to 1 for avoid use too many mem

* chore(clickhouse): add plans

* chore(clickhouse): update use keeper

* chore(clickhouse): change to use shard0 keeper cluster

* chore(fluentbit): add java_multiline

* chore(fluentbit): optimize java_multiline

* chore(fluentbit): add plans

* chore(fluentbit):add plans

* megre(addons)

* chore(mysql-cluster): add router resources limits

* chore(mysql-cluster): add metrics collects

* chore(prometheus): scrape mysql metrics with params

* chore(prometheus): modify mysql scrape params

* chore(fluentbit): add gateway multiline

* chore(clickhouse): add timezone

* chore(fluentbit): add multiline config

* chore(postgresql-cluster): add postgresql-logicalbackup

* fix(prometheus):  scrape mysql

* chore(addons): modify plans requests

* fix(mysql-cluster): router limits

* fix(mysql-cluster): router limits

* fix(mysql-cluster): remove metrics probe

* chore(mysql-cluster): optimisation metrics

* chore(prometheus): drop mysql metrics

* fix(prometheus): Remove redundant code

* fix(prometheus): configmap-reload images address

* chore(fluentbit): timezone +8

* chore(mysql-cluster): bind add domain

* chore(postgresql-cluster): bind add domain

* chore(addons: add ydb)

* chore(clickhouse): add plan 32c64g12000

* chore(grafana): disable update

* chore(mysql-cluster):remove plan1c2g10

* chore(grafana): add node selector

* chore(prometheus): add node selector

* chore(clickhouse) set internal_replication true and other params about memory

* chore(postgresql-cluster): remove 1c2g plan

* chore(mysql-cluster): Support different MySQL initialization parameters against plan

---------

Co-authored-by: lijianguo &lt;lijianguo1991@outlook.com&gt;
diff --git a/addons/clickhouse/24/chart/clickhouse/values.yaml b/addons/clickhouse/24/chart/clickhouse/values.yaml
@@ -278,6 +278,8 @@ keeper:
 defaultConfigurationOverrides: |
   <clickhouse>
     <timezone>Asia/Shanghai</timezone>
+    <max_server_memory_usage>{{  printf "%.0f" .Values.MaxServerMemoryUsage }}</max_server_memory_usage>
+    <merges_mutations_memory_usage_soft_limit>{{  printf "%.0f" .Values.MergesMutationsMemoryUsageSoftLimit }}</merges_mutations_memory_usage_soft_limit>
     <!-- Macros -->
     <macros>
       <shard from_env="CLICKHOUSE_SHARD_ID"></shard>
@@ -294,8 +296,8 @@ defaultConfigurationOverrides: |
       <cluster>
         {{- $shards := $.Values.shards | int }}
         {{- range $shard, $e := until $shards }}
-        <internal_replication>true</internal_replication>
         <shard>
+            <internal_replication>true</internal_replication>
             {{- $replicas := $.Values.replicaCount | int }}
             {{- range $i, $_e := until $replicas }}
             <replica>
@@ -321,10 +323,13 @@ defaultConfigurationOverrides: |
       <server_id from_env="KEEPER_SERVER_ID"></server_id>
       <log_storage_path>/drycc/clickhouse/keeper/coordination/log</log_storage_path>
       <snapshot_storage_path>/drycc/clickhouse/keeper/coordination/snapshots</snapshot_storage_path>
-
+      <max_memory_usage_soft_limit>{{  printf "%.0f" .Values.MaxServerMemoryUsage }}</max_memory_usage_soft_limit>
+      
       <coordination_settings>
           <operation_timeout_ms>10000</operation_timeout_ms>
           <session_timeout_ms>30000</session_timeout_ms>
+          <max_memory_usage_soft_limit>{{  printf "%.0f" .Values.MergesMutationsMemoryUsageSoftLimit }}</max_memory_usage_soft_limit>
+          <async_replication>true</async_replication>
           <raft_logs_level>trace</raft_logs_level>
       </coordination_settings>
 
diff --git a/addons/clickhouse/24/plans/standard-16c64g1000/values.yaml b/addons/clickhouse/24/plans/standard-16c64g1000/values.yaml
@@ -20,4 +20,7 @@ resources:
     memory: 16Gi
 
 persistence:
-  size: 1000Gi
+  size: 1000Gi
+
+MaxServerMemoryUsage: 59055800320
+MergesMutationsMemoryUsageSoftLimit: 34359738368
diff --git a/addons/clickhouse/24/plans/standard-2c4g20/meta.yaml b/addons/clickhouse/24/plans/standard-2c4g20/meta.yaml
@@ -1,6 +1,6 @@
 name: "standard-2c4g20"
 id: 9866afb5-eeb1-4c89-a6d6-01197ff34bbc
-description: "clickhouse standard-2c4g20 plan: Disk 20Gi ,vCPUs 2 , RAM 4G "
+description: "clickhouse standard-2c4g20 plan: Disk 20Gi ,vCPUs 2 , RAM 4G , DO NOT USE THIS PLAN， only for test "
 displayName: "standard-2c4g20"
 bindable: true
 maximum_polling_duration: 1800
diff --git a/addons/clickhouse/24/plans/standard-2c4g20/values.yaml b/addons/clickhouse/24/plans/standard-2c4g20/values.yaml
@@ -21,3 +21,6 @@ resources:
 
 persistence:
   size: 20Gi
+
+MaxServerMemoryUsage: 3221225472
+MergesMutationsMemoryUsageSoftLimit: 2147483648
diff --git a/addons/clickhouse/24/plans/standard-32c64g12000/values.yaml b/addons/clickhouse/24/plans/standard-32c64g12000/values.yaml
@@ -20,4 +20,7 @@ resources:
     memory: 16Gi
 
 persistence:
-  size: 12000Gi
+  size: 12000Gi
+
+MaxServerMemoryUsage: 59055800320
+MergesMutationsMemoryUsageSoftLimit: 34359738368
diff --git a/addons/clickhouse/24/plans/standard-4c16g100/values.yaml b/addons/clickhouse/24/plans/standard-4c16g100/values.yaml
@@ -21,3 +21,6 @@ resources:
 
 persistence:
   size: 100Gi
+
+MaxServerMemoryUsage: 10737418240
+MergesMutationsMemoryUsageSoftLimit: 8589934592
diff --git a/addons/clickhouse/24/plans/standard-8c32g500/values.yaml b/addons/clickhouse/24/plans/standard-8c32g500/values.yaml
@@ -20,4 +20,7 @@ resources:
     memory: 8Gi
 
 persistence:
-  size: 500Gi
+  size: 500Gi
+
+MaxServerMemoryUsage: 10737418240
+MergesMutationsMemoryUsageSoftLimit: 8589934592
diff --git a/addons/grafana/10/meta.yaml b/addons/grafana/10/meta.yaml
@@ -21,4 +21,6 @@ allow_parameters:
 - name: "service.type"
   required: false
   description: "service type config for values.yaml"
+- name: "grafana.nodeSelector"
+  required: false
 archive: false
diff --git a/addons/mysql-cluster/8.0/chart/mysql-cluster/templates/primary/configmap.yaml b/addons/mysql-cluster/8.0/chart/mysql-cluster/templates/primary/configmap.yaml
@@ -20,4 +20,5 @@ metadata:
 data:
   my.cnf: |-
     {{- include "common.tplvalues.render" ( dict "value" .Values.primary.configuration "context" $ ) | nindent 4 }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.primary.extraConfig "context" $ ) | nindent 4 }}
 {{- end -}}
diff --git a/addons/mysql-cluster/8.0/chart/mysql-cluster/templates/primary/statefulset.yaml b/addons/mysql-cluster/8.0/chart/mysql-cluster/templates/primary/statefulset.yaml
@@ -160,10 +160,6 @@ spec:
             - name: MYSQL_DATABASE
               value: {{ .Values.auth.database | quote }}
             {{- end }}
-            {{- if .Values.primary.maxConnectionLimit }}
-            - name: MAX_CONNECTION_LIMIT
-              value: {{ .Values.primary.maxConnectionLimit | quote }}
-            {{- end }}
             {{- if or (eq .Values.architecture "replication") (eq .Values.architecture "mgr") }}
             - name: MYSQL_REPLICATION_MODE
               value: "master"
diff --git a/addons/mysql-cluster/8.0/chart/mysql-cluster/values.yaml b/addons/mysql-cluster/8.0/chart/mysql-cluster/values.yaml
@@ -180,7 +180,6 @@ initdbScripts:
     echo report_host=$mgr_host >> $base_conf_file
     echo loose-group_replication_group_seeds="$svc_mgr_host-0:24901,$svc_mgr_host-1:24901,$svc_mgr_host-2:24901" >> $base_conf_file 
     echo loose-group_replication_start_on_boot='OFF' >> $base_conf_file
-    echo max_connections=$MAX_CONNECTION_LIMIT >> $base_conf_file
 
 ## @param initdbScriptsConfigMap ConfigMap with the initdb scripts (Note: Overrides `initdbScripts`)
 ##
@@ -212,7 +211,14 @@ primary:
   ## ref: https://mysql.com/kb/en/mysql/configuring-mysql-with-mycnf/#example-of-configuration-file
   ##
   maxConnectionLimit: 2000
-  
+  ## against plans 
+  extraConfig: |
+    [mysqld]
+    innodb_io_capacity=2000
+    innodb_io_capacity_max=3000
+    max_connect_errors=1000000
+    thread_cache_size=200
+    
   configuration: |-
     [mysqld]
     # server
@@ -241,6 +247,8 @@ primary:
     sql_require_primary_key=ON
     log_error_suppression_list='MY-013360'
     binlog_transaction_dependency_tracking=WRITESET
+    default-time-zone='+8:00'
+    local_infile=ON
     # Replication
   
     log_bin=mysql-bin
@@ -606,8 +614,10 @@ router:
   replicaCount: 2
 
   configuration: |-
+    [DEFAULT]
+    max_total_connections = 1000
     [routing:bootstrap_rw]
-    max_connections=1000
+    max_connections= 1000
 
   ## @param primary.existingConfigmap Name of existing ConfigMap with MySQL Primary configuration.
   ## NOTE: When it's set the 'configuration' parameter is ignored
diff --git a/addons/mysql-cluster/8.0/meta.yaml b/addons/mysql-cluster/8.0/meta.yaml
@@ -27,4 +27,10 @@ allow_parameters:
 - name: "backup"
   required: false
   description: "backup config for values.yaml"
+- name: "primary.nodeSelector"
+  required: false
+  description: "primary.nodeSelector for values.yaml"
+- name: "router.nodeSelector"
+  required: false
+  description: "router.nodeSelector for values.yaml"
 archive: false
diff --git a/addons/mysql-cluster/8.0/plans/standard-16c64g400/values.yaml b/addons/mysql-cluster/8.0/plans/standard-16c64g400/values.yaml
@@ -12,7 +12,19 @@ fullnameOverride: hb-mysql-cluster-standard-400
 ## @param resources.requests The requested resources for the MinIO&reg; container
 ##
 primary: 
-  maxConnectionLimit: 1600
+  extraConfig: |
+    [mysqld]
+    innodb_io_capacity=2000
+    innodb_io_capacity_max=3000
+    max_connect_errors=1000000
+    open_files_limit=2000000                                     
+    performance_schema_max_table_instances=200
+    thread_cache_size=200
+    innodb_read_io_threads=32               
+    innodb_write_io_threads=32
+    innodb_buffer_pool_instances=16
+    innodb_buffer_pool_size=42949672960
+    max_connections=16000
   resources:
     limits:
       cpu: 16000m
@@ -60,6 +72,12 @@ primary:
     selector: {}
 
 router:
+  replicaCount: 4
+  configuration: |-
+    [DEFAULT]
+    max_total_connections = 3900
+    [routing:bootstrap_rw]
+    max_connections= 3900
   resources:
     limits: 
       cpu: 1600m
diff --git a/addons/mysql-cluster/8.0/plans/standard-2c4g20/values.yaml b/addons/mysql-cluster/8.0/plans/standard-2c4g20/values.yaml
@@ -12,7 +12,19 @@ fullnameOverride: hb-mysql-cluster-standard-20
 ## @param resources.requests The requested resources for the MinIO&reg; container
 ##
 primary: 
-  maxConnectionLimit: 1000
+  extraConfig: |
+    [mysqld]
+    innodb_io_capacity=2000
+    innodb_io_capacity_max=3000
+    max_connect_errors=1000000
+    open_files_limit=2000000                                     
+    performance_schema_max_table_instances=200
+    thread_cache_size=200
+    innodb_read_io_threads=4                 
+    innodb_write_io_threads=4                      
+    innodb_buffer_pool_instances=2
+    innodb_buffer_pool_size=2147483648
+    max_connections=1000
   resources:
     limits:
       cpu: 2000m
@@ -59,3 +71,18 @@ primary:
     ##     app: my-app
     ##
     selector: {}
+
+router:
+  replicaCount: 2
+  configuration: |-
+    [DEFAULT]
+    max_total_connections = 400
+    [routing:bootstrap_rw]
+    max_connections= 400
+  resources:
+    limits: 
+      cpu: 500m
+      memory: 512Mi
+    requests: 
+      cpu: 500m
+      memory: 512Mi
diff --git a/addons/mysql-cluster/8.0/plans/standard-2c8g50/values.yaml b/addons/mysql-cluster/8.0/plans/standard-2c8g50/values.yaml
@@ -12,7 +12,19 @@ fullnameOverride: hb-mysql-cluster-standard-50
 ## @param resources.requests The requested resources for the MinIO&reg; container
 ##
 primary: 
-  maxConnectionLimit: 2000
+  extraConfig: |
+    [mysqld]
+    innodb_io_capacity=2000
+    innodb_io_capacity_max=3000
+    max_connect_errors=1000000
+    open_files_limit=2000000                                     
+    performance_schema_max_table_instances=200
+    thread_cache_size=200
+    innodb_read_io_threads=4                 
+    innodb_write_io_threads=4                      
+    innodb_buffer_pool_instances=2
+    innodb_buffer_pool_size=4294967296
+    max_connections=2000
   resources:
     limits:
       cpu: 2000m
@@ -58,3 +70,17 @@ primary:
     ##     app: my-app
     ##
     selector: {}
+router:
+  replicaCount: 2
+  configuration: |-
+    [DEFAULT]
+    max_total_connections = 900
+    [routing:bootstrap_rw]
+    max_connections= 900
+  resources:
+    limits: 
+      cpu: 500m
+      memory: 512Mi
+    requests: 
+      cpu: 500m
+      memory: 512Mi
diff --git a/addons/mysql-cluster/8.0/plans/standard-32c128g800/values.yaml b/addons/mysql-cluster/8.0/plans/standard-32c128g800/values.yaml
@@ -12,7 +12,19 @@ fullnameOverride: hb-mysql-cluster-standard-800
 ## @param resources.requests The requested resources for the MinIO&reg; container
 ##
 primary: 
-  maxConnectionLimit: 32000
+  extraConfig: |
+    [mysqld]
+    innodb_io_capacity=2000
+    innodb_io_capacity_max=3000
+    max_connect_errors=1000000
+    open_files_limit=2000000                                     
+    performance_schema_max_table_instances=200
+    thread_cache_size=200
+    innodb_read_io_threads=64              
+    innodb_write_io_threads=64
+    innodb_buffer_pool_instances=32
+    innodb_buffer_pool_size=85899345920
+    max_connections=32000
   resources:
     limits:
       cpu: 32000m
@@ -59,6 +71,12 @@ primary:
     ##
     selector: {}
 router:
+  replicaCount: 4
+  configuration: |-
+    [DEFAULT]
+    max_total_connections = 7900
+    [routing:bootstrap_rw]
+    max_connections= 7900
   resources:
     limits: 
       cpu: 3200m
diff --git a/addons/mysql-cluster/8.0/plans/standard-4c16g100/values.yaml b/addons/mysql-cluster/8.0/plans/standard-4c16g100/values.yaml
@@ -12,14 +12,27 @@ fullnameOverride: hb-mysql-cluster-standard-100
 ## @param resources.requests The requested resources for the MinIO&reg; container
 ##
 primary: 
-  maxConnectionLimit: 4000
+  extraConfig: |
+    [mysqld]
+    innodb_io_capacity=2000
+    innodb_io_capacity_max=3000
+    max_connect_errors=1000000
+    open_files_limit=2000000                                     
+    performance_schema_max_table_instances=200
+    thread_cache_size=200
+    innodb_read_io_threads=8                 
+    innodb_write_io_threads=8                          
+    innodb_buffer_pool_instances=4
+    innodb_buffer_pool_size=10737418240
+    max_connections=4000
+
   resources:
     limits:
       cpu: 4000m
       memory: 16Gi
     requests:
       cpu: 4000m
-      memory: 16Gi
+      memory: 12Gi
   
 ## @section Persistence parameters
 
@@ -60,6 +73,12 @@ primary:
     selector: {}
 
 router:
+  replicaCount: 3
+  configuration: |-
+    [DEFAULT]
+    max_total_connections = 1200
+    [routing:bootstrap_rw]
+    max_connections= 1200
   resources:
     limits: 
       cpu: 500m
diff --git a/addons/mysql-cluster/8.0/plans/standard-8c32g200/values.yaml b/addons/mysql-cluster/8.0/plans/standard-8c32g200/values.yaml
@@ -12,7 +12,19 @@ fullnameOverride: hb-mysql-cluster-standard-200
 ## @param resources.requests The requested resources for the MinIO&reg; container
 ##
 primary: 
-  maxConnectionLimit: 8000
+  extraConfig: |
+    [mysqld]
+    innodb_io_capacity=2000
+    innodb_io_capacity_max=3000
+    max_connect_errors=1000000
+    open_files_limit=2000000                                     
+    performance_schema_max_table_instances=200
+    thread_cache_size=200
+    innodb_read_io_threads=16                 
+    innodb_write_io_threads=16                          
+    innodb_buffer_pool_instances=8
+    innodb_buffer_pool_size=22548578304
+    max_connections=8000
   resources:
     limits:
       cpu: 8000m
@@ -60,6 +72,12 @@ primary:
     selector: {}
 
 router:
+  replicaCount: 4
+  configuration: |-
+    [DEFAULT]
+    max_total_connections = 1900
+    [routing:bootstrap_rw]
+    max_connections= 1900
   resources:
     limits: 
       cpu: 800m
diff --git a/addons/postgresql-cluster/15/chart/postgresql-cluster/values.yaml b/addons/postgresql-cluster/15/chart/postgresql-cluster/values.yaml
diff --git a/addons/postgresql-cluster/15/plans/standard-1c2g10/bind.yaml b/addons/postgresql-cluster/15/plans/standard-1c2g10/bind.yaml
diff --git a/addons/postgresql-cluster/15/plans/standard-1c2g10/create-instance-schema.json b/addons/postgresql-cluster/15/plans/standard-1c2g10/create-instance-schema.json
diff --git a/addons/postgresql-cluster/15/plans/standard-1c2g10/meta.yaml b/addons/postgresql-cluster/15/plans/standard-1c2g10/meta.yaml
diff --git a/addons/postgresql-cluster/15/plans/standard-1c2g10/values.yaml b/addons/postgresql-cluster/15/plans/standard-1c2g10/values.yaml
diff --git a/addons/prometheus/2/meta.yaml b/addons/prometheus/2/meta.yaml
