fix test

Author: cjc7373

controllers/workloads/instance_controller.go

@@ -24,6 +24,7 @@ import (
 
 	corev1 "k8s.io/api/core/v1"
 	rbacv1 "k8s.io/api/rbac/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/tools/record"
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -129,12 +130,15 @@ func (r *InstanceReconciler) SetupWithManager(mgr ctrl.Manager) error {
 func (r *InstanceReconciler) listPods(ctx context.Context, req ctrl.Request) ([]*corev1.Pod, error) {
 	instance := &workloadsv1.Instance{}
 	if err := r.Get(ctx, req.NamespacedName, instance); err != nil {
+		if apierrors.IsNotFound(err) {
+			// pod may not be created yet
+			return nil, nil
+		}
 		return nil, err
 	}
 	matchingLabels := map[string]string{
-		constant.AppManagedByLabelKey:           constant.AppName,
-		instanceset2.WorkloadsManagedByLabelKey: workloadsv1.InstanceSetKind,
-		instanceset2.WorkloadsInstanceLabelKey:  instance.Labels[instanceset2.WorkloadsInstanceLabelKey],
+		constant.AppManagedByLabelKey:          constant.AppName,
+		instanceset2.WorkloadsInstanceLabelKey: instance.Labels[instanceset2.WorkloadsInstanceLabelKey],
 	}
 
 	podList := &corev1.PodList{}

pkg/controller/instance/utils.go

@@ -32,6 +32,7 @@ import (
 	workloads "github.com/apecloud/kubeblocks/apis/workloads/v1"
 	"github.com/apecloud/kubeblocks/pkg/constant"
 	"github.com/apecloud/kubeblocks/pkg/controller/builder"
+	"github.com/apecloud/kubeblocks/pkg/controller/instanceset2"
 	"github.com/apecloud/kubeblocks/pkg/controller/model"
 	intctrlutil "github.com/apecloud/kubeblocks/pkg/controllerutil"
 )
@@ -204,6 +205,7 @@ func buildInstancePod(inst *workloads.Instance, revision string) (*corev1.Pod, e
 		AddLabelsInMap(labels).
 		AddLabels(constant.KBAppPodNameLabelKey, inst.Name). // used as a pod-service selector
 		AddLabels(constant.KBAppInstanceTemplateLabelKey, inst.Spec.InstanceTemplateName).
+		AddLabels(instanceset2.WorkloadsInstanceLabelKey, inst.Labels[instanceset2.WorkloadsInstanceLabelKey]). // to select pods by instanceset
 		AddControllerRevisionHashLabel(revision).
 		SetPodSpec(*inst.Spec.Template.Spec.DeepCopy()).
 		GetObject()