Merge pull request #26 from Kuadrant/limits-in-limitador

Limits in limitador
Kuadrant · Jun 29, 2022 · 36d2728 · 36d2728
2 parents 40272d9 + e087ff8
commit 36d2728
Show file tree

Hide file tree

Showing 22 changed files with 414 additions and 837 deletions.
diff --git a/api/v1alpha1/limitador_types.go b/api/v1alpha1/limitador_types.go
@@ -36,6 +36,9 @@ type LimitadorSpec struct {
 
 	// +optional
 	Listener *Listener `json:"listener,omitempty"`
+
+	// +optional
+	Limits []RateLimit `json:"limits,omitempty"`
 }
 
 // LimitadorStatus defines the observed state of Limitador
@@ -80,6 +83,15 @@ type TransportProtocol struct {
 	// We could describe TLS within this type
 }
 
+// RateLimit defines the desired Limitador limit
+type RateLimit struct {
+	Conditions []string `json:"conditions"`
+	MaxValue   int      `json:"max_value"`
+	Namespace  string   `json:"namespace"`
+	Seconds    int      `json:"seconds"`
+	Variables  []string `json:"variables"`
+}
+
 func init() {
 	SchemeBuilder.Register(&Limitador{}, &LimitadorList{})
 }
diff --git a/api/v1alpha1/ratelimit_types.go b/api/v1alpha1/ratelimit_types.go
diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/bundle/manifests/limitador-operator.clusterserviceversion.yaml b/bundle/manifests/limitador-operator.clusterserviceversion.yaml
@@ -11,6 +11,25 @@ metadata:
             "name": "limitador-sample"
           },
           "spec": {
+            "limits": [
+              {
+                "conditions": [
+                  "get-toy == yes"
+                ],
+                "max_value": 2,
+                "namespace": "toystore-app",
+                "seconds": 30,
+                "variables": []
+              }
+            ],
+            "listener": {
+              "grpc": {
+                "port": 8081
+              },
+              "http": {
+                "port": 8080
+              }
+            },
             "replicas": 1,
             "version": "latest"
           }
@@ -60,9 +79,9 @@ spec:
       clusterPermissions:
       - rules:
         - apiGroups:
-          - apps
+          - ""
           resources:
-          - deployments
+          - configmaps
           verbs:
           - create
           - delete
@@ -71,9 +90,9 @@ spec:
           - update
           - watch
         - apiGroups:
-          - ""
+          - apps
           resources:
-          - services
+          - deployments
           verbs:
           - create
           - delete
@@ -82,35 +101,20 @@ spec:
           - update
           - watch
         - apiGroups:
-          - limitador.kuadrant.io
+          - ""
           resources:
-          - limitadors
+          - services
           verbs:
           - create
           - delete
           - get
           - list
-          - patch
           - update
           - watch
         - apiGroups:
           - limitador.kuadrant.io
           resources:
-          - limitadors/finalizers
-          verbs:
-          - update
-        - apiGroups:
-          - limitador.kuadrant.io
-          resources:
-          - limitadors/status
-          verbs:
-          - get
-          - patch
-          - update
-        - apiGroups:
-          - limitador.kuadrant.io
-          resources:
-          - ratelimits
+          - limitadors
           verbs:
           - create
           - delete
@@ -122,13 +126,13 @@ spec:
         - apiGroups:
           - limitador.kuadrant.io
           resources:
-          - ratelimits/finalizers
+          - limitadors/finalizers
           verbs:
           - update
         - apiGroups:
           - limitador.kuadrant.io
           resources:
-          - ratelimits/status
+          - limitadors/status
           verbs:
           - get
           - patch

diff --git a/bundle/manifests/limitador.kuadrant.io_limitadors.yaml b/bundle/manifests/limitador.kuadrant.io_limitadors.yaml
@@ -34,6 +34,32 @@ spec:
           spec:
             description: LimitadorSpec defines the desired state of Limitador
             properties:
+              limits:
+                items:
+                  description: RateLimit defines the desired Limitador limit
+                  properties:
+                    conditions:
+                      items:
+                        type: string
+                      type: array
+                    max_value:
+                      type: integer
+                    namespace:
+                      type: string
+                    seconds:
+                      type: integer
+                    variables:
+                      items:
+                        type: string
+                      type: array
+                  required:
+                  - conditions
+                  - max_value
+                  - namespace
+                  - seconds
+                  - variables
+                  type: object
+                type: array
               listener:
                 properties:
                   grpc: