chore(redis-cluster): upgrade proxy

Author: jianxiaoguo

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

@@ -11,41 +11,6 @@ metadata:
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 data:
-  {{- if .Values.proxy.enabled }}
-  redis-proxy-default.toml: |-
-    [log]
-    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-cluster-proxy.log" # log file name
-
-    [metrics]
-    port = 2110
-
-    [[clusters]]
-    name = "redis-cluster-proxy"
-    listen_addr = "0.0.0.0:{{ .Values.proxy.containerPorts.proxy }}"
-    hash_tag = "{}"
-    thread = 2
-    cache_type = "redis_cluster"
-    servers = ["127.0.0.1:{{ .Values.redis.containerPorts.redis }}"]
-
-    fetch_interval = 300000
-    fetch_since_latest_cmd = 300
-    read_from_slave = false
-
-    ping_fail_limit = 10
-    ping_interval = 300
-
-    read_timeout = 1000
-    write_timeout = 1000
-    dial_timeout = 500
-    listen_proto = "tcp"
-    node_connections = 1
-
-    auth = {REDIS_PASSWORD}
-  {{- end }}
   redis-default.conf: |-
     # Redis configuration file example.
     #

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

@@ -322,8 +322,10 @@ spec:
               {{- if .Values.usePasswordFile }}
               export REDIS_PASSWORD="$(< "${REDIS_PASSWORD_FILE}")"
               {{- end }}
-              sed s/{REDIS_PASSWORD}/\"${REDIS_PASSWORD}\"/g /opt/drycc/redis/etc/redis-proxy-default.toml > /opt/drycc/redis/etc/redis-proxy.toml
-              redis-cluster-proxy /opt/drycc/redis/etc/redis-proxy.toml
+              redis-cluster-proxy \
+                -startup-nodes=127.0.0.1:{{ .Values.redis.containerPorts.redis }} \
+                -addr=0.0.0.0:{{ .Values.proxy.containerPorts.proxy }} \
+                -password=$(REDIS_PASSWORD)
           {{- end }}
           env:
             {{- if and .Values.usePassword (not .Values.usePasswordFile) }}

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

@@ -26,10 +26,10 @@ redis:
   ##
   resources:
     limits:
-      cpu: 200m
+      cpu: 300m
       memory: 1024Mi
     requests:
-      cpu: 20m
+      cpu: 150m
       memory: 512Mi
 
 ## @section Proxy® statefulset parameters
@@ -42,8 +42,8 @@ proxy:
   ##
   resources:
     limits:
-      cpu: 100m
+      cpu: 200m
       memory: 256Mi
     requests:
-      cpu: 10m
-      memory: 64Mi
+      cpu: 100m
+      memory: 128Mi

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

@@ -26,10 +26,10 @@ redis:
   ##
   resources:
     limits:
-      cpu: 100m
+      cpu: 200m
       memory: 128Mi
     requests:
-      cpu: 10m
+      cpu: 100m
       memory: 64Mi
 
 ## @section Proxy® statefulset parameters
@@ -42,8 +42,8 @@ proxy:
   ##
   resources:
     limits:
-      cpu: 100m
-      memory: 128Mi
+      cpu: 200m
+      memory: 256Mi
     requests:
-      cpu: 10m
-      memory: 64Mi
+      cpu: 100m
+      memory: 128Mi

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

@@ -26,10 +26,10 @@ redis:
   ##
   resources:
     limits:
-      cpu: 1000m
+      cpu: 2000m
       memory: 16Gi
     requests:
-      cpu: 100m
+      cpu: 1000m
       memory: 8Gi
 
 ## @section Proxy® statefulset parameters
@@ -42,8 +42,8 @@ proxy:
   ##
   resources:
     limits:
-      cpu: 100m
-      memory: 256Mi
+      cpu: 1000m
+      memory: 1024Mi
     requests:
-      cpu: 10m
-      memory: 64Mi
+      cpu: 500m
+      memory: 512Mi

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

@@ -26,10 +26,10 @@ redis:
   ##
   resources:
     limits:
-      cpu: 300m
+      cpu: 500m
       memory: 2Gi
     requests:
-      cpu: 30m
+      cpu: 250m
       memory: 1Gi
 
 ## @section Proxy® statefulset parameters
@@ -42,8 +42,8 @@ proxy:
   ##
   resources:
     limits:
-      cpu: 100m
-      memory: 256Mi
+      cpu: 300m
+      memory: 512Mi
     requests:
-      cpu: 10m
-      memory: 64Mi
+      cpu: 150m
+      memory: 256Mi

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

@@ -26,10 +26,10 @@ redis:
   ##
   resources:
     limits:
-      cpu: 100m
+      cpu: 200m
       memory: 256Mi
     requests:
-      cpu: 10m
+      cpu: 100m
       memory: 128Mi
 
 ## @section Proxy® statefulset parameters
@@ -42,8 +42,8 @@ proxy:
   ##
   resources:
     limits:
-      cpu: 100m
+      cpu: 200m
       memory: 256Mi
     requests:
-      cpu: 10m
-      memory: 64Mi
+      cpu: 100m
+      memory: 128Mi

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

@@ -26,10 +26,10 @@ redis:
   ##
   resources:
     limits:
-      cpu: 1000m
+      cpu: 4000m
       memory: 32Gi
     requests:
-      cpu: 100m
+      cpu: 2000m
       memory: 16Gi
 
 ## @section Proxy® statefulset parameters
@@ -42,8 +42,8 @@ proxy:
   ##
   resources:
     limits:
-      cpu: 100m
-      memory: 256Mi
+      cpu: 1000m
+      memory: 1024Mi
     requests:
-      cpu: 10m
-      memory: 64Mi
+      cpu: 500m
+      memory: 512Mi

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

@@ -26,10 +26,10 @@ redis:
   ##
   resources:
     limits:
-      cpu: 500m
+      cpu: 1000m
       memory: 4Gi
     requests:
-      cpu: 50m
+      cpu: 500m
       memory: 2Gi
 
 ## @section Proxy® statefulset parameters
@@ -42,8 +42,8 @@ proxy:
   ##
   resources:
     limits:
-      cpu: 100m
-      memory: 256Mi
+      cpu: 500m
+      memory: 512Mi
     requests:
-      cpu: 10m
-      memory: 64Mi
+      cpu: 250m
+      memory: 256Mi

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

@@ -26,10 +26,10 @@ redis:
   ##
   resources:
     limits:
-      cpu: 100m
+      cpu: 200m
       memory: 512Mi
     requests:
-      cpu: 10m
+      cpu: 100m
       memory: 256Mi
 
 ## @section Proxy® statefulset parameters
@@ -42,8 +42,8 @@ proxy:
   ##
   resources:
     limits:
-      cpu: 100m
+      cpu: 200m
       memory: 256Mi
     requests:
-      cpu: 10m
-      memory: 64Mi
+      cpu: 100m
+      memory: 128Mi