fix: redis cluster ops is always running (#10133)

(cherry picked from commit 9c42f6f)

Author: wangyelei

apis/apps/v1/cluster_types.go

@@ -172,7 +172,7 @@ type ClusterSpec struct {
 	// +kubebuilder:validation:MinItems=1
 	// +kubebuilder:validation:MaxItems=128
 	// +optional
-	Shardings []ClusterSharding `json:"shardings,omitempty"`
+	Shardings []ClusterSharding `json:"shardings,omitempty" patchStrategy:"merge,retainKeys" patchMergeKey:"name"`
 
 	// Specifies runtimeClassName for all Pods managed by this Cluster.
 	//

controllers/apps/cluster/transformer_cluster_sharding_account.go

@@ -211,6 +211,9 @@ func (t *clusterShardingAccountTransformer) rewriteSystemAccount(transCtx *clust
 			for j, account := range sharding.Template.SystemAccounts {
 				if account.Name == accountName {
 					newAccount.Disabled = account.Disabled
+					if account.SecretRef != nil {
+						newAccount.SecretRef.Password = account.SecretRef.Password
+					}
 					transCtx.shardings[i].Template.SystemAccounts[j] = newAccount
 					exist = true
 					break