fix: r

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

Author: ronething

internal/provider/api7ee/provider.go

@@ -111,6 +111,9 @@ func (d *api7eeProvider) Update(ctx context.Context, tctx *provider.TranslateCon
 	case *gatewayv1alpha2.UDPRoute:
 		result, err = d.translator.TranslateUDPRoute(tctx, t.DeepCopy())
 		resourceTypes = append(resourceTypes, adctypes.TypeService)
+	case *gatewayv1alpha2.TLSRoute:
+		result, err = d.translator.TranslateTLSRoute(tctx, t.DeepCopy())
+		resourceTypes = append(resourceTypes, adctypes.TypeService)
 	case *gatewayv1.GRPCRoute:
 		result, err = d.translator.TranslateGRPCRoute(tctx, t.DeepCopy())
 		resourceTypes = append(resourceTypes, "service")
@@ -192,7 +195,7 @@ func (d *api7eeProvider) Delete(ctx context.Context, obj client.Object) error {
 	var resourceTypes []string
 	var labels map[string]string
 	switch obj.(type) {
-	case *gatewayv1.HTTPRoute, *apiv2.ApisixRoute, *gatewayv1.GRPCRoute, *gatewayv1alpha2.TCPRoute, *gatewayv1alpha2.UDPRoute:
+	case *gatewayv1.HTTPRoute, *apiv2.ApisixRoute, *gatewayv1.GRPCRoute, *gatewayv1alpha2.TCPRoute, *gatewayv1alpha2.UDPRoute, *gatewayv1alpha2.TLSRoute:
 		resourceTypes = append(resourceTypes, "service")
 		labels = label.GenLabel(obj)
 	case *gatewayv1.Gateway:

internal/provider/api7ee/status.go

@@ -248,6 +248,41 @@ func (d *api7eeProvider) updateStatus(nnk types.NamespacedNameKind, condition me
 				return cp
 			}),
 		})
+	case types.KindTLSRoute:
+		parentRefs := d.client.ConfigManager.GetConfigRefsByResourceKey(nnk)
+		d.log.V(1).Info("updating TLSRoute status", "parentRefs", parentRefs)
+		gatewayRefs := map[types.NamespacedNameKind]struct{}{}
+		for _, parentRef := range parentRefs {
+			if parentRef.Kind == types.KindGateway {
+				gatewayRefs[parentRef] = struct{}{}
+			}
+		}
+		d.updater.Update(status.Update{
+			NamespacedName: nnk.NamespacedName(),
+			Resource:       &gatewayv1alpha2.TLSRoute{},
+			Mutator: status.MutatorFunc(func(obj client.Object) client.Object {
+				cp := obj.(*gatewayv1alpha2.TLSRoute).DeepCopy()
+				gatewayNs := cp.GetNamespace()
+				for i, ref := range cp.Status.Parents {
+					ns := gatewayNs
+					if ref.ParentRef.Namespace != nil {
+						ns = string(*ref.ParentRef.Namespace)
+					}
+					if ref.ParentRef.Kind == nil || *ref.ParentRef.Kind == types.KindGateway {
+						nnk := types.NamespacedNameKind{
+							Name:      string(ref.ParentRef.Name),
+							Namespace: ns,
+							Kind:      types.KindGateway,
+						}
+						if _, ok := gatewayRefs[nnk]; ok {
+							ref.Conditions = cutils.MergeCondition(ref.Conditions, condition)
+							cp.Status.Parents[i] = ref
+						}
+					}
+				}
+				return cp
+			}),
+		})
 	}
 }
 

internal/provider/apisix/status.go

@@ -249,6 +249,41 @@ func (d *apisixProvider) updateStatus(nnk types.NamespacedNameKind, condition me
 				return cp
 			}),
 		})
+	case types.KindTLSRoute:
+		parentRefs := d.client.ConfigManager.GetConfigRefsByResourceKey(nnk)
+		d.log.V(1).Info("updating TLSRoute status", "parentRefs", parentRefs)
+		gatewayRefs := map[types.NamespacedNameKind]struct{}{}
+		for _, parentRef := range parentRefs {
+			if parentRef.Kind == types.KindGateway {
+				gatewayRefs[parentRef] = struct{}{}
+			}
+		}
+		d.updater.Update(status.Update{
+			NamespacedName: nnk.NamespacedName(),
+			Resource:       &gatewayv1alpha2.TLSRoute{},
+			Mutator: status.MutatorFunc(func(obj client.Object) client.Object {
+				cp := obj.(*gatewayv1alpha2.TLSRoute).DeepCopy()
+				gatewayNs := cp.GetNamespace()
+				for i, ref := range cp.Status.Parents {
+					ns := gatewayNs
+					if ref.ParentRef.Namespace != nil {
+						ns = string(*ref.ParentRef.Namespace)
+					}
+					if ref.ParentRef.Kind == nil || *ref.ParentRef.Kind == types.KindGateway {
+						nnk := types.NamespacedNameKind{
+							Name:      string(ref.ParentRef.Name),
+							Namespace: ns,
+							Kind:      types.KindGateway,
+						}
+						if _, ok := gatewayRefs[nnk]; ok {
+							ref.Conditions = cutils.MergeCondition(ref.Conditions, condition)
+							cp.Status.Parents[i] = ref
+						}
+					}
+				}
+				return cp
+			}),
+		})
 	}
 }
 

test/e2e/framework/manifests/dp.yaml

@@ -213,7 +213,7 @@ spec:
           name: admin
           protocol: TCP
         - containerPort: 9443
-          name: tls
+          name: https
           protocol: TCP
         - containerPort: 9090
           name: control-api