fix

Author: AlinsRan

api/adc/types.go

@@ -128,9 +128,9 @@ type Route struct {
 }
 
 type Timeout struct {
-	Connect *int64 `json:"connect,omitempty"`
-	Read    *int64 `json:"read,omitempty"`
-	Send    *int64 `json:"send,omitempty"`
+	Connect int64 `json:"connect"`
+	Read    int64 `json:"read"`
+	Send    int64 `json:"send"`
 }
 
 type StreamRoute struct {

api/v1alpha1/backendtrafficpolicy_types.go

@@ -72,9 +72,12 @@ type LoadBalancer struct {
 }
 
 type Timeout struct {
+	// +kubebuilder:default="60s"
 	Connect metav1.Duration `json:"connect,omitempty" yaml:"connect,omitempty"`
-	Send    metav1.Duration `json:"send,omitempty" yaml:"send,omitempty"`
-	Read    metav1.Duration `json:"read,omitempty" yaml:"read,omitempty"`
+	// +kubebuilder:default="60s"
+	Send metav1.Duration `json:"send,omitempty" yaml:"send,omitempty"`
+	// +kubebuilder:default="60s"
+	Read metav1.Duration `json:"read,omitempty" yaml:"read,omitempty"`
 }
 
 // +kubebuilder:object:root=true

config/crd/bases/gateway.apisix.io_backendtrafficpolicies.yaml

@@ -168,10 +168,13 @@ spec:
                   upstream.
                 properties:
                   connect:
+                    default: 60s
                     type: string
                   read:
+                    default: 60s
                     type: string
                   send:
+                    default: 60s
                     type: string
                 type: object
               upstream_host:

internal/controller/indexer/indexer.go

@@ -37,6 +37,9 @@ func SetupIndexer(mgr ctrl.Manager) error {
 	if err := setupConsumerIndexer(mgr); err != nil {
 		return err
 	}
+	if err := setupBackendTrafficPolicyIndexer(mgr); err != nil {
+		return err
+	}
 	return nil
 }
 
@@ -178,6 +181,18 @@ func setupIngressIndexer(mgr ctrl.Manager) error {
 	return nil
 }
 
+func setupBackendTrafficPolicyIndexer(mgr ctrl.Manager) error {
+	if err := mgr.GetFieldIndexer().IndexField(
+		context.Background(),
+		&v1alpha1.BackendTrafficPolicy{},
+		PolicyTargetRefs,
+		BackendTrafficPolicyIndexFunc,
+	); err != nil {
+		return err
+	}
+	return nil
+}
+
 func IngressClassIndexFunc(rawObj client.Object) []string {
 	ingressClass := rawObj.(*networkingv1.IngressClass)
 	if ingressClass.Spec.Controller == "" {
@@ -314,7 +329,7 @@ func BackendTrafficPolicyIndexFunc(rawObj client.Object) []string {
 	for _, ref := range btp.Spec.TargetRefs {
 		keys = append(keys,
 			GenIndexKeyWithGK(
-				v1alpha1.GroupVersion.Group,
+				string(ref.Group),
 				string(ref.Kind),
 				btp.GetNamespace(),
 				string(ref.Name),

internal/controller/policies.go

@@ -10,6 +10,7 @@ import (
 	"github.com/api7/api7-ingress-controller/internal/controller/config"
 	"github.com/api7/api7-ingress-controller/internal/controller/indexer"
 	"github.com/api7/api7-ingress-controller/internal/provider"
+	"github.com/go-logr/logr"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
@@ -25,7 +26,9 @@ func (p PolicyTargetKey) String() string {
 	return p.NsName.String() + "/" + p.GroupKind.String()
 }
 
-func ProcessBackendTrafficPolicy(c client.Client, tctx *provider.TranslateContext) {
+func ProcessBackendTrafficPolicy(c client.Client,
+	log logr.Logger,
+	tctx *provider.TranslateContext) {
 	conflicts := map[string]v1alpha1.BackendTrafficPolicy{}
 	for _, service := range tctx.Services {
 		backendTrafficPolicyList := &v1alpha1.BackendTrafficPolicyList{}
@@ -34,10 +37,8 @@ func ProcessBackendTrafficPolicy(c client.Client, tctx *provider.TranslateContex
 				indexer.PolicyTargetRefs: indexer.GenIndexKeyWithGK("", "Service", service.Namespace, service.Name),
 			},
 		); err != nil {
-			if client.IgnoreNotFound(err) == nil {
-				continue
-			}
-			return
+			log.Error(err, "failed to list BackendTrafficPolicy for Service")
+			continue
 		}
 		if len(backendTrafficPolicyList.Items) == 0 {
 			continue

internal/provider/adc/translator/policies.go

@@ -3,19 +3,34 @@ package translator
 import (
 	"github.com/api7/api7-ingress-controller/api/adc"
 	"github.com/api7/api7-ingress-controller/api/v1alpha1"
+	"github.com/api7/gopkg/pkg/log"
+	"go.uber.org/zap"
 	"k8s.io/apimachinery/pkg/types"
+	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
 
 	adctypes "github.com/api7/api7-ingress-controller/api/adc"
 )
 
-func (t *Translator) AttachBackendTrafficPolicyToUpstream(policies map[types.NamespacedName]*v1alpha1.BackendTrafficPolicy, upstream *adctypes.Upstream) {
+func (t *Translator) AttachBackendTrafficPolicyToUpstream(ref gatewayv1.BackendRef, policies map[types.NamespacedName]*v1alpha1.BackendTrafficPolicy, upstream *adctypes.Upstream) {
 	if len(policies) == 0 {
 		return
 	}
-	for _, policy := range policies {
-		t.attachBackendTrafficPolicyToUpstream(policy, upstream)
+	var policy *v1alpha1.BackendTrafficPolicy
+	for _, po := range policies {
+		for _, targetRef := range po.Spec.TargetRefs {
+			if ref.Name == targetRef.Name &&
+				(ref.Namespace != nil && string(*ref.Namespace) == po.Namespace) {
+				policy = po
+				break
+			}
+		}
 	}
-
+	if policy == nil {
+		return
+	}
+	log.Errorw("attach backend traffic policy to upstream",
+		zap.String("policy", policy.Name))
+	t.attachBackendTrafficPolicyToUpstream(policy, upstream)
 }
 
 func (t *Translator) attachBackendTrafficPolicyToUpstream(policy *v1alpha1.BackendTrafficPolicy, upstream *adctypes.Upstream) {
@@ -29,27 +44,10 @@ func (t *Translator) attachBackendTrafficPolicyToUpstream(policy *v1alpha1.Backe
 		*upstream.Retries = int64(*policy.Spec.Retries)
 	}
 	if policy.Spec.Timeout != nil {
-		var (
-			connect *int64
-			read    *int64
-			send    *int64
-		)
-		if policy.Spec.Timeout.Connect.Duration > 0 {
-			connect = new(int64)
-			*connect = policy.Spec.Timeout.Connect.Duration.Milliseconds()
-		}
-		if policy.Spec.Timeout.Read.Duration > 0 {
-			read = new(int64)
-			*read = policy.Spec.Timeout.Read.Duration.Milliseconds()
-		}
-		if policy.Spec.Timeout.Send.Duration > 0 {
-			send = new(int64)
-			*send = policy.Spec.Timeout.Send.Duration.Milliseconds()
-		}
 		upstream.Timeout = &adctypes.Timeout{
-			Connect: connect,
-			Read:    read,
-			Send:    send,
+			Connect: policy.Spec.Timeout.Connect.Duration.Milliseconds(),
+			Read:    policy.Spec.Timeout.Read.Duration.Milliseconds(),
+			Send:    policy.Spec.Timeout.Send.Duration.Milliseconds(),
 		}
 	}
 	if policy.Spec.LoadBalancer != nil {