Merge branch 'main' of https://github.com/drycc-addons/addons into main

Author: EamonZhang

addons/redis-cluster/7.0/chart/redis-cluster/templates/configmap.yaml

@@ -14,11 +14,11 @@ data:
   {{- if .Values.proxy.enabled }}
   redis-proxy-default.toml: |-
     [log]
-    level = "libredis_proxy=warn" # "trace" "info" "debug" "warn" "error"
+    level = "libproxy=error" # "trace" "info" "debug" "warn" "error"
     ansi = true  # support ANSI colors
     stdout = true # print logs to stdout
     directory = "/tmp" # log file directory
-    file_name = "redis-proxy.log" # log file name
+    file_name = "redis-cluster-proxy.log" # log file name
 
     [metrics]
     port = 2110
@@ -27,12 +27,12 @@ data:
     name = "redis-cluster-proxy"
     listen_addr = "0.0.0.0:{{ .Values.proxy.containerPorts.proxy }}"
     hash_tag = "{}"
-    thread = 1
+    thread = 2
     cache_type = "redis_cluster"
     servers = ["127.0.0.1:{{ .Values.redis.containerPorts.redis }}"]
 
-    fetch_interval = 1800000 # 1800s , 30 minutes
-    fetch_since_latest_cmd = 1000 # 3600s , 1 hour
+    fetch_interval = 300000
+    fetch_since_latest_cmd = 300
     read_from_slave = false
 
     ping_fail_limit = 10

addons/redis-cluster/7.0/chart/redis-cluster/templates/redis-statefulset.yaml

@@ -110,6 +110,7 @@ spec:
               ips=($(echo "{{ .Values.cluster.externalAccess.service.loadBalancerIP }}" | cut -d [ -f2 | cut -d ] -f 1))
               export REDIS_CLUSTER_ANNOUNCE_IP="${ips[$pod_index]}"
               export REDIS_NODES="${ips[@]}"
+              export REDIS_CLUSTER_ANNOUNCE_HOSTNAME="$(POD_NAME).$(HEADLESS_SERVICE_NAME)"
               {{- if .Values.cluster.init }}
               if [[ "$pod_index" == "0" ]]; then
                 export REDIS_CLUSTER_CREATOR="yes"
@@ -121,6 +122,7 @@ spec:
           args:
             - |
               # Backwards compatibility change
+              export REDIS_CLUSTER_ANNOUNCE_HOSTNAME="$(POD_NAME).{{ template "common.names.fullname" $ }}-headless"
               if ! [[ -f /opt/drycc/redis/etc/redis.conf ]]; then
                   echo COPYING FILE
                   cp  /opt/drycc/redis/etc/redis-default.conf /opt/drycc/redis/etc/redis.conf
@@ -140,6 +142,16 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.name
+            - name: REDIS_CLUSTER_PREFERRED_ENDPOINT_TYPE
+              value: "hostname"
+            - name: HEADLESS_SERVICE_NAME
+              value: {{ template "common.names.fullname" $ }}-headless
+            {{- if .Values.ioThread.enabled }}
+            - name: REDIS_IO_THREADS_DO_READS
+              value: {{ .Values.ioThread.doReads }}
+            - name: REDIS_IO_THREADS
+              value: {{ .Values.ioThread.counts | quote }}
+            {{- end }}
             {{- if .Values.cluster.externalAccess.enabled }}
             - name: REDIS_CLUSTER_DYNAMIC_IPS
               value: "no"

addons/redis-cluster/7.0/chart/redis-cluster/values.yaml

@@ -195,6 +195,11 @@ existingSecretPasswordKey: ""
 ## @param usePasswordFile Mount passwords as files instead of environment variables
 ##
 usePasswordFile: false
+## io-thread
+ioThread:
+  enabled: false
+  doReads:  "yes"
+  counts: 2
 ##
 ## TLS configuration
 ##

addons/redis-cluster/7.0/plans/standard-65536/values.yaml

@@ -2,6 +2,12 @@
 ##
 fullnameOverride: "hb-redis-cluster-standard-65536"
 
+## io-thread
+ioThread:
+  enabled: true
+  doReads:  "yes"
+  counts: 2
+
 ## Enable persistence using Persistent Volume Claims
 ## ref: https://kubernetes.io/docs/user-guide/persistent-volumes/
 ##