Fix probes v4 extended (#247)

* fix probes in headless for v4+

* Added modifications submitted by community contributor to all tyk-helm-charts. The commits contain a fix that selects the correct container port depending on the installed version of Tyk.

* Added missing templating function for gateway version and included the correct tempalte function for the pro replicaset.

* Fixed Typo with space inside empty braces.

* Fixed Typo in tyk-pro deployment replicaset related to the name of the tyk config.

* Reverted changes to tyk-hybrid due to a missunderstanding.

* Fixed extra modification added to readinessProbe

Co-authored-by: Patrik Votoček <[email protected]>

Author: andrei-tyk

tyk-headless/templates/deployment-gw-repset.yaml

@@ -165,7 +165,7 @@ spec:
           httpGet:
             scheme: "HTTP{{ if .Values.gateway.tls }}S{{ end }}"
             path: /hello
-            {{- if and .Values.gateway.control.enabled (or (semverCompare "^3.2.x" (include "tyk-headless.gateway-version" . )) (semverCompare ">=3.0.4 < 3.1.0" (include "tyk-headless.gateway-version" .))) }}
+            {{- if and .Values.gateway.control.enabled (or (semverCompare ">= 3.2.0" (include "tyk-headless.gateway-version" . )) (semverCompare ">=3.0.4 < 3.1.0" (include "tyk-headless.gateway-version" .))) }}
             port: {{ .Values.gateway.control.containerPort }}
             {{- else }}
             port: {{ .Values.gateway.containerPort }}
@@ -178,7 +178,7 @@ spec:
           httpGet:
             scheme: "HTTP{{ if .Values.gateway.tls }}S{{ end }}"
             path: /hello
-            {{- if and .Values.gateway.control.enabled (or (semverCompare "^3.2.x" (include "tyk-headless.gateway-version" . )) (semverCompare ">=3.0.4 < 3.1.0" (include "tyk-headless.gateway-version" .))) }}
+            {{- if and .Values.gateway.control.enabled (or (semverCompare ">= 3.2.0" (include "tyk-headless.gateway-version" . )) (semverCompare ">=3.0.4 < 3.1.0" (include "tyk-headless.gateway-version" .))) }}
             port: {{ .Values.gateway.control.containerPort }}
             {{- else }}
             port: {{ .Values.gateway.containerPort }}

tyk-hybrid/templates/_helpers.tpl

@@ -48,4 +48,4 @@ http
 {{- else -}}
 redis.{{ .Release.Namespace }}.svc.cluster.local:6379
 {{- end -}}
-{{- end -}}
+{{- end -}}

tyk-pro/templates/deployment-gw-repset.yaml

@@ -171,7 +171,7 @@ spec:
           httpGet:
             scheme: "HTTP{{ if .Values.gateway.tls }}S{{ end }}"
             path: /hello
-            {{- if and .Values.gateway.control.enabled (or (semverCompare "^3.2.x" (include "tyk-pro.gateway-version" . )) (semverCompare ">=3.0.4 < 3.1.0" (include "tyk-pro.gateway-version" .))) }}
+            {{- if and .Values.gateway.control.enabled (or (semverCompare ">= 3.2.0" (include "tyk-pro.gateway-version" . )) (semverCompare ">=3.0.4 < 3.1.0" (include "tyk-pro.gateway-version" .))) }}
             port: {{ .Values.gateway.control.containerPort }}
             {{- else }}
             port: {{ .Values.gateway.containerPort }}
@@ -184,7 +184,7 @@ spec:
           httpGet:
             scheme: "HTTP{{ if .Values.gateway.tls }}S{{ end }}"
             path: /hello
-            {{- if and .Values.gateway.control.enabled (or (semverCompare "^3.2.x" (include "tyk-pro.gateway-version" . )) (semverCompare ">=3.0.4 < 3.1.0" (include "tyk-pro.gateway-version" .))) }}
+            {{- if and .Values.gateway.control.enabled (or (semverCompare ">= 3.2.0" (include "tyk-pro.gateway-version" . )) (semverCompare ">=3.0.4 < 3.1.0" (include "tyk-pro.gateway-version" .))) }}
             port: {{ .Values.gateway.control.containerPort }}
             {{- else }}
             port: {{ .Values.gateway.containerPort }}