Merge remote-tracking branch 'origin' into GHSA-8r3f-844c-mc37

envoyproxy · Apr 25, 2024 · 8c7d6d7 · 8c7d6d7
2 parents afb43da + fdb47dd
commit 8c7d6d7
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 13 deletions.
diff --git a/api/v1alpha1/ratelimit_types.go b/api/v1alpha1/ratelimit_types.go
@@ -114,6 +114,7 @@ type RateLimitSelectCondition struct {
 	SourceCIDR *SourceMatch `json:"sourceCIDR,omitempty"`
 }
 
+// +kubebuilder:validation:Enum=Exact;Distinct
 type SourceMatchType string
 
 const (

diff --git a/charts/gateway-helm/crds/generated/gateway.envoyproxy.io_backendtrafficpolicies.yaml b/charts/gateway-helm/crds/generated/gateway.envoyproxy.io_backendtrafficpolicies.yaml
@@ -571,6 +571,9 @@ spec:
                                     properties:
                                       type:
                                         default: Exact
+                                        enum:
+                                        - Exact
+                                        - Distinct
                                         type: string
                                       value:
                                         description: |-
@@ -701,6 +704,9 @@ spec:
                                     properties:
                                       type:
                                         default: Exact
+                                        enum:
+                                        - Exact
+                                        - Distinct
                                         type: string
                                       value:
                                         description: |-

diff --git a/proto/extension/context.pb.go b/proto/extension/context.pb.go
diff --git a/proto/extension/service.pb.go b/proto/extension/service.pb.go
diff --git a/proto/extension/service_grpc.pb.go b/proto/extension/service_grpc.pb.go
diff --git a/test/e2e/testdata/ratelimit-cidr-match.yaml b/test/e2e/testdata/ratelimit-cidr-match.yaml
@@ -16,7 +16,7 @@ spec:
         - clientSelectors:
             - sourceCIDR:
                 value: 0.0.0.0/0
-                type: distinct
+                type: Distinct
           limit:
             requests: 3
             unit: Hour

diff --git a/test/e2e/testdata/ratelimit-multiple-listeners.yaml b/test/e2e/testdata/ratelimit-multiple-listeners.yaml
@@ -48,7 +48,7 @@ spec:
         - clientSelectors:
             - sourceCIDR:
                 value: 0.0.0.0/0
-                type: distinct
+                type: Distinct
           limit:
             requests: 3
             unit: Hour
diff --git a/tools/make/lint.mk b/tools/make/lint.mk
@@ -69,10 +69,10 @@ lint.shellcheck: $(tools/shellcheck)
 	$(tools/shellcheck) tools/hack/*.sh
 
 .PHONY: gen-check
-gen-check: generate manifests go.testdata.complete
+gen-check: generate manifests protos go.testdata.complete
 	@$(LOG_TARGET)
 	@if [ ! -z "`git status --porcelain`" ]; then \
-		$(call errorlog, ERROR: Some files need to be updated, please run 'make generate' and 'make manifests' to include any changed files to your PR); \
+		$(call errorlog, ERROR: Some files need to be updated, please run 'make generate', 'make manifests' and 'make protos' to include any changed files to your PR); \
 		git diff --exit-code; \
 	fi
-Original file line number
+Diff line change
@@ Expand Up / @@ -114,6 +114,7 @@ type RateLimitSelectCondition struct { @@
     	SourceCIDR *SourceMatch `json:"sourceCIDR,omitempty"`
     }
+    // +kubebuilder:validation:Enum=Exact;Distinct
     type SourceMatchType string
     const (
@@ Expand Down @@