Fix: grammer

Signed-off-by: Jim Fitzpatrick <[email protected]>
Kuadrant · Nov 18, 2024 · d79a7d0 · d79a7d0
1 parent dea4490
commit d79a7d0
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 19 deletions.
diff --git a/api/v1/ratelimitpolicy_types.go b/api/v1/ratelimitpolicy_types.go
@@ -153,9 +153,9 @@ func (p *RateLimitPolicy) Kind() string {
 // +kubebuilder:validation:XValidation:rule="!(has(self.defaults) && has(self.limits))",message="Implicit and explicit defaults are mutually exclusive"
 // +kubebuilder:validation:XValidation:rule="!(has(self.defaults) && has(self.overrides))",message="Overrides and explicit defaults are mutually exclusive"
 // +kubebuilder:validation:XValidation:rule="!(has(self.overrides) && has(self.limits))",message="Overrides and implicit defaults are mutually exclusive"
-// +kubebuilder:validation:XValidation:rule="!(has(self.overrides) || has(self.defaults)) ? has(self.limits) && size(self.limits) > 0 : true",message="At least one spec.limits most be defined"
-// +kubebuilder:validation:XValidation:rule="has(self.overrides) ? has(self.overrides.limits) && size(self.overrides.limits) > 0 : true",message="At least one spec.overrides.limits most be defined"
-// +kubebuilder:validation:XValidation:rule="has(self.defaults) ? has(self.defaults.limits) && size(self.defaults.limits) > 0 : true",message="At least one spec.defaults.limits most be defined"
+// +kubebuilder:validation:XValidation:rule="!(has(self.overrides) || has(self.defaults)) ? has(self.limits) && size(self.limits) > 0 : true",message="At least one spec.limits must be defined"
+// +kubebuilder:validation:XValidation:rule="has(self.overrides) ? has(self.overrides.limits) && size(self.overrides.limits) > 0 : true",message="At least one spec.overrides.limits must be defined"
+// +kubebuilder:validation:XValidation:rule="has(self.defaults) ? has(self.defaults.limits) && size(self.defaults.limits) > 0 : true",message="At least one spec.defaults.limits must be defined"
 type RateLimitPolicySpec struct {
 	// Reference to the object to which this policy applies.
 	// +kubebuilder:validation:XValidation:rule="self.group == 'gateway.networking.k8s.io'",message="Invalid targetRef.group. The only supported value is 'gateway.networking.k8s.io'"

diff --git a/bundle/manifests/kuadrant-operator.clusterserviceversion.yaml b/bundle/manifests/kuadrant-operator.clusterserviceversion.yaml
@@ -109,7 +109,7 @@ metadata:
     capabilities: Basic Install
     categories: Integration & Delivery
     containerImage: quay.io/kuadrant/kuadrant-operator:latest
-    createdAt: "2024-11-14T19:01:18Z"
+    createdAt: "2024-11-18T10:54:46Z"
     description: A Kubernetes Operator to manage the lifecycle of the Kuadrant system
     operators.operatorframework.io/builder: operator-sdk-v1.32.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3

diff --git a/bundle/manifests/kuadrant.io_ratelimitpolicies.yaml b/bundle/manifests/kuadrant.io_ratelimitpolicies.yaml
@@ -392,13 +392,13 @@ spec:
               rule: '!(has(self.defaults) && has(self.overrides))'
             - message: Overrides and implicit defaults are mutually exclusive
               rule: '!(has(self.overrides) && has(self.limits))'
-            - message: At least one spec.limits most be defined
+            - message: At least one spec.limits must be defined
               rule: '!(has(self.overrides) || has(self.defaults)) ? has(self.limits)
                 && size(self.limits) > 0 : true'
-            - message: At least one spec.overrides.limits most be defined
+            - message: At least one spec.overrides.limits must be defined
               rule: 'has(self.overrides) ? has(self.overrides.limits) && size(self.overrides.limits)
                 > 0 : true'
-            - message: At least one spec.defaults.limits most be defined
+            - message: At least one spec.defaults.limits must be defined
               rule: 'has(self.defaults) ? has(self.defaults.limits) && size(self.defaults.limits)
                 > 0 : true'
           status:

diff --git a/charts/kuadrant-operator/templates/manifests.yaml b/charts/kuadrant-operator/templates/manifests.yaml
@@ -7994,13 +7994,13 @@ spec:
               rule: '!(has(self.defaults) && has(self.overrides))'
             - message: Overrides and implicit defaults are mutually exclusive
               rule: '!(has(self.overrides) && has(self.limits))'
-            - message: At least one spec.limits most be defined
+            - message: At least one spec.limits must be defined
               rule: '!(has(self.overrides) || has(self.defaults)) ? has(self.limits)
                 && size(self.limits) > 0 : true'
-            - message: At least one spec.overrides.limits most be defined
+            - message: At least one spec.overrides.limits must be defined
               rule: 'has(self.overrides) ? has(self.overrides.limits) && size(self.overrides.limits)
                 > 0 : true'
-            - message: At least one spec.defaults.limits most be defined
+            - message: At least one spec.defaults.limits must be defined
               rule: 'has(self.defaults) ? has(self.defaults.limits) && size(self.defaults.limits)
                 > 0 : true'
           status:

diff --git a/config/crd/bases/kuadrant.io_ratelimitpolicies.yaml b/config/crd/bases/kuadrant.io_ratelimitpolicies.yaml
@@ -391,13 +391,13 @@ spec:
               rule: '!(has(self.defaults) && has(self.overrides))'
             - message: Overrides and implicit defaults are mutually exclusive
               rule: '!(has(self.overrides) && has(self.limits))'
-            - message: At least one spec.limits most be defined
+            - message: At least one spec.limits must be defined
               rule: '!(has(self.overrides) || has(self.defaults)) ? has(self.limits)
                 && size(self.limits) > 0 : true'
-            - message: At least one spec.overrides.limits most be defined
+            - message: At least one spec.overrides.limits must be defined
               rule: 'has(self.overrides) ? has(self.overrides.limits) && size(self.overrides.limits)
                 > 0 : true'
-            - message: At least one spec.defaults.limits most be defined
+            - message: At least one spec.defaults.limits must be defined
               rule: 'has(self.defaults) ? has(self.defaults.limits) && size(self.defaults.limits)
                 > 0 : true'
           status:

diff --git a/tests/common/ratelimitpolicy/ratelimitpolicy_controller_test.go b/tests/common/ratelimitpolicy/ratelimitpolicy_controller_test.go
@@ -970,7 +970,7 @@ var _ = Describe("RateLimitPolicy CEL Validations", func() {
 			})
 			err := k8sClient.Create(ctx, policy)
 			Expect(err).To(Not(BeNil()))
-			Expect(strings.Contains(err.Error(), "At least one spec.limits most be defined")).To(BeTrue())
+			Expect(strings.Contains(err.Error(), "At least one spec.limits must be defined")).To(BeTrue())
 		}, testTimeOut)
 
 		It("Empty limits object created", func(ctx SpecContext) {
@@ -980,7 +980,7 @@ var _ = Describe("RateLimitPolicy CEL Validations", func() {
 			})
 			err := k8sClient.Create(ctx, policy)
 			Expect(err).To(Not(BeNil()))
-			Expect(strings.Contains(err.Error(), "At least one spec.limits most be defined")).To(BeTrue())
+			Expect(strings.Contains(err.Error(), "At least one spec.limits must be defined")).To(BeTrue())
 		}, testTimeOut)
 
 		It("Missing defaults.limits object", func(ctx SpecContext) {
@@ -994,7 +994,7 @@ var _ = Describe("RateLimitPolicy CEL Validations", func() {
 			})
 			err := k8sClient.Create(ctx, policy)
 			Expect(err).To(Not(BeNil()))
-			Expect(strings.Contains(err.Error(), "At least one spec.defaults.limits most be defined")).To(BeTrue())
+			Expect(strings.Contains(err.Error(), "At least one spec.defaults.limits must be defined")).To(BeTrue())
 		}, testTimeOut)
 
 		It("Empty defaults.limits object created", func(ctx SpecContext) {
@@ -1009,7 +1009,7 @@ var _ = Describe("RateLimitPolicy CEL Validations", func() {
 			})
 			err := k8sClient.Create(ctx, policy)
 			Expect(err).To(Not(BeNil()))
-			Expect(strings.Contains(err.Error(), "At least one spec.defaults.limits most be defined")).To(BeTrue())
+			Expect(strings.Contains(err.Error(), "At least one spec.defaults.limits must be defined")).To(BeTrue())
 		}, testTimeOut)
 
 		It("Missing overrides.limits object", func(ctx SpecContext) {
@@ -1023,7 +1023,7 @@ var _ = Describe("RateLimitPolicy CEL Validations", func() {
 			})
 			err := k8sClient.Create(ctx, policy)
 			Expect(err).To(Not(BeNil()))
-			Expect(strings.Contains(err.Error(), "At least one spec.overrides.limits most be defined")).To(BeTrue())
+			Expect(strings.Contains(err.Error(), "At least one spec.overrides.limits must be defined")).To(BeTrue())
 		}, testTimeOut)
 
 		It("Empty overrides.limits object created", func(ctx SpecContext) {
@@ -1038,7 +1038,7 @@ var _ = Describe("RateLimitPolicy CEL Validations", func() {
 			})
 			err := k8sClient.Create(ctx, policy)
 			Expect(err).To(Not(BeNil()))
-			Expect(strings.Contains(err.Error(), "At least one spec.overrides.limits most be defined")).To(BeTrue())
+			Expect(strings.Contains(err.Error(), "At least one spec.overrides.limits must be defined")).To(BeTrue())
 		}, testTimeOut)
 	})