update codegen

Signed-off-by: Haywood Shannon <[email protected]> Signed-off-by: Haywood Shannon <[email protected]>
nginx · Jan 31, 2025 · 2a20bc5 · 2a20bc5
1 parent c4b77ac
commit 2a20bc5
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 4 deletions.
diff --git a/config/crd/bases/k8s.nginx.org_policies.yaml b/config/crd/bases/k8s.nginx.org_policies.yaml
@@ -180,6 +180,8 @@ spec:
                   burst:
                     type: integer
                   condition:
+                    description: RateLimitCondition defines a condition for a rate
+                      limit policy.
                     properties:
                       default:
                         type: boolean

diff --git a/deploy/crds.yaml b/deploy/crds.yaml
@@ -342,6 +342,8 @@ spec:
                   burst:
                     type: integer
                   condition:
+                    description: RateLimitCondition defines a condition for a rate
+                      limit policy.
                     properties:
                       default:
                         type: boolean

diff --git a/internal/configs/virtualserver_test.go b/internal/configs/virtualserver_test.go
@@ -6522,8 +6522,8 @@ func TestGenerateVirtualServerConfigRateLimitPolicyAuthJwt(t *testing.T) {
 		},
 		HTTPSnippets: []string{},
 		LimitReqZones: []version2.LimitReqZone{
-			{"test", "pol_rl_default_gold-rate-limit-policy_default_cafe", "10M", "10r/s"},
-			{"test", "pol_rl_default_silver-rate-limit-policy_default_cafe", "20M", "20r/s"},
+			{Key: "test", ZoneName: "pol_rl_default_gold-rate-limit-policy_default_cafe", ZoneSize: "10M", Rate: "10r/s"},
+			{Key: "test", ZoneName: "pol_rl_default_silver-rate-limit-policy_default_cafe", ZoneSize: "20M", Rate: "20r/s"},
 		},
 		Server: version2.Server{
 			JWTAuthList:     nil,
@@ -6542,8 +6542,8 @@ func TestGenerateVirtualServerConfigRateLimitPolicyAuthJwt(t *testing.T) {
 			VSName:          "cafe",
 			APIKeyEnabled:   false,
 			LimitReqs: []version2.LimitReq{
-				{"pol_rl_default_gold-rate-limit-policy_default_cafe", 0, false, 0},
-				{"pol_rl_default_silver-rate-limit-policy_default_cafe", 0, false, 0},
+				{ZoneName: "pol_rl_default_gold-rate-limit-policy_default_cafe", Burst: 0, NoDelay: false, Delay: 0},
+				{ZoneName: "pol_rl_default_silver-rate-limit-policy_default_cafe", Burst: 0, NoDelay: false, Delay: 0},
 			},
 			LimitReqOptions: version2.LimitReqOptions{
 				DryRun:     false,

diff --git a/pkg/apis/configuration/v1/types.go b/pkg/apis/configuration/v1/types.go
@@ -614,12 +614,15 @@ type RateLimit struct {
 	Condition *RateLimitCondition `json:"condition"`
 }
 
+// RateLimitCondition defines a condition for a rate limit policy.
 type RateLimitCondition struct {
 	JWT JWTCondition `json:"jwt"`
 	// +kubebuilder:validation:Optional
 	Default bool `json:"default"`
 }
 
+// RateLimitCondition defines a condition for a rate limit by JWT claim.
+
 type JWTCondition struct {
 	// +kubebuilder:validation:Required
 	// +kubebuilder:validation:Pattern=`^([^$\s"'])*$`

diff --git a/pkg/apis/configuration/v1/zz_generated.deepcopy.go b/pkg/apis/configuration/v1/zz_generated.deepcopy.go