fix bug

Author: wangyelei

addons/redis/dataprotection/backup.sh

@@ -15,7 +15,6 @@ trap handle_exit EXIT
 
 export PATH="$PATH:$DP_DATASAFED_BIN_PATH"
 export DATASAFED_BACKEND_BASE_PATH="$DP_BACKUP_BASE_PATH"
-<<<<<<< HEAD
 
 function save_sentinel_acl() {
   if [ -z "$SENTINEL_POD_FQDN_LIST" ]; then

addons/redis/dataprotection/wait-for-cluster-ready.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-redis_cmd="redis-cli -h ${DP_DB_HOST} -p ${DP_DB_PORT}"
+redis_cmd="redis-cli $REDIS_CLI_TLS_CMD -h ${DP_DB_HOST} -p ${DP_DB_PORT}"
 if [ -n "${REDIS_DEFAULT_PASSWORD}" ]; then
     redis_cmd="${redis_cmd} -a ${REDIS_DEFAULT_PASSWORD}"
 fi

addons/redis/redis-cluster-scripts/redis-cluster-manage.sh

@@ -946,9 +946,9 @@ scale_out_redis_cluster_shard() {
 sync_acl_for_redis_cluster_shard() {
   echo "Sync ACL rules for redis cluster shard..."
   set +ex
-  redis_base_cmd="redis-cli $REDIS_CLI_TLS_CMD -p $SERVICE_PORT -a $REDIS_DEFAULT_PASSWORD"
+  redis_base_cmd="redis-cli $REDIS_CLI_TLS_CMD -a $REDIS_DEFAULT_PASSWORD"
   if [ -z "$REDIS_DEFAULT_PASSWORD" ]; then
-     redis_base_cmd="redis-cli $REDIS_CLI_TLS_CMD -p $SERVICE_PORT"
+     redis_base_cmd="redis-cli $REDIS_CLI_TLS_CMD"
   fi
   is_ok=false
   acl_list=""

addons/redis/templates/cmpd-redis-cluster.yaml

@@ -353,9 +353,6 @@ spec:
     - name: SERVICE_PORT
       value: "6379"
       expression: {{ `{{if index . "REDIS_CLUSTER_HOST_NETWORK_PORT"}}{{.REDIS_CLUSTER_HOST_NETWORK_PORT}}{{else}}{{.SERVICE_PORT}}{{end}}` | toYaml }}
-    - name: REDIS_METRICS_ADDR
-      value: "redis://localhost:$(SERVICE_PORT)"
-      expression: {{ `{{if eq (index . "TLS_ENABLED") "true"}}rediss://localhost: {{.SERVICE_PORT }}{{else}}redis://localhost:{{.SERVICE_PORT}}{{end}}` | toYaml }}
     - name: REDIS_CLI_TLS_CMD
       value: ""
       expression: {{ `{{if eq (index . "TLS_ENABLED") "true"}}--tls --insecure{{else }}{{end}}` | toYaml }}
@@ -610,6 +607,10 @@ spec:
             value: $(REDIS_METRICS_HTTP_PORT)
           - name: METRICS_SERVER_PORT
             value: $(REDIS_METRICS_SERVER_PORT)
+          - name: REDIS_USER
+            value: $(REDIS_DEFAULT_USER)
+          - name: REDIS_PASSWORD
+            value: $(REDIS_DEFAULT_PASSWORD)
         command:
           - "/bin/agamotto"
           - "--config=/opt/conf/metrics-config.yaml"

addons/redis/templates/cmpd-redis.yaml

@@ -251,13 +251,10 @@ spec:
     - name: REDIS_METRICS_SERVER_PORT
       value: "8888"
       expression: {{ `{{if index . "REDIS_METRICS_HOST_NETWORK_SERVER_PORT"}}{{.REDIS_METRICS_HOST_NETWORK_SERVER_PORT}}{{else}}{{.REDIS_METRICS_SERVER_PORT}}{{end}}` | toYaml }}
-    - name: REDIS_METRICS_ADDR
-      value: "redis://localhost:$(SERVICE_PORT)"
-      expression: {{ `{{if eq (index . "TLS_ENABLED") "true"}}rediss://localhost:{{.SERVICE_PORT}}{{else}}redis://localhost:{{.SERVICE_PORT}}{{end}}` | toYaml }}
+  {{- end }}
     - name: REDIS_CLI_TLS_CMD
       value: ""
       expression: {{ `{{if eq (index . "TLS_ENABLED") "true"}}--tls --insecure{{else}}{{end}}` | toYaml }}
-  {{- end }}
     ## the component name of redis sentinel when redis sentinel is enabled, it's the fullname of redis-sentinel component
     - name: SENTINEL_COMPONENT_NAME
       valueFrom:
@@ -317,18 +314,14 @@ spec:
     - name: PHY_MEMORY
       valueFrom:
         resourceVarRef:
-<<<<<<< HEAD
           memoryLimit: Required
-=======
-          memory: Required
     - name: TLS_ENABLED
       valueFrom:
         tlsVarRef:
           enabled: Optional
           optional: true
     - name: TLS_MOUNT_PATH
       value: {{ $.Values.tlsMountPath }}
->>>>>>> ce73cc39 (chore: redis support tls (#2368))
   lifecycleActions:
     roleProbe:
       periodSeconds: 1
@@ -484,6 +477,10 @@ spec:
             value: $(REDIS_METRICS_HTTP_PORT)
           - name: METRICS_SERVER_PORT
             value: $(REDIS_METRICS_SERVER_PORT)
+          - name: REDIS_USER
+            value: $(REDIS_DEFAULT_USER)
+          - name: REDIS_PASSWORD
+            value: $(REDIS_DEFAULT_PASSWORD)
         command:
           - "/bin/agamotto"
           - "--config=/opt/conf/metrics-config.yaml"