Add support for name in limit definitions

Kuadrant · Nov 7, 2023 · a90c6cb · a90c6cb
1 parent c172d5f
commit a90c6cb
Show file tree

Hide file tree

Showing 10 changed files with 114 additions and 128 deletions.
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.Dockerfile b/bundle.Dockerfile
@@ -6,7 +6,7 @@ LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
 LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
 LABEL operators.operatorframework.io.bundle.package.v1=limitador-operator
 LABEL operators.operatorframework.io.bundle.channels.v1=alpha
-LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.28.1
+LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.22.0
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
 

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": "uselessName",
                 "namespace": "toystore-app",
                 "seconds": 30,
                 "variables": []
@@ -36,8 +37,7 @@ metadata:
     capabilities: Basic Install
     categories: Integration & Delivery
     containerImage: quay.io/kuadrant/limitador-operator:latest
-    createdAt: "2023-09-27T14:09:01Z"
-    operators.operatorframework.io/builder: operator-sdk-v1.28.1
+    operators.operatorframework.io/builder: operator-sdk-v1.22.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/Kuadrant/limitador-operator
     support: kuadrant

diff --git a/bundle/manifests/limitador.kuadrant.io_limitadors.yaml b/bundle/manifests/limitador.kuadrant.io_limitadors.yaml
diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml
@@ -5,7 +5,7 @@ annotations:
   operators.operatorframework.io.bundle.metadata.v1: metadata/
   operators.operatorframework.io.bundle.package.v1: limitador-operator
   operators.operatorframework.io.bundle.channels.v1: alpha
-  operators.operatorframework.io.metrics.builder: operator-sdk-v1.28.1
+  operators.operatorframework.io.metrics.builder: operator-sdk-v1.22.0
   operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
   operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3
 

diff --git a/config/crd/bases/limitador.kuadrant.io_limitadors.yaml b/config/crd/bases/limitador.kuadrant.io_limitadors.yaml
diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -1,3 +1,4 @@
+
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole

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: "uselessName"
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'"},