enable rate limit for month and year

Signed-off-by: Rico Pahlisch <[email protected]> Signed-off-by: Rico Pahlisch <[email protected]>
envoyproxy · Oct 23, 2024 · d123cb6 · d123cb6
1 parent 544bd9c
commit d123cb6
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 7 deletions.
diff --git a/api/v1alpha1/ratelimit_types.go b/api/v1alpha1/ratelimit_types.go
@@ -198,9 +198,9 @@ type RateLimitValue struct {
 }
 
 // RateLimitUnit specifies the intervals for setting rate limits.
-// Valid RateLimitUnit values are "Second", "Minute", "Hour", and "Day".
+// Valid RateLimitUnit values are "Second", "Minute", "Hour", "Day", "Month" and "Year".
 //
-// +kubebuilder:validation:Enum=Second;Minute;Hour;Day
+// +kubebuilder:validation:Enum=Second;Minute;Hour;Day;Month;Year
 type RateLimitUnit string
 
 // RateLimitUnit constants.
@@ -216,4 +216,10 @@ const (
 
 	// RateLimitUnitDay specifies the rate limit interval to be 1 day.
 	RateLimitUnitDay RateLimitUnit = "Day"
+
+	// RateLimitUnitMonth specifies the rate limit interval to be 1 month.
+	RateLimitUnitMonth RateLimitUnit = "Month"
+
+	// RateLimitUnitYear specifies the rate limit interval to be 1 year.
+	RateLimitUnitYear RateLimitUnit = "Year"
 )
diff --git a/charts/gateway-helm/crds/generated/gateway.envoyproxy.io_backendtrafficpolicies.yaml b/charts/gateway-helm/crds/generated/gateway.envoyproxy.io_backendtrafficpolicies.yaml
@@ -766,12 +766,14 @@ spec:
                                 unit:
                                   description: |-
                                     RateLimitUnit specifies the intervals for setting rate limits.
-                                    Valid RateLimitUnit values are "Second", "Minute", "Hour", and "Day".
+                                    Valid RateLimitUnit values are "Second", "Minute", "Hour", "Day", "Month" and "Year".
                                   enum:
                                   - Second
                                   - Minute
                                   - Hour
                                   - Day
+                                  - Month
+                                  - Year
                                   type: string
                               required:
                               - requests
@@ -901,12 +903,14 @@ spec:
                                 unit:
                                   description: |-
                                     RateLimitUnit specifies the intervals for setting rate limits.
-                                    Valid RateLimitUnit values are "Second", "Minute", "Hour", and "Day".
+                                    Valid RateLimitUnit values are "Second", "Minute", "Hour", "Day", "Month" and "Year".
                                   enum:
                                   - Second
                                   - Minute
                                   - Hour
                                   - Day
+                                  - Month
+                                  - Year
                                   type: string
                               required:
                               - requests

diff --git a/internal/gatewayapi/backendtrafficpolicy.go b/internal/gatewayapi/backendtrafficpolicy.go
@@ -800,6 +800,10 @@ func ratelimitUnitToDuration(unit egv1a1.RateLimitUnit) int64 {
 		seconds = 60 * 60
 	case egv1a1.RateLimitUnitDay:
 		seconds = 60 * 60 * 24
+	case egv1a1.RateLimitUnitMonth:
+		seconds = 60 * 60 * 24 * 30
+	case egv1a1.RateLimitUnitYear:
+		seconds = 60 * 60 * 24 * 365
 	}
 	return seconds
 }

diff --git a/internal/xds/translator/local_ratelimit.go b/internal/xds/translator/local_ratelimit.go
@@ -302,6 +302,10 @@ func ratelimitUnitToDuration(unit ir.RateLimitUnit) *durationpb.Duration {
 		seconds = 60 * 60
 	case egv1a1.RateLimitUnitDay:
 		seconds = 60 * 60 * 24
+	case egv1a1.RateLimitUnitMonth:
+		seconds = 60 * 60 * 24 * 30
+	case egv1a1.RateLimitUnitYear:
+		seconds = 60 * 60 * 24 * 365
 	}
 	return &durationpb.Duration{
 		Seconds: seconds,

diff --git a/site/content/en/latest/api/extension_types.md b/site/content/en/latest/api/extension_types.md
@@ -3450,7 +3450,7 @@ _Appears in:_
 _Underlying type:_ _string_
 
 RateLimitUnit specifies the intervals for setting rate limits.
-Valid RateLimitUnit values are "Second", "Minute", "Hour", and "Day".
+Valid RateLimitUnit values are "Second", "Minute", "Hour", and "Day", "Month" and "Year".
 
 _Appears in:_
 - [RateLimitValue](#ratelimitvalue)
@@ -3461,6 +3461,8 @@ _Appears in:_
 | `Minute` | RateLimitUnitMinute specifies the rate limit interval to be 1 minute.<br /> | 
 | `Hour` | RateLimitUnitHour specifies the rate limit interval to be 1 hour.<br /> | 
 | `Day` | RateLimitUnitDay specifies the rate limit interval to be 1 day.<br /> | 
+| `Month` | RateLimitUnitDay specifies the rate limit interval to be 1 month.<br /> |
+| `Year` | RateLimitUnitDay specifies the rate limit interval to be 1 year.<br /> |
 
 
 #### RateLimitValue

diff --git a/site/content/zh/latest/api/extension_types.md b/site/content/zh/latest/api/extension_types.md
@@ -3450,7 +3450,7 @@ _Appears in:_
 _Underlying type:_ _string_
 
 RateLimitUnit specifies the intervals for setting rate limits.
-Valid RateLimitUnit values are "Second", "Minute", "Hour", and "Day".
+Valid RateLimitUnit values are "Second", "Minute", "Hour", and "Day", "Month" and "Year".
 
 _Appears in:_
 - [RateLimitValue](#ratelimitvalue)
@@ -3461,7 +3461,8 @@ _Appears in:_
 | `Minute` | RateLimitUnitMinute specifies the rate limit interval to be 1 minute.<br /> | 
 | `Hour` | RateLimitUnitHour specifies the rate limit interval to be 1 hour.<br /> | 
 | `Day` | RateLimitUnitDay specifies the rate limit interval to be 1 day.<br /> | 
-
+| `Month` | RateLimitUnitDay specifies the rate limit interval to be 1 month.<br /> |
+| `Year`| RateLimitUnitDay specifies the rate limit interval to be 1 year.<br /> |
 
 #### RateLimitValue