wip

Author: cjc7373

pkg/controller/instance/utils.go

@@ -367,5 +367,5 @@ func newLifecycleAction(inst *workloads.Instance, objects []client.Object, pod *
 		pods = append(pods, objects[i].(*corev1.Pod))
 	}
 	return lifecycle.New(inst.Namespace, clusterName, compName,
-		lifecycleActions, inst.Spec.LifecycleActions.TemplateVars, pod, pods...)
+		lifecycleActions, inst.Spec.LifecycleActions.TemplateVars, pod, pods)
 }

pkg/controller/instanceset/reconciler_update.go

@@ -279,7 +279,11 @@ func (r *updateReconciler) switchover(tree *kubebuilderx.ObjectTree, its *worklo
 		return nil
 	}
 
-	lfa, err := newLifecycleAction(its, nil, pod)
+	pods := make([]*corev1.Pod, 0)
+	for _, object := range tree.List(&corev1.Pod{}) {
+		pods = append(pods, object.(*corev1.Pod))
+	}
+	lfa, err := newLifecycleAction(its, pods, pod)
 	if err != nil {
 		return err
 	}
@@ -318,7 +322,11 @@ func (r *updateReconciler) reconfigureConfig(tree *kubebuilderx.ObjectTree, its
 		itsCopy.Spec.LifecycleActions = &workloads.LifecycleActions{}
 	}
 	itsCopy.Spec.LifecycleActions.Reconfigure = config.Reconfigure
-	lfa, err := newLifecycleAction(itsCopy, nil, pod)
+	pods := make([]*corev1.Pod, 0)
+	for _, object := range tree.List(&corev1.Pod{}) {
+		pods = append(pods, object.(*corev1.Pod))
+	}
+	lfa, err := newLifecycleAction(itsCopy, pods, pod)
 	if err != nil {
 		return err
 	}

pkg/controller/instanceset/utils.go

@@ -30,7 +30,6 @@ import (
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/utils/integer"
-	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	kbappsv1 "github.com/apecloud/kubeblocks/apis/apps/v1"
 	workloads "github.com/apecloud/kubeblocks/apis/workloads/v1"
@@ -203,19 +202,15 @@ func getMemberUpdateStrategy(its *workloads.InstanceSet) workloads.MemberUpdateS
 	return updateStrategy
 }
 
-func newLifecycleAction(its *workloads.InstanceSet, objects []client.Object, pod *corev1.Pod) (lifecycle.Lifecycle, error) {
+func newLifecycleAction(its *workloads.InstanceSet, pods []*corev1.Pod, pod *corev1.Pod) (lifecycle.Lifecycle, error) {
 	var (
 		clusterName      = its.Labels[constant.AppInstanceLabelKey]
 		compName         = its.Labels[constant.KBAppComponentLabelKey]
 		lifecycleActions = &kbappsv1.ComponentLifecycleActions{
 			Switchover:  its.Spec.LifecycleActions.Switchover,
 			Reconfigure: its.Spec.LifecycleActions.Reconfigure,
 		}
-		pods []*corev1.Pod
 	)
-	for i := range objects {
-		pods = append(pods, objects[i].(*corev1.Pod))
-	}
 	return lifecycle.New(its.Namespace, clusterName, compName,
-		lifecycleActions, its.Spec.LifecycleActions.TemplateVars, pod, pods...)
+		lifecycleActions, its.Spec.LifecycleActions.TemplateVars, pod, pods)
 }

pkg/controller/lifecycle/lifecycle.go

@@ -65,7 +65,7 @@ func New(namespace, clusterName, compName string, lifecycleActions *appsv1.Compo
 		return nil, fmt.Errorf("pods must be provided to call lifecycle actions")
 	}
 	if pod == nil {
-		pod = pods[0]
+		return nil, fmt.Errorf("target pod must be provided to call lifecycle actions")
 	}
 	return &kbagent{
 		namespace:        namespace,