add e2e case for ApisixRoute

Author: dspo

api/v2/apisixpluginconfig_types.go

@@ -28,7 +28,7 @@ type ApisixPluginConfigSpec struct {
 }
 
 // ApisixPluginConfigStatus defines the observed state of ApisixPluginConfig.
-type ApisixPluginConfigStatus ApisixStatus
+type ApisixPluginConfigStatus = ApisixStatus
 
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status

api/v2/apisixroute_types.go

@@ -72,6 +72,7 @@ type ApisixRouteHTTP struct {
 	// Upstreams refer to ApisixUpstream CRD
 	Upstreams []ApisixRouteUpstreamReference `json:"upstreams,omitempty" yaml:"upstreams,omitempty"`
 
+	// +kubebuilder:validation:Optional
 	Websocket        bool   `json:"websocket" yaml:"websocket"`
 	PluginConfigName string `json:"plugin_config_name,omitempty" yaml:"plugin_config_name,omitempty"`
 	// By default, PluginConfigNamespace will be the same as the namespace of ApisixRoute
@@ -159,6 +160,7 @@ type ApisixRouteHTTPBackend struct {
 	// default is endpoints.
 	ResolveGranularity string `json:"resolveGranularity,omitempty" yaml:"resolveGranularity,omitempty"`
 	// Weight of this backend.
+	// +kubebuilder:validation:Optional
 	Weight *int `json:"weight" yaml:"weight"`
 	// Subset specifies a subset for the target Service. The subset should be pre-defined
 	// in ApisixUpstream about this service.

api/v2/groupversion_info.go

@@ -17,6 +17,7 @@ package v2
 
 import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/scheme"
 )
 
@@ -30,3 +31,12 @@ var (
 	// AddToScheme adds the types in this group-version to the given scheme.
 	AddToScheme = SchemeBuilder.AddToScheme
 )
+
+func Is(obj client.Object) bool {
+	switch obj.(type) {
+	case *ApisixConsumer, *ApisixGlobalRule, *ApisixPluginConfig, *ApisixRoute, *ApisixTls, *ApisixUpstream:
+		return obj.GetObjectKind().GroupVersionKind().GroupVersion() == GroupVersion
+	default:
+		return false
+	}
+}

api/v2/reason.go

@@ -26,9 +26,10 @@ type (
 )
 
 const (
-	ApisixRouteConditionTypeAccepted      ApisixRouteConditionType   = gatewayv1.RouteConditionAccepted
-	ApisixRouteConditionReasonAccepted    ApisixRouteConditionReason = gatewayv1.RouteReasonAccepted
-	ApisixRouteConditionReasonInvalidHTTP ApisixRouteConditionReason = "InvalidHTTP"
+	ConditionTypeAccepted      ApisixRouteConditionType   = gatewayv1.RouteConditionAccepted
+	ConditionReasonAccepted    ApisixRouteConditionReason = gatewayv1.RouteReasonAccepted
+	ConditionReasonInvalidSpec ApisixRouteConditionReason = "InvalidSpec"
+	ConditionReasonSyncFailed  ApisixRouteConditionReason = "SyncFailed"
 )
 
 const (

api/v2/shared_types.go

@@ -14,9 +14,29 @@ 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{}
+	}
+}

api/v2/status.go

@@ -74,7 +74,7 @@ spec:
             - plugins
             type: object
           status:
-            description: ApisixPluginConfigStatus defines the observed state of ApisixPluginConfig.
+            description: ApisixStatus is the status report for Apisix ingress Resources
             properties:
               conditions:
                 items:

api/v2/zz_generated.deepcopy.go

@@ -130,7 +130,6 @@ spec:
                         required:
                         - serviceName
                         - servicePort
-                        - weight
                         type: object
                       type: array
                     match:
@@ -303,7 +302,6 @@ spec:
                       type: boolean
                   required:
                   - name
-                  - websocket
                   type: object
                 type: array
               ingressClassName:

config/crd/bases/apisix.apache.org_apisixpluginconfigs.yaml

@@ -96,11 +96,11 @@ func (r *ApisixGlobalRuleReconciler) Reconcile(ctx context.Context, req ctrl.Req
 		log.Error(err, "failed to sync global rule to provider")
 		// Update status with failure condition
 		r.updateStatus(&globalRule, metav1.Condition{
-			Type:               string(gatewayv1.RouteConditionAccepted),
+			Type:               string(apiv2.ConditionTypeAccepted),
 			Status:             metav1.ConditionFalse,
 			ObservedGeneration: globalRule.Generation,
 			LastTransitionTime: metav1.Now(),
-			Reason:             string(apiv2.ReasonSyncFailed),
+			Reason:             string(apiv2.ConditionReasonSyncFailed),
 			Message:            err.Error(),
 		})
 		return ctrl.Result{}, err