fix: throttleHost is not array in ExternalRateLimit (#633)

* fix: throttleHost is not array in ExternalRateLimit Signed-off-by: Lin Yang <[email protected]> * fix: comment Signed-off-by: Lin Yang <[email protected]> * fix: make manifests Signed-off-by: Lin Yang <[email protected]> --------- Signed-off-by: Lin Yang <[email protected]>
flomesh-io · Jan 14, 2025 · 202805c · 202805c
1 parent 2bd3bec
commit 202805c
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 24 deletions.
diff --git a/cmd/fsm-bootstrap/crds/extension.gateway.flomesh.io_externalratelimits.yaml b/cmd/fsm-bootstrap/crds/extension.gateway.flomesh.io_externalratelimits.yaml
@@ -60,17 +60,11 @@ spec:
                 type: array
                 x-kubernetes-list-type: set
               throttleHost:
-                description: ThrottleHosts is the list of hosts to be throttled
-                items:
-                  description: HostPort is a host name with optional port number
-                  maxLength: 253
-                  minLength: 1
-                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*(:[0-9]{1,5})?$
-                  type: string
-                maxItems: 32
-                minItems: 1
-                type: array
-                x-kubernetes-list-type: set
+                description: ThrottleHost is the host to be throttled
+                maxLength: 253
+                minLength: 1
+                pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*(:[0-9]{1,5})?$
+                type: string
             type: object
           status:
             description: ExternalRateLimitStatus defines the observed state of ExternalRateLimit

diff --git a/cmd/fsm-bootstrap/crds/extension.gateway.flomesh.io_requestterminations.yaml b/cmd/fsm-bootstrap/crds/extension.gateway.flomesh.io_requestterminations.yaml
@@ -49,8 +49,8 @@ spec:
             description: RequestTerminationSpec defines the desired state of RequestTermination
             properties:
               response:
-                description: RequestTerminationResponse is the response when circuit
-                  breaker triggered
+                description: RequestTerminationResponse is the response when request
+                  termination triggered
                 properties:
                   body:
                     default: Request termination triggered

diff --git a/pkg/apis/extension/v1alpha1/externalratelimit.go b/pkg/apis/extension/v1alpha1/externalratelimit.go
@@ -7,11 +7,8 @@ import (
 
 // ExternalRateLimitSpec defines the desired state of ExternalRateLimit
 type ExternalRateLimitSpec struct {
-	// +listType=set
-	// +kubebuilder:validation:MinItems=1
-	// +kubebuilder:validation:MaxItems=32
-	// ThrottleHosts is the list of hosts to be throttled
-	ThrottleHosts []HostPort `json:"throttleHost,omitempty"`
+	// ThrottleHost is the host to be throttled
+	ThrottleHost HostPort `json:"throttleHost,omitempty"`
 
 	// +optional
 	// +listType=set

diff --git a/pkg/apis/extension/v1alpha1/requesttermination.go b/pkg/apis/extension/v1alpha1/requesttermination.go
@@ -7,7 +7,7 @@ import (
 
 // RequestTerminationSpec defines the desired state of RequestTermination
 type RequestTerminationSpec struct {
-	// RequestTerminationResponse is the response when circuit breaker triggered
+	// RequestTerminationResponse is the response when request termination triggered
 	RequestTerminationResponse RequestTerminationResponse `json:"response,omitempty"`
 }
 

diff --git a/pkg/apis/extension/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/extension/v1alpha1/zz_generated.deepcopy.go