rebase and resolve conflict

Author: titpetric

components/tyk-gateway/templates/_helpers.tpl

@@ -52,6 +52,15 @@ Create chart name and version as used by the chart label.
 {{- printf "%s" .Values.gateway.image.tag | replace "v" "" -}}
 {{- end -}}
 
+
+{{- define "tyk-gateway.probe-on-control-port" -}}
+{{- if or .Values.gateway.control.useForProbes  (eq .Values.gateway.image.tag "latest") -}}
+true
+{{- else -}}
+{{- or (semverCompare ">= 3.2.0" (include "tyk-gateway.gateway-version" . )) (semverCompare ">=3.0.4 < 3.1.0" (include "tyk-gateway.gateway-version" .)) -}}
+{{- end -}}
+{{- end -}}
+
 {{- define "tyk-gateway.redis_url" -}}
 {{- if .Values.global.redis.addrs -}}
 {{ join "," .Values.global.redis.addrs }}

components/tyk-gateway/templates/deployment-gw-repset.yaml

@@ -117,6 +117,8 @@ spec:
             value: "{{ .Values.global.oasValidateExamples }}"
           - name: TYK_GW_OAS_VALIDATE_SCHEMA_DEFAULTS
             value: "{{ .Values.global.oasValidateSchemaDefaults }}"
+          - name: TYK_GW_ENABLEFIXEDWINDOWRATELIMITER
+            value: "{{ .Values.gateway.enableFixedWindowRateLimiter }}"
 
           {{- if .Values.global.redis.sslInsecureSkipVerify }}
           - name: TYK_GW_STORAGE_SSLINSECURESKIPVERIFY
@@ -412,7 +414,7 @@ spec:
           httpGet:
             scheme: "HTTP{{ if .Values.global.tls.gateway }}S{{ end }}"
             path: /hello
-            {{- if and .Values.gateway.control.enabled (or (semverCompare ">= 3.2.0" (include "tyk-gateway.gateway-version" . )) (semverCompare ">=3.0.4 < 3.1.0" (include "tyk-gateway.gateway-version" .))) }}
+            {{- if and .Values.gateway.control.enabled (include "tyk-gateway.probe-on-control-port" .) }}
             port: {{ .Values.gateway.control.containerPort }}
             {{- else }}
             port: {{ .Values.gateway.containerPort }}
@@ -425,7 +427,7 @@ spec:
           httpGet:
             scheme: "HTTP{{ if .Values.global.tls.gateway }}S{{ end }}"
             path: /hello
-            {{- if and .Values.gateway.control.enabled (or (semverCompare ">= 3.2.0" (include "tyk-gateway.gateway-version" . )) (semverCompare ">=3.0.4 < 3.1.0" (include "tyk-gateway.gateway-version" .))) }}
+            {{- if and .Values.gateway.control.enabled (include "tyk-gateway.probe-on-control-port" .) }}
             port: {{ .Values.gateway.control.containerPort }}
             {{- else }}
             port: {{ .Values.gateway.containerPort }}

components/tyk-gateway/values.yaml

@@ -161,6 +161,13 @@ gateway:
   # The hostname to bind the Gateway to.
   hostName: tyk-gw.local
 
+  # EnableFixedWindowRateLimiter enables fixed window rate limiting.
+  # FixedWindow will allow requests up to the configured rate limit,
+  # and then block traffic for the remainder of the window duration.
+  # It has minimal impact on redis, however it will not protect against
+  # traffic spikes, it does not have spike arrest behaviour.
+  enableFixedWindowRateLimiter: false
+
   # If this option is set to true, it will enable polling the Tyk Dashboard service for API definitions
   useDashboardAppConfig:
     enabled: false
@@ -321,6 +328,11 @@ gateway:
       #      - chart-example-different-domain-possible.local
       tls: []
 
+    # The health endpoint is exposed on the control port or the service port, depending on image tag.
+    # Set to true to override to having the health endpoint on the control port.
+    # Useful if the tag is not semVer compatible.
+    useForProbes: false
+
   # Creates an ingress object in k8s. Will require an ingress-controller and
   # annotation to that ingress controller.
   ingress:

tyk-control-plane/values.yaml

@@ -257,6 +257,13 @@ tyk-gateway:
     # The hostname to bind the Gateway to.
     hostName: &gwHostName tyk-gw.local
 
+    # EnableFixedWindowRateLimiter enables fixed window rate limiting.
+    # FixedWindow will allow requests up to the configured rate limit,
+    # and then block traffic for the remainder of the window duration.
+    # It has minimal impact on redis, however it will not protect against
+    # traffic spikes, it does not have spike arrest behaviour.
+    enableFixedWindowRateLimiter: false
+
     # If this option is set to true, it will enable polling the Dashboard service for API definitions
     useDashboardAppConfig:
       enabled: true

tyk-data-plane/values.yaml

@@ -184,6 +184,13 @@ tyk-gateway:
     # The hostname to bind the Gateway to.
     hostName: tyk-gw.local
 
+    # EnableFixedWindowRateLimiter enables fixed window rate limiting.
+    # FixedWindow will allow requests up to the configured rate limit,
+    # and then block traffic for the remainder of the window duration.
+    # It has minimal impact on redis, however it will not protect against
+    # traffic spikes, it does not have spike arrest behaviour.
+    enableFixedWindowRateLimiter: false
+
     tls:
       # The name of the secret which should contain the TLS certificate you want to use with the gateway deployment
       secretName: tyk-default-tls-secret
@@ -315,6 +322,11 @@ tyk-gateway:
         #      - chart-example-different-domain-possible.local
         tls: []
 
+      # The health endpoint is exposed on the control port or the service port, depending on image tag.
+      # Set to true to override to having the health endpoint on the control port.
+      # Useful if the tag is not semVer compatible.
+      useForProbes: false
+
     # Creates an ingress object in k8s. Will require an ingress-controller and
     # annotation to that ingress controller.
     ingress:

tyk-oss/values.yaml

@@ -158,6 +158,13 @@ tyk-gateway:
     # The hostname to bind the Gateway to.
     hostName: tyk-gw.local
 
+    # EnableFixedWindowRateLimiter enables fixed window rate limiting.
+    # FixedWindow will allow requests up to the configured rate limit,
+    # and then block traffic for the remainder of the window duration.
+    # It has minimal impact on redis, however it will not protect against
+    # traffic spikes, it does not have spike arrest behaviour.
+    enableFixedWindowRateLimiter: false
+
     tls:
       # The name of the secret which should contain the TLS certificate you want to use with the gateway deployment
       secretName: tyk-default-tls-secret
@@ -298,6 +305,11 @@ tyk-gateway:
         #      - chart-example-different-domain-possible.local
         tls: []
 
+      # The health endpoint is exposed on the control port or the service port, depending on image tag.
+      # Set to true to override to having the health endpoint on the control port.
+      # Useful if the tag is not semVer compatible.
+      useForProbes: false
+
     # Creates an ingress object in k8s. Will require an ingress-controller and
     # annotation to that ingress controller.
     ingress: