fix: r

Signed-off-by: Ashing Zheng <[email protected]>

Author: ronething

internal/controller/label/label.go

@@ -31,15 +31,17 @@ const (
 	LabelNamespace      = "k8s/namespace"
 	LabelControllerName = "k8s/controller-name"
 	LabelManagedBy      = "manager-by"
+	LabelID             = "k8s/uid"
 )
 
-func GenLabel(client client.Object, args ...string) Label {
+func GenLabel(obj client.Object, args ...string) Label {
 	label := make(Label)
-	label[LabelKind] = client.GetObjectKind().GroupVersionKind().Kind
-	label[LabelNamespace] = client.GetNamespace()
-	label[LabelName] = client.GetName()
+	label[LabelKind] = obj.GetObjectKind().GroupVersionKind().Kind
+	label[LabelNamespace] = obj.GetNamespace()
+	label[LabelName] = obj.GetName()
 	label[LabelControllerName] = config.ControllerConfig.ControllerName
 	label[LabelManagedBy] = "apisix-ingress-controller"
+	label[LabelID] = string(obj.GetUID())
 	for i := 0; i < len(args); i += 2 {
 		label[args[i]] = args[i+1]
 	}

internal/provider/adc/adc.go

@@ -413,6 +413,10 @@ func (d *adcClient) Sync(ctx context.Context) error {
 
 func (d *adcClient) sync(ctx context.Context, task Task) error {
 	log.Debugw("syncing resources", zap.Any("task", task))
+	if len(task.Labels) > 0 {
+		// only keep the id label for filtering resources
+		task.Labels = map[string]string{label.LabelID: task.Labels[label.LabelID]}
+	}
 
 	if len(task.configs) == 0 {
 		log.Warnw("no adc configs provided", zap.Any("task", task))

test/e2e/crds/v2/route.go

@@ -21,6 +21,7 @@ import (
 	"context"
 	"fmt"
 	"io"
+	"log"
 	"net"
 	"net/http"
 	"time"
@@ -441,6 +442,7 @@ spec:
 			By("verify ApisixRoute works")
 			for _, id := range []string{"1", "11", "111", "1111", "11111"} {
 				host := fmt.Sprintf("httpbin-%s", id)
+				log.Println("host: ", host)
 				Eventually(func() int {
 					return s.NewAPISIXClient().GET("/get").WithHost(host).Expect().Raw().StatusCode
 				}).WithTimeout(8 * time.Second).ProbeEvery(time.Second).Should(Equal(http.StatusOK))