Merge pull request #1058 from sethpollack/rpm

add per minute rate limiting

core/pkg/ingress/annotations/ratelimit/main.go

@@ -27,6 +27,7 @@ import (
 const (
 	limitIP  = "ingress.kubernetes.io/limit-connections"
 	limitRPS = "ingress.kubernetes.io/limit-rps"
+	limitRPM = "ingress.kubernetes.io/limit-rpm"
 
 	// allow 5 times the specified limit as burst
 	defBurst = 5
@@ -45,6 +46,8 @@ type RateLimit struct {
 	Connections Zone `json:"connections"`
 	// RPS indicates a limit with the number of connections per second
 	RPS Zone `json:"rps"`
+
+	RPM Zone `json:"rpm"`
 }
 
 // Equal tests for equality between two RateLimit types
@@ -58,6 +61,9 @@ func (rt1 *RateLimit) Equal(rt2 *RateLimit) bool {
 	if !(&rt1.Connections).Equal(&rt2.Connections) {
 		return false
 	}
+	if !(&rt1.RPM).Equal(&rt2.RPM) {
+		return false
+	}
 	if !(&rt1.RPS).Equal(&rt2.RPS) {
 		return false
 	}
@@ -111,13 +117,15 @@ func NewParser() parser.IngressAnnotation {
 // rule used to rewrite the defined paths
 func (a ratelimit) Parse(ing *extensions.Ingress) (interface{}, error) {
 
+	rpm, _ := parser.GetIntAnnotation(limitRPM, ing)
 	rps, _ := parser.GetIntAnnotation(limitRPS, ing)
 	conn, _ := parser.GetIntAnnotation(limitIP, ing)
 
-	if rps == 0 && conn == 0 {
+	if rpm == 0 && rps == 0 && conn == 0 {
 		return &RateLimit{
 			Connections: Zone{},
 			RPS:         Zone{},
+			RPM:         Zone{},
 		}, nil
 	}
 
@@ -136,5 +144,11 @@ func (a ratelimit) Parse(ing *extensions.Ingress) (interface{}, error) {
 			Burst:      rps * defBurst,
 			SharedSize: defSharedSize,
 		},
+		RPM: Zone{
+			Name:       fmt.Sprintf("%v_rpm", zoneName),
+			Limit:      rpm,
+			Burst:      rpm * defBurst,
+			SharedSize: defSharedSize,
+		},
 	}, nil
 }

core/pkg/ingress/annotations/ratelimit/main_test.go

@@ -75,6 +75,7 @@ func TestBadRateLimiting(t *testing.T) {
 	data := map[string]string{}
 	data[limitIP] = "0"
 	data[limitRPS] = "0"
+	data[limitRPM] = "0"
 	ing.SetAnnotations(data)
 
 	_, err := NewParser().Parse(ing)
@@ -85,6 +86,7 @@ func TestBadRateLimiting(t *testing.T) {
 	data = map[string]string{}
 	data[limitIP] = "5"
 	data[limitRPS] = "100"
+	data[limitRPM] = "10"
 	ing.SetAnnotations(data)
 
 	i, err := NewParser().Parse(ing)
@@ -101,4 +103,7 @@ func TestBadRateLimiting(t *testing.T) {
 	if rateLimit.RPS.Limit != 100 {
 		t.Errorf("expected 100 in limit by rps but %v was returend", rateLimit.RPS)
 	}
+	if rateLimit.RPM.Limit != 10 {
+		t.Errorf("expected 10 in limit by rpm but %v was returend", rateLimit.RPM)
+	}
 }