chore(falkordb): sharding lifecycle actions (#2947)

Author: shanshanying

addons-cluster/falkordb/templates/_helpers.tpl

@@ -17,11 +17,11 @@ Define falkordb cluster shardingSpec with ComponentDefinition.
 */}}
 {{- define "falkordb-cluster.shardingSpec" }}
 - name: shard
+  shardingDef: falkordb-cluster
   shards: {{ .Values.falkordbCluster.shardCount }}
   template:
     name: falkordb
     {{- include "redis-cluster.tls" . | indent 4 }}
-    componentDef: falkordb-cluster
     replicas: {{ .Values.replicas }}
     {{- if .Values.podAntiAffinityEnabled }}
     {{- include "falkordb-cluster.shardingSchedulingPolicy" . | indent 2 }}
@@ -304,4 +304,4 @@ metadata:
   {{- end }}
 spec:
   terminationPolicy: {{ .Values.extra.terminationPolicy }}
-{{- end }}
+{{- end }}

addons/falkordb/falkordb-cluster-scripts/falkordb-cluster-common.sh

@@ -35,9 +35,8 @@ sleep_random_second_when_ut_mode_false() {
   fi
 }
 
-# usage: parse_host_ip_from_built_in_envs <pod_name>
-# $KB_CLUSTER_COMPONENT_POD_NAME_LIST and $KB_CLUSTER_COMPONENT_POD_HOST_IP_LIST are built-in envs in KubeBlocks postProvision lifecycle action.
-# TODO: the built-in envs will be removed in the future.
+# usage: parse_host_ip_from_built_in_envs <pod_name> <pod_name_list> <pod_host_ip_list>
+# Kept for scripts that pass an explicit pod-name/IP mapping.
 parse_host_ip_from_built_in_envs() {
   local given_pod_name="$1"
   local all_pod_name_list="$2"
@@ -454,24 +453,17 @@ check_slots_covered() {
 
 # check if the cluster has been initialized
 check_cluster_initialized() {
-  local cluster_pod_ip_list="$1"
-  local cluster_pod_name_list="$2"
-  if is_empty "$cluster_pod_ip_list" || is_empty "$cluster_pod_name_list"; then
-    echo "Error: Required environment variable cluster_pod_ip_list or cluster_pod_name_list is not set." >&2
+  local cluster_pod_fqdn_list="$1"
+  if is_empty "$cluster_pod_fqdn_list"; then
+    echo "Error: Required environment variable cluster_pod_fqdn_list is not set." >&2
     return 1
   fi
 
-  local pod_ip
   local service_port
-  for pod_name in $(echo "$cluster_pod_name_list" | tr ',' ' '); do
-    pod_ip=$(parse_host_ip_from_built_in_envs "$pod_name" "$cluster_pod_name_list" "$cluster_pod_ip_list")
-    if is_empty "$pod_ip"; then
-      echo "Failed to get the host ip of the pod $pod_name in check_cluster_initialized"
-      continue
-    fi
-
+  for pod_fqdn in $(echo "$cluster_pod_fqdn_list" | tr ',' ' '); do
+    pod_name=${pod_fqdn%%.*}
     service_port=$(get_pod_service_port_by_network_mode "${pod_name}")
-    cluster_info=$(get_cluster_info_with_retry "$pod_ip" "$service_port")
+    cluster_info=$(get_cluster_info_with_retry "$pod_fqdn" "$service_port")
     status=$?
     if [ $status -ne 0 ]; then
       echo "Failed to get cluster info in check_cluster_initialized" >&2
@@ -487,6 +479,36 @@ check_cluster_initialized() {
   return 1
 }
 
+redis_config_get() {
+  local host=$1
+  local port=$2
+  local password=$3
+  local command=$4
+
+  local output
+  unset_xtrace_when_ut_mode_false
+  if ! is_empty "$password"; then
+    output=$(redis-cli $REDIS_CLI_TLS_CMD -h "$host" -p "$port" -a "$password" $command)
+  else
+    output=$(redis-cli $REDIS_CLI_TLS_CMD -h "$host" -p "$port" $command)
+  fi
+  local status=$?
+  set_xtrace_when_ut_mode_false
+
+  if [[ $status -ne 0 ]]; then
+    echo "Command failed with status $status." >&2
+    return 1
+  fi
+
+  if [[ -z "$output" ]]; then
+    echo "Command returned no output." >&2
+    return 1
+  fi
+
+  echo "$output"
+  return 0
+}
+
 build_redis_cluster_create_command() {
   local primary_nodes="$1"
   unset_xtrace_when_ut_mode_false
@@ -740,4 +762,4 @@ check_redis_role() {
   else
     echo "unknown"
   fi
-}
+}