fix: r

Signed-off-by: ashing <axingfly@gmail.com>

Author: ronething

internal/controller/apisixpluginconfig_controller.go

@@ -226,7 +226,7 @@ func (r *ApisixPluginConfigReconciler) processIngressClassParameters(ctx context
 }
 
 func (r *ApisixPluginConfigReconciler) updateStatus(pc *apiv2.ApisixPluginConfig, err error) {
-	SetApisixPluginConfigConditionAccepted(&pc.Status, pc.GetGeneration(), err)
+	SetApisixCRDConditionAccepted(&pc.Status, pc.GetGeneration(), err)
 	r.Updater.Update(status.Update{
 		NamespacedName: utils.NamespacedName(pc),
 		Resource:       &apiv2.ApisixPluginConfig{},

internal/controller/apisixroute_controller.go

@@ -537,7 +537,7 @@ func (r *ApisixRouteReconciler) processIngressClassParameters(ctx context.Contex
 }
 
 func (r *ApisixRouteReconciler) updateStatus(ar *apiv2.ApisixRoute, err error) {
-	SetApisixRouteConditionAccepted(&ar.Status, ar.GetGeneration(), err)
+	SetApisixCRDConditionAccepted(&ar.Status, ar.GetGeneration(), err)
 	r.Updater.Update(status.Update{
 		NamespacedName: utils.NamespacedName(ar),
 		Resource:       &apiv2.ApisixRoute{},

internal/controller/utils.go

@@ -411,29 +411,7 @@ func ParseRouteParentRefs(
 	return gateways, nil
 }
 
-func SetApisixRouteConditionAccepted(status *apiv2.ApisixStatus, generation int64, err error) {
-	var condition = metav1.Condition{
-		Type:               string(apiv2.ConditionTypeAccepted),
-		Status:             metav1.ConditionTrue,
-		ObservedGeneration: generation,
-		LastTransitionTime: metav1.Now(),
-		Reason:             string(apiv2.ConditionReasonAccepted),
-	}
-	if err != nil {
-		condition.Status = metav1.ConditionFalse
-		condition.Reason = string(apiv2.ConditionReasonInvalidSpec)
-		condition.Message = err.Error()
-
-		var re ReasonError
-		if errors.As(err, &re) {
-			condition.Reason = re.Reason
-		}
-	}
-
-	status.Conditions = []metav1.Condition{condition}
-}
-
-func SetApisixPluginConfigConditionAccepted(status *apiv2.ApisixStatus, generation int64, err error) {
+func SetApisixCRDConditionAccepted(status *apiv2.ApisixStatus, generation int64, err error) {
 	var condition = metav1.Condition{
 		Type:               string(apiv2.ConditionTypeAccepted),
 		Status:             metav1.ConditionTrue,