resolve comments

Author: dspo

api/v1alpha1/httproutepolicy_types.go

@@ -36,10 +36,12 @@ type HTTPRoutePolicySpec struct {
 	// +kubebuilder:validation:MaxItems=16
 	TargetRefs []gatewayv1alpha2.LocalPolicyTargetReferenceWithSectionName `json:"targetRefs"`
 
-	Policy HTTPRoutePolicySpecPolicy `json:"policy"`
+	Priority *int64 `json:"priority,omitempty" yaml:"priority,omitempty"`
+	Vars     Vars   `json:"vars,omitempty" yaml:"vars,omitempty"`
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
 
 // HTTPRoutePolicy is the Schema for the httproutepolicies API.
 type HTTPRoutePolicy struct {
@@ -59,11 +61,6 @@ type HTTPRoutePolicyList struct {
 	Items           []HTTPRoutePolicy `json:"items"`
 }
 
-type HTTPRoutePolicySpecPolicy struct {
-	Priority *int64 `json:"priority,omitempty" yaml:"priority,omitempty"`
-	Vars     Vars   `json:"vars,omitempty" yaml:"vars,omitempty"`
-}
-
 // Vars represents the route match expressions of APISIX.
 // +kubebuilder:object:generate=false
 type Vars = common.Vars

api/v1alpha1/zz_generated.deepcopy.go

@@ -39,22 +39,9 @@ spec:
           spec:
             description: HTTPRoutePolicySpec defines the desired state of HTTPRoutePolicy.
             properties:
-              policy:
-                properties:
-                  priority:
-                    format: int64
-                    type: integer
-                  vars:
-                    description: Vars represents the route match expressions of APISIX.
-                    items:
-                      items:
-                        description: |-
-                          StringOrSlice represents a string or a string slice.
-                          TODO Do not use interface{} to avoid the reflection overheads.
-                        type: object
-                      type: array
-                    type: array
-                type: object
+              priority:
+                format: int64
+                type: integer
               targetRefs:
                 description: |-
                   TargetRef identifies an API object (enum: HTTPRoute, Ingress) to apply HTTPRoutePolicy to.
@@ -122,8 +109,17 @@ spec:
                 - kind
                 - name
                 x-kubernetes-list-type: map
+              vars:
+                description: Vars represents the route match expressions of APISIX.
+                items:
+                  items:
+                    description: |-
+                      StringOrSlice represents a string or a string slice.
+                      TODO Do not use interface{} to avoid the reflection overheads.
+                    type: object
+                  type: array
+                type: array
             required:
-            - policy
             - targetRefs
             type: object
           status:
@@ -474,3 +470,5 @@ spec:
         type: object
     served: true
     storage: true
+    subresources:
+      status: {}