add user to env&script

Signed-off-by: wkd-woo <[email protected]>

example/v1beta2/backup_restore/backup/env-secrets.yaml

@@ -11,6 +11,7 @@ stringData:
   RESTIC_PASSWORD: abc@123
   RESTIC_CACHE_DIR: "/tmp/restic_cache"
   REDIS_PORT: "6379"
+  REDIS_USERNAME: "default"
   REDIS_PASSWORD: ""
   BACKUP_DESTINATION: AWS_S3
   AWS_S3_BUCKET: shubham-redis

scripts/backup/backup-user.bash

@@ -6,6 +6,7 @@ set -e  # Exit on error
 DEFAULT_CLUSTER_NAME="redis-cluster"
 DEFAULT_CLUSTER_NAMESPACE="default"
 DEFAULT_REDIS_PORT="6379"
+DEFAULT_REDIS_USERNAME="default"
 DEFAULT_REDIS_PASSWORD=""
 
 # Prompt the user for input or use default values
@@ -18,6 +19,9 @@ CLUSTER_NAMESPACE=${CLUSTER_NAMESPACE:-$DEFAULT_CLUSTER_NAMESPACE}
 read -p "Enter Redis port [$DEFAULT_REDIS_PORT]: " REDIS_PORT
 REDIS_PORT=${REDIS_PORT:-$DEFAULT_REDIS_PORT}
 
+read -p "Enter Redis username [DEFAULT_REDIS_USERNAME]: " REDIS_USERNAME
+REDIS_USERNAME=${REDIS_USERNAME:-DEFAULT_REDIS_USERNAME}
+
 read -p "Enter Redis password [$DEFAULT_REDIS_PASSWORD]: " REDIS_PASSWORD
 REDIS_PASSWORD=${REDIS_PASSWORD:-$DEFAULT_REDIS_PASSWORD}
 
@@ -59,7 +63,7 @@ REDIS_HOST="${CLUSTER_NAME}-leader-0.${CLUSTER_NAME}-leader-headless.${CLUSTER_N
 
 # Check the Total Leader Present in Redis Cluster using cr and redis-cli
 TOTAL_LEADERS=$(kubectl get redisclusters.redis.redis.opstreelabs.in "${CLUSTER_NAME}" -n "${CLUSTER_NAMESPACE}" -o jsonpath='{.spec.redisLeader.replicas}')
-MASTERS_IP=($(redis-cli -h "$REDIS_HOST" -p "$REDIS_PORT" -a "$REDIS_PASSWORD" --no-auth-warning cluster nodes | grep "master" | awk '{print $2}' | cut -d "@" -f1))
+MASTERS_IP=($(redis-cli -h "$REDIS_HOST" -p "$REDIS_PORT" --username "$REDIS_USERNAME" -a "$REDIS_PASSWORD" --no-auth-warning cluster nodes | grep "master" | awk '{print $2}' | cut -d "@" -f1))
 
 check_total_leaders_from_cr() {
   if [[ -z "$TOTAL_LEADERS" || "$TOTAL_LEADERS" == 0 ]]; then
@@ -108,7 +112,7 @@ perform_redis_backup(){
         echo "Performing backup on Redis instance at $IP:$PORT"
 
         # Copy the file from the Redis instance to a local file
-        redis-cli -h "$IP" -p "$PORT" -a "$REDIS_PASSWORD" --rdb "/tmp/${POD}.rdb"
+        redis-cli -h "$IP" -p "$PORT" --username "$REDIS_USERNAME" -a "$REDIS_PASSWORD" --rdb "/tmp/${POD}.rdb"
 
         # Upload the file to the selected backup destination using restic
         restic -r "$RESTIC_REPOSITORY" backup "/tmp/${POD}.rdb" --host "${CLUSTER_NAME}_${CLUSTER_NAMESPACE}" --tag "${POD}" --tag "redis"

scripts/backup/backup-v0.15.1.bash

@@ -23,7 +23,7 @@ REDIS_HOST="${CLUSTER_NAME}-leader-0.${CLUSTER_NAME}-leader-headless.${CLUSTER_N
 
 # Check the Total Leader Present in Redis Cluster using cr and redis-cli
 TOTAL_LEADERS=$(kubectl get redisclusters.redis.redis.opstreelabs.in "${CLUSTER_NAME}" -n "${CLUSTER_NAMESPACE}" -o jsonpath='{.spec.redisLeader.replicas}')
-MASTERS_IP=($(redis-cli -h "$REDIS_HOST" -p "$REDIS_PORT" -a "$REDIS_PASSWORD" --no-auth-warning cluster nodes | grep "master" | awk '{print $2}' | cut -d "@" -f1))
+MASTERS_IP=($(redis-cli -h "$REDIS_HOST" -p "$REDIS_PORT" --username "$REDIS_USERNAME" -a "$REDIS_PASSWORD" --no-auth-warning cluster nodes | grep "master" | awk '{print $2}' | cut -d "@" -f1))
 
 check_total_leaders_from_cr() {
   if [[ -z "$TOTAL_LEADERS" || "$TOTAL_LEADERS" == 0 ]]; then
@@ -73,7 +73,7 @@ perform_redis_backup(){
         echo "Performing backup on Redis instance at $IP:$PORT"
 
         # Copy the file from the Redis instance to a local file
-        redis-cli -h "$IP" -p "$PORT" -a "$REDIS_PASSWORD" --rdb "/tmp/${POD}.rdb"
+        redis-cli -h "$IP" -p "$PORT" --username "$REDIS_USERNAME" -a "$REDIS_PASSWORD" --rdb "/tmp/${POD}.rdb"
 
         # Upload the file to the selected backup destination using restic
         restic -r "$RESTIC_REPOSITORY" backup "/tmp/${POD}.rdb" --host "${CLUSTER_NAME}_${CLUSTER_NAMESPACE}" --tag "${POD}" --tag "redis"

scripts/backup/backup.bash

@@ -23,7 +23,7 @@ REDIS_HOST="${CLUSTER_NAME}-leader-0.${CLUSTER_NAME}-leader-headless.${CLUSTER_N
 
 # Check the Total Leader Present in Redis Cluster using cr and redis-cli
 TOTAL_LEADERS=$(kubectl get redisclusters.redis.redis.opstreelabs.in "${CLUSTER_NAME}" -n "${CLUSTER_NAMESPACE}" -o jsonpath='{.spec.redisLeader.replicas}')
-MASTERS_IP=($(redis-cli -h "$REDIS_HOST" -p "$REDIS_PORT" -a "$REDIS_PASSWORD" --no-auth-warning cluster nodes | grep "master" | awk '{print $2}' | cut -d "@" -f1))
+MASTERS_IP=($(redis-cli -h "$REDIS_HOST" -p "$REDIS_PORT" --username "$REDIS_USERNAME" -a "$REDIS_PASSWORD" --no-auth-warning cluster nodes | grep "master" | awk '{print $2}' | cut -d "@" -f1))
 
 check_total_leaders_from_cr() {
   # Check if TOTAL_LEADERS is 0 or nil
@@ -73,7 +73,7 @@ perform_redis_backup(){
         echo "Performing backup on Redis instance at $IP:$PORT"
 
         # Copy the file from the Redis instance to a local file
-        redis-cli -h "$IP" -p "$PORT" -a "$REDIS_PASSWORD" --rdb "/tmp/${POD}.rdb"
+        redis-cli -h "$IP" -p "$PORT" --username "$REDIS_USERNAME" -a "$REDIS_PASSWORD" --rdb "/tmp/${POD}.rdb"
 
         # Upload the file to the selected backup destination using restic
         restic -r "$RESTIC_REPOSITORY" backup "/tmp/${POD}.rdb" --host "${CLUSTER_NAME}_${CLUSTER_NAMESPACE}" --tag "${POD}" --tag "redis"

scripts/backup/env_vars.env

@@ -11,6 +11,7 @@ export RESTIC_CACHE_DIR=/tmp/restic_cache
 
 # Redis 
 export DEFAULT_REDIS_PORT="6379"
+export DEFAULT_REDIS_USERNAME="default"
 export DEFAULT_REDIS_PASSWORD=""
 
 # Backup destination

scripts/env_vars.env

@@ -12,6 +12,7 @@ export RESTIC_CACHE_DIR=/tmp/restic_cache
 # Redis 
 export DEFAULT_REDIS_HOST="redis-cluster-leader-0"
 export DEFAULT_REDIS_PORT="6379"
+export DEFAULT_REDIS_USERNAME="default"
 export DEFAULT_REDIS_PASSWORD=""
 
 # Backup destination

scripts/restore/env_vars.env

@@ -11,10 +11,10 @@ export RESTIC_CACHE_DIR=/tmp/restic_cache
 
 # Redis 
 export DEFAULT_REDIS_PORT="6379"
+export DEFAULT_REDIS_USERNAME="default"
 export DEFAULT_REDIS_PASSWORD=""
 
 # Backup destination
-
 export BACKUP_DESTINATION=AWS_S3
 
 # AWS