File tree Expand file tree Collapse file tree 3 files changed +16
-2
lines changed Expand file tree Collapse file tree 3 files changed +16
-2
lines changed Original file line number Diff line number Diff line change @@ -52,6 +52,15 @@ Create chart name and version as used by the chart label.
52
52
{ {- printf " %s" .Values.gateway.image.tag | replace " v" " " -} }
53
53
{ {- end -} }
54
54
55
+
56
+ { {- define " tyk-gateway.probe-on-control-port" -} }
57
+ { {- if or .Values.gateway.control.probe (eq .Values.gateway.image.tag " latest" ) -} }
58
+ true
59
+ { {- else -} }
60
+ { {- or (semverCompare " >= 3.2.0" (include " tyk-gateway.gateway-version" . )) (semverCompare " >=3.0.4 < 3.1.0" (include " tyk-gateway.gateway-version" .)) -} }
61
+ { {- end -} }
62
+ { {- end -} }
63
+
55
64
{ {- define " tyk-gateway.redis_url" -} }
56
65
{ {- if .Values.global.redis.addrs -} }
57
66
{ { join " ," .Values.global.redis.addrs } }
Original file line number Diff line number Diff line change @@ -277,7 +277,7 @@ spec:
277
277
httpGet :
278
278
scheme : " HTTP{{ if .Values.global.tls.gateway }}S{{ end }}"
279
279
path : /hello
280
- {{- 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 " .)) ) }}
280
+ {{- if and .Values.gateway.control.enabled (include "tyk-gateway.probe-on-control-port " .) }}
281
281
port : {{ .Values.gateway.control.containerPort }}
282
282
{{- else }}
283
283
port : {{ .Values.global.servicePorts.gateway }}
@@ -290,7 +290,7 @@ spec:
290
290
httpGet :
291
291
scheme : " HTTP{{ if .Values.global.tls.gateway }}S{{ end }}"
292
292
path : /hello
293
- {{- 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 " .)) ) }}
293
+ {{- if and .Values.gateway.control.enabled (include "tyk-gateway.probe-on-control-port " .) }}
294
294
port : {{ .Values.gateway.control.containerPort }}
295
295
{{- else }}
296
296
port : {{ .Values.global.servicePorts.gateway }}
Original file line number Diff line number Diff line change @@ -191,6 +191,11 @@ gateway:
191
191
# annotations for control port service
192
192
annotations : {}
193
193
194
+ # The health endpoint is exposed on the control port or the service port, depending on image tag.
195
+ # Set to true to override to having the health endpoint on the control port.
196
+ # Useful if the tag is not semVer compatible.
197
+ probe : false
198
+
194
199
# Creates an ingress object in k8s. Will require an ingress-controller and
195
200
# annotation to that ingress controller.
196
201
ingress :
You can’t perform that action at this time.
0 commit comments