Skip to content

Commit 7f25ef5

Browse files
committed
resolve comments
1 parent 3ab59b0 commit 7f25ef5

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

internal/controller/httproute_controller.go

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -229,14 +229,9 @@ func (r *HTTPRouteReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
229229
for _, condition := range gateway.Conditions {
230230
parentStatus.Conditions = MergeCondition(parentStatus.Conditions, condition)
231231
}
232-
SetRouteConditionResolvedRefs(&parentStatus, hr.GetGeneration(), resolveRefStatus.status, resolveRefStatus.msg)
233232
SetRouteConditionAccepted(&parentStatus, hr.GetGeneration(), acceptStatus.status, acceptStatus.msg)
234-
if accepted := isRouteAccepted([]RouteParentRefContext{gateway}); accepted {
235-
hr.Status.Parents = append(hr.Status.Parents, parentStatus)
236-
} else {
237-
hr.Status.Parents = []gatewayv1.RouteParentStatus{parentStatus}
238-
break
239-
}
233+
SetRouteConditionResolvedRefs(&parentStatus, hr.GetGeneration(), resolveRefStatus.status, resolveRefStatus.msg)
234+
hr.Status.Parents = append(hr.Status.Parents, parentStatus)
240235
}
241236
if err := r.Status().Update(ctx, hr); err != nil {
242237
return ctrl.Result{}, err

internal/controller/utils.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121
"slices"
2222
"strings"
2323

24+
"github.com/api7/gopkg/pkg/log"
2425
"github.com/samber/lo"
2526
"go.uber.org/zap"
2627
corev1 "k8s.io/api/core/v1"
@@ -32,8 +33,6 @@ import (
3233
"sigs.k8s.io/controller-runtime/pkg/reconcile"
3334
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
3435

35-
"github.com/api7/gopkg/pkg/log"
36-
3736
"github.com/apache/apisix-ingress-controller/api/v1alpha1"
3837
"github.com/apache/apisix-ingress-controller/internal/controller/config"
3938
"github.com/apache/apisix-ingress-controller/internal/provider"

0 commit comments

Comments
 (0)