@@ -18,7 +18,6 @@ import (
1818 "fmt"
1919 "reflect"
2020
21- "github.com/api7/gopkg/pkg/log"
2221 "github.com/go-logr/logr"
2322 corev1 "k8s.io/api/core/v1"
2423 metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -34,6 +33,8 @@ import (
3433 gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
3534 "sigs.k8s.io/gateway-api/apis/v1beta1"
3635
36+ "github.com/api7/gopkg/pkg/log"
37+
3738 "github.com/apache/apisix-ingress-controller/api/v1alpha1"
3839 "github.com/apache/apisix-ingress-controller/internal/controller/indexer"
3940 "github.com/apache/apisix-ingress-controller/internal/provider"
@@ -182,11 +183,6 @@ func (r *GatewayReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
182183 msg : err .Error (),
183184 }
184185 }
185- setAccepted := SetGatewayConditionAccepted (gateway , acceptStatus .status , acceptStatus .msg )
186- setProgrammed := SetGatewayConditionProgrammed (gateway , conditionProgrammedStatus , conditionProgrammedMsg )
187- if ! acceptStatus .status {
188- return ctrl.Result {}, r .Status ().Update (ctx , gateway )
189- }
190186
191187 var referenceGrantList v1beta1.ReferenceGrantList
192188 if err := r .List (ctx , & referenceGrantList ); err != nil {
@@ -199,7 +195,9 @@ func (r *GatewayReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
199195 return ctrl.Result {}, err
200196 }
201197
202- if setAccepted || setProgrammed || len (addrs ) > 0 || len (listenerStatuses ) > 0 {
198+ accepted := SetGatewayConditionAccepted (gateway , acceptStatus .status , acceptStatus .msg )
199+ programmed := SetGatewayConditionProgrammed (gateway , conditionProgrammedStatus , conditionProgrammedMsg )
200+ if accepted || programmed || len (addrs ) > 0 || len (listenerStatuses ) > 0 {
203201 if len (addrs ) > 0 {
204202 gateway .Status .Addresses = addrs
205203 }
0 commit comments