Merge pull request #112 from Kuadrant/rlp-named

Add support for name in limit definitions
Kuadrant · Nov 13, 2023 · bb16f15 · bb16f15
2 parents c4945bb + b7cc27a
commit bb16f15
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 1 deletion.
diff --git a/api/v1alpha1/limitador_types.go b/api/v1alpha1/limitador_types.go
@@ -252,6 +252,7 @@ type RateLimit struct {
 	Namespace  string   `json:"namespace"`
 	Seconds    int      `json:"seconds"`
 	Variables  []string `json:"variables"`
+	Name       string   `json:"name,omitempty"`
 }
 
 // LimitadorStatus defines the observed state of Limitador

diff --git a/bundle/manifests/limitador-operator.clusterserviceversion.yaml b/bundle/manifests/limitador-operator.clusterserviceversion.yaml
@@ -17,6 +17,7 @@ metadata:
                   "get_toy == 'yes'"
                 ],
                 "max_value": 2,
+                "name": "toy_get_route",
                 "namespace": "toystore-app",
                 "seconds": 30,
                 "variables": []
@@ -36,7 +37,7 @@ metadata:
     capabilities: Basic Install
     categories: Integration & Delivery
     containerImage: quay.io/kuadrant/limitador-operator:latest
-    createdAt: "2023-09-27T14:09:01Z"
+    createdAt: "2023-11-08T14:01:55Z"
     operators.operatorframework.io/builder: operator-sdk-v1.28.1
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/Kuadrant/limitador-operator

diff --git a/bundle/manifests/limitador.kuadrant.io_limitadors.yaml b/bundle/manifests/limitador.kuadrant.io_limitadors.yaml
@@ -872,6 +872,8 @@ spec:
                       type: array
                     max_value:
                       type: integer
+                    name:
+                      type: string
                     namespace:
                       type: string
                     seconds:

diff --git a/config/crd/bases/limitador.kuadrant.io_limitadors.yaml b/config/crd/bases/limitador.kuadrant.io_limitadors.yaml
@@ -873,6 +873,8 @@ spec:
                       type: array
                     max_value:
                       type: integer
+                    name:
+                      type: string
                     namespace:
                       type: string
                     seconds:

diff --git a/config/samples/limitador_v1alpha1_limitador.yaml b/config/samples/limitador_v1alpha1_limitador.yaml
@@ -14,3 +14,4 @@ spec:
       namespace: toystore-app
       seconds: 30
       variables: []
+      name: "toy_get_route"
diff --git a/controllers/limitador_controller_test.go b/controllers/limitador_controller_test.go
@@ -82,6 +82,7 @@ var _ = Describe("Limitador controller", func() {
 			Namespace:  "test-namespace",
 			Seconds:    60,
 			Variables:  []string{"user_id"},
+			Name:       "useless",
 		},
 		{
 			Conditions: []string{"req.method == 'POST'"},

diff --git a/pkg/limitador/k8s_objects_test.go b/pkg/limitador/k8s_objects_test.go
@@ -254,6 +254,7 @@ func TestLimitsConfigMap(t *testing.T) {
 				MaxValue:   1000,
 				Namespace:  "my-ns",
 				Seconds:    60,
+				Name:       "useless",
 			},
 			{
 				Conditions: []string{"cond == '1'"},