resolve comments

Author: dspo

api/v2/status.go

@@ -14,29 +14,9 @@ package v2
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
 // ApisixStatus is the status report for Apisix ingress Resources
 type ApisixStatus struct {
 	Conditions []metav1.Condition `json:"conditions,omitempty" yaml:"conditions,omitempty"`
 }
-
-func GetStatus(object client.Object) ApisixStatus {
-	switch t := object.(type) {
-	case *ApisixConsumer:
-		return t.Status
-	case *ApisixGlobalRule:
-		return t.Status
-	case *ApisixPluginConfig:
-		return t.Status
-	case *ApisixRoute:
-		return t.Status
-	case *ApisixTls:
-		return t.Status
-	case *ApisixUpstream:
-		return t.Status
-	default:
-		return ApisixStatus{}
-	}
-}

internal/controller/apisixroute_controller.go

@@ -149,16 +149,9 @@ func (r *ApisixRouteReconciler) processApisixRoute(ctx context.Context, tc *prov
 
 		// check secret
 		for _, plugin := range http.Plugins {
-			if !plugin.Enable {
+			if !plugin.Enable || plugin.Config == nil || plugin.SecretRef == "" {
 				continue
 			}
-			if plugin.Config == nil {
-				continue
-			}
-			if plugin.SecretRef == "" {
-				continue
-			}
-
 			var (
 				secret = corev1.Secret{
 					ObjectMeta: metav1.ObjectMeta{
@@ -455,7 +448,7 @@ func (r *ApisixRouteReconciler) updateStatus(ar *apiv2.ApisixRoute, err error) {
 	SetApisixRouteConditionAccepted(&ar.Status, ar.GetGeneration(), err)
 	r.Updater.Update(status.Update{
 		NamespacedName: utils.NamespacedName(ar),
-		Resource:       ar.DeepCopy(),
+		Resource:       &apiv2.ApisixRoute{},
 		Mutator: status.MutatorFunc(func(obj client.Object) client.Object {
 			cp := obj.(*apiv2.ApisixRoute).DeepCopy()
 			cp.Status = ar.Status

test/e2e/framework/assertion.go

@@ -16,6 +16,7 @@ import (
 	"context"
 	"fmt"
 	"log"
+	"reflect"
 	"slices"
 	"strings"
 	"time"
@@ -97,13 +98,21 @@ func PollUntilHTTPRoutePolicyHaveStatus(cli client.Client, timeout time.Duration
 }
 
 func APIv2MustHaveCondition(t testing.TestingT, cli client.Client, timeout time.Duration, nn types.NamespacedName, obj client.Object, cond metav1.Condition) {
-	err := PollUntilAPIv2MustHaveStatus(cli, timeout, nn, obj, func(object client.Object) bool {
-		conditions := apiv2.GetStatus(object).Conditions
-		if err := kubernetes.ConditionsHaveLatestObservedGeneration(object, conditions); err != nil {
+	f := func(object client.Object) bool {
+		if !apiv2.Is(object) {
 			return false
 		}
-		return findConditionInList(conditions, cond)
-	})
+		value := reflect.Indirect(reflect.ValueOf(object))
+		status, ok := value.FieldByName("Status").Interface().(apiv2.ApisixStatus)
+		if !ok {
+			return false
+		}
+		if err := kubernetes.ConditionsHaveLatestObservedGeneration(object, status.Conditions); err != nil {
+			return false
+		}
+		return findConditionInList(status.Conditions, cond)
+	}
+	err := PollUntilAPIv2MustHaveStatus(cli, timeout, nn, obj, f)
 
 	require.NoError(t, err, "error waiting status to have a Condition matching %+v", nn, cond)
 }