From abf7faad825a4044bd347d4c2acf56aa4314c60b Mon Sep 17 00:00:00 2001 From: olalekan odukoya Date: Tue, 24 Dec 2024 23:13:57 +0100 Subject: [PATCH 1/3] TT-11901: expose Tyk-Pump health check route --- .../tyk-pump/templates/deployment-pmp.yaml | 29 ++++++++++++++++++- .../templates/service-pump-health.yaml | 27 +++++++++++++++++ .../tyk-pump/templates/service-pump.yaml | 2 +- components/tyk-pump/values.yaml | 25 ++++++++++++++++ tyk-control-plane/values.yaml | 25 ++++++++++++++++ tyk-data-plane/values.yaml | 26 +++++++++++++++++ tyk-oss/values.yaml | 26 +++++++++++++++++ tyk-stack/values.yaml | 25 ++++++++++++++++ 8 files changed, 183 insertions(+), 2 deletions(-) create mode 100644 components/tyk-pump/templates/service-pump-health.yaml diff --git a/components/tyk-pump/templates/deployment-pmp.yaml b/components/tyk-pump/templates/deployment-pmp.yaml index e585962b..e8e3c3d8 100644 --- a/components/tyk-pump/templates/deployment-pmp.yaml +++ b/components/tyk-pump/templates/deployment-pmp.yaml @@ -59,6 +59,25 @@ spec: securityContext: {{- toYaml .Values.pump.containerSecurityContext | nindent 12 }} {{- end }} + + {{- if .Values.pump.livenessProbe }} + livenessProbe: + httpGet: + scheme: "HTTP" + path: /{{ .Values.pump.service.healthEndpointName | default "health" }} + port: {{ .Values.pump.service.healthEndpointPort | default 8083 }} + {{- toYaml .Values.pump.livenessProbe | nindent 10 }} + {{- end }} + + {{- if .Values.pump.readinessProbe }} + readinessProbe: + httpGet: + scheme: "HTTP" + path: /{{ .Values.pump.service.healthEndpointName | default "health" }} + port: {{ .Values.pump.service.healthEndpointPort | default 8083 }} + {{- toYaml .Values.pump.readinessProbe | nindent 10 }} + {{- end }} + env: # Legacy support for Redis Cluster driver. Driver dropped in v3.0.0. - name: REDIGOCLUSTER_SHARDCOUNT @@ -337,6 +356,14 @@ spec: value: "4000" - name: TYK_PMP_PURGEDELAY value: "2" + {{- if .Values.pump.service.healthEnabled }} + - name: TYK_PMP_HEALTHCHECKENDPOINTNAME + value: "{{ .Values.pump.service.healthEndpointName }}" + {{- end }} + {{- if .Values.pump.service.healthEnabled}} + - name: TYK_PMP_HEALTHCHECKENDPOINTPORT + value: "{{ .Values.pump.service.healthEndpointPort }}" + {{- end }} {{- if .Values.pump.extraEnvs }} {{- include "tyk-pump.tplvalues.render" ( dict "value" .Values.pump.extraEnvs "context" $ ) | nindent 10 }} @@ -373,4 +400,4 @@ spec: secret: secretName: {{ .secretName }} {{- end }} - {{- end }} + {{- end }} diff --git a/components/tyk-pump/templates/service-pump-health.yaml b/components/tyk-pump/templates/service-pump-health.yaml new file mode 100644 index 00000000..eac42f21 --- /dev/null +++ b/components/tyk-pump/templates/service-pump-health.yaml @@ -0,0 +1,27 @@ +{{- if .Values.pump.service.healthEnabled -}} +apiVersion: v1 +kind: Service +metadata: + name: pump-svc-health-{{ include "tyk-pump.fullname" . }} + {{- if .Values.pump.service.annotations }} + {{ toYaml .Values.pump.service.annotations }} + {{- end }} + labels: + app: pump-svc-{{ include "tyk-pump.fullname" . }} + chart: {{ include "tyk-pump.chart" . }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +spec: + ports: + - port: {{ .Values.pump.service.healthEndpointPort | default 8083 }} + targetPort: {{ .Values.pump.service.healthEndpointPort | default 8083 }} + protocol: TCP + name: {{ default "http" .Values.pump.service.portName | quote }} + type: {{ .Values.pump.service.type }} + {{- if eq .Values.pump.service.type "LoadBalancer" }} + externalTrafficPolicy: {{ .Values.pump.service.externalTrafficPolicy }} + {{- end }} + selector: + app: pump-{{ include "tyk-pump.fullname" . }} + release: {{ .Release.Name }} +{{- end}} diff --git a/components/tyk-pump/templates/service-pump.yaml b/components/tyk-pump/templates/service-pump.yaml index 2a543a2d..8c58f802 100644 --- a/components/tyk-pump/templates/service-pump.yaml +++ b/components/tyk-pump/templates/service-pump.yaml @@ -24,4 +24,4 @@ spec: selector: app: pump-{{ include "tyk-pump.fullname" . }} release: {{ .Release.Name }} -{{- end}} \ No newline at end of file +{{- end}} diff --git a/components/tyk-pump/values.yaml b/components/tyk-pump/values.yaml index 775667c9..a616de67 100644 --- a/components/tyk-pump/values.yaml +++ b/components/tyk-pump/values.yaml @@ -206,6 +206,17 @@ pump: # Tyk Pump svc is disabled by default. Set it to true to enable it. enabled: false + # healthEnabled enables health check service + healthEnabled: false + + # healthEndpointName sets the health check path. + # It defaults to hello if health check is enabled and it is not set. + healthEndpointName: "" + + # healthEndpointPort sets the health check port. + # It defaults to 8083 if health check is enabled and it is not set. + healthEndpointPort: + # type specifies type of the service. type: ClusterIP @@ -366,3 +377,17 @@ pump: # serviceAccountName field indicates the name of the Service Account that is going to be used by the Pods. # If a service account is to be used for Tyk Pump, it should be manually created serviceAccountName: "" + + # livenessProbe: + # initialDelaySeconds: 10 + # periodSeconds: 2 + # timeoutSeconds: 3 + # failureThreshold: 2 + livenessProbe: {} + + # readinessProbe: + # initialDelaySeconds: 10 + # periodSeconds: 10 + # timeoutSeconds: 3 + # failureThreshold: 3 + readinessProbe: {} diff --git a/tyk-control-plane/values.yaml b/tyk-control-plane/values.yaml index f4c712c9..c87cf51d 100644 --- a/tyk-control-plane/values.yaml +++ b/tyk-control-plane/values.yaml @@ -737,6 +737,17 @@ tyk-pump: # Tyk Pump svc is disabled by default. Set it to true to enable it. enabled: false + # healthEnabled enables health check service + healthEnabled: false + + # healthEndpointName sets the health check path. + # It defaults to hello if health check is enabled and it is not set. + healthEndpointName: "" + + # healthEndpointPort sets the health check port. + # It defaults to 8083 if health check is enabled and it is not set. + healthEndpointPort: + # type specifies type of the service. type: ClusterIP @@ -882,6 +893,20 @@ tyk-pump: # readOnly: true extraVolumeMounts: [] + # livenessProbe: + # initialDelaySeconds: 10 + # periodSeconds: 2 + # timeoutSeconds: 3 + # failureThreshold: 2 + livenessProbe: {} + + # readinessProbe: + # initialDelaySeconds: 10 + # periodSeconds: 10 + # timeoutSeconds: 3 + # failureThreshold: 3 + readinessProbe: {} + tyk-bootstrap: fullnameOverride: "" nameOverride: "" diff --git a/tyk-data-plane/values.yaml b/tyk-data-plane/values.yaml index 181b6b22..67a23421 100644 --- a/tyk-data-plane/values.yaml +++ b/tyk-data-plane/values.yaml @@ -618,6 +618,17 @@ tyk-pump: # Tyk Pump svc is disabled by default. Set it to true to enable it. enabled: false + # healthEnabled enables health check service + healthEnabled: false + + # healthEndpointName sets the health check path. + # It defaults to hello if health check is enabled and it is not set. + healthEndpointName: "" + + # healthEndpointPort sets the health check port. + # It defaults to 8083 if health check is enabled and it is not set. + healthEndpointPort: + # type specifies type of the service. type: ClusterIP @@ -772,6 +783,21 @@ tyk-pump: # mountPath: /etc/ssl/certs/ca-certs.crt # readOnly: true extraVolumeMounts: [] + + # livenessProbe: + # initialDelaySeconds: 10 + # periodSeconds: 2 + # timeoutSeconds: 3 + # failureThreshold: 2 + livenessProbe: {} + + # readinessProbe: + # initialDelaySeconds: 10 + # periodSeconds: 10 + # timeoutSeconds: 3 + # failureThreshold: 3 + readinessProbe: {} + tests: enabled: true resources: {} diff --git a/tyk-oss/values.yaml b/tyk-oss/values.yaml index 3af0372a..1c7f7809 100644 --- a/tyk-oss/values.yaml +++ b/tyk-oss/values.yaml @@ -659,6 +659,17 @@ tyk-pump: # Tyk Pump svc is disabled by default. Set it to true to enable it. enabled: false + # healthEnabled enables health check service + healthEnabled: false + + # healthEndpointName sets the health check path. + # It defaults to hello if health check is enabled and it is not set. + healthEndpointName: "" + + # healthEndpointPort sets the health check port. + # It defaults to 8083 if health check is enabled and it is not set. + healthEndpointPort: + # type specifies type of the service. type: ClusterIP @@ -802,6 +813,21 @@ tyk-pump: # mountPath: /etc/ssl/certs/ca-certs.crt # readOnly: true extraVolumeMounts: [] + + # livenessProbe: + # initialDelaySeconds: 10 + # periodSeconds: 2 + # timeoutSeconds: 3 + # failureThreshold: 2 + livenessProbe: {} + + # readinessProbe: + # initialDelaySeconds: 10 + # periodSeconds: 10 + # timeoutSeconds: 3 + # failureThreshold: 3 + readinessProbe: {} + tests: enabled: true resources: {} diff --git a/tyk-stack/values.yaml b/tyk-stack/values.yaml index 9c129e62..fbd9bb0f 100644 --- a/tyk-stack/values.yaml +++ b/tyk-stack/values.yaml @@ -755,6 +755,17 @@ tyk-pump: # Tyk Pump svc is disabled by default. Set it to true to enable it. enabled: false + # healthEnabled enables health check service + healthEnabled: false + + # healthEndpointName sets the health check path. + # It defaults to hello if health check is enabled and it is not set. + healthEndpointName: "" + + # healthEndpointPort sets the health check port. + # It defaults to 8083 if health check is enabled and it is not set. + healthEndpointPort: + # type specifies type of the service. type: ClusterIP @@ -900,6 +911,20 @@ tyk-pump: # readOnly: true extraVolumeMounts: [] + # livenessProbe: + # initialDelaySeconds: 10 + # periodSeconds: 2 + # timeoutSeconds: 3 + # failureThreshold: 2 + livenessProbe: {} + + # readinessProbe: + # initialDelaySeconds: 10 + # periodSeconds: 10 + # timeoutSeconds: 3 + # failureThreshold: 3 + readinessProbe: {} + tyk-bootstrap: fullnameOverride: "" nameOverride: "" From fec058de8c4968e9e9113e7f895761dcbd0c282d Mon Sep 17 00:00:00 2001 From: olalekan odukoya Date: Wed, 25 Dec 2024 00:33:59 +0100 Subject: [PATCH 2/3] TT-11901: move health check service into a separate value --- .../tyk-pump/templates/deployment-pmp.yaml | 18 ++++----- .../templates/service-pump-health.yaml | 16 ++++---- components/tyk-pump/values.yaml | 38 +++++++++++++------ tyk-control-plane/values.yaml | 36 ++++++++++++------ tyk-data-plane/values.yaml | 36 ++++++++++++------ tyk-oss/values.yaml | 38 +++++++++++++------ tyk-stack/values.yaml | 36 ++++++++++++------ 7 files changed, 143 insertions(+), 75 deletions(-) diff --git a/components/tyk-pump/templates/deployment-pmp.yaml b/components/tyk-pump/templates/deployment-pmp.yaml index e8e3c3d8..5e4eda71 100644 --- a/components/tyk-pump/templates/deployment-pmp.yaml +++ b/components/tyk-pump/templates/deployment-pmp.yaml @@ -64,8 +64,8 @@ spec: livenessProbe: httpGet: scheme: "HTTP" - path: /{{ .Values.pump.service.healthEndpointName | default "health" }} - port: {{ .Values.pump.service.healthEndpointPort | default 8083 }} + path: /{{ .Values.pump.healthCheckService.path }} + port: {{ .Values.pump.healthCheckService.port }} {{- toYaml .Values.pump.livenessProbe | nindent 10 }} {{- end }} @@ -73,8 +73,8 @@ spec: readinessProbe: httpGet: scheme: "HTTP" - path: /{{ .Values.pump.service.healthEndpointName | default "health" }} - port: {{ .Values.pump.service.healthEndpointPort | default 8083 }} + path: /{{ .Values.pump.healthCheckService.path }} + port: {{ .Values.pump.healthCheckService.port }} {{- toYaml .Values.pump.readinessProbe | nindent 10 }} {{- end }} @@ -356,14 +356,12 @@ spec: value: "4000" - name: TYK_PMP_PURGEDELAY value: "2" - {{- if .Values.pump.service.healthEnabled }} + {{- if .Values.pump.healthCheckService.enabled }} - name: TYK_PMP_HEALTHCHECKENDPOINTNAME - value: "{{ .Values.pump.service.healthEndpointName }}" - {{- end }} - {{- if .Values.pump.service.healthEnabled}} + value: "{{ .Values.pump.healthCheckService.path }}" - name: TYK_PMP_HEALTHCHECKENDPOINTPORT - value: "{{ .Values.pump.service.healthEndpointPort }}" - {{- end }} + value: "{{ .Values.pump.healthCheckService.port }}" + {{- end }} {{- if .Values.pump.extraEnvs }} {{- include "tyk-pump.tplvalues.render" ( dict "value" .Values.pump.extraEnvs "context" $ ) | nindent 10 }} diff --git a/components/tyk-pump/templates/service-pump-health.yaml b/components/tyk-pump/templates/service-pump-health.yaml index eac42f21..52b2464f 100644 --- a/components/tyk-pump/templates/service-pump-health.yaml +++ b/components/tyk-pump/templates/service-pump-health.yaml @@ -1,10 +1,10 @@ -{{- if .Values.pump.service.healthEnabled -}} +{{- if .Values.pump.healthCheckService.enabled -}} apiVersion: v1 kind: Service metadata: name: pump-svc-health-{{ include "tyk-pump.fullname" . }} - {{- if .Values.pump.service.annotations }} - {{ toYaml .Values.pump.service.annotations }} + {{- if .Values.pump.healthCheckService.annotations }} + {{ toYaml .Values.pump.healthCheckService.annotations }} {{- end }} labels: app: pump-svc-{{ include "tyk-pump.fullname" . }} @@ -13,13 +13,13 @@ metadata: heritage: {{ .Release.Service }} spec: ports: - - port: {{ .Values.pump.service.healthEndpointPort | default 8083 }} - targetPort: {{ .Values.pump.service.healthEndpointPort | default 8083 }} + - port: {{ .Values.pump.healthCheckService.port }} + targetPort: {{ .Values.pump.healthCheckService.port }} protocol: TCP - name: {{ default "http" .Values.pump.service.portName | quote }} - type: {{ .Values.pump.service.type }} + name: {{ default "http" .Values.pump.healthCheckService.portName | quote }} + type: {{ .Values.pump.healthCheckService.type }} {{- if eq .Values.pump.service.type "LoadBalancer" }} - externalTrafficPolicy: {{ .Values.pump.service.externalTrafficPolicy }} + externalTrafficPolicy: {{ .Values.pump.healthCheckService.externalTrafficPolicy }} {{- end }} selector: app: pump-{{ include "tyk-pump.fullname" . }} diff --git a/components/tyk-pump/values.yaml b/components/tyk-pump/values.yaml index a616de67..8c58ff53 100644 --- a/components/tyk-pump/values.yaml +++ b/components/tyk-pump/values.yaml @@ -206,17 +206,6 @@ pump: # Tyk Pump svc is disabled by default. Set it to true to enable it. enabled: false - # healthEnabled enables health check service - healthEnabled: false - - # healthEndpointName sets the health check path. - # It defaults to hello if health check is enabled and it is not set. - healthEndpointName: "" - - # healthEndpointPort sets the health check port. - # It defaults to 8083 if health check is enabled and it is not set. - healthEndpointPort: - # type specifies type of the service. type: ClusterIP @@ -231,7 +220,32 @@ pump: annotations: {} # The name for the service port - portName: "" + portName: "" + + healthCheckService: + # type specifies type of the service. + type: ClusterIP + + # Tyk Pump health service is disabled by default. + # Set it to true to enable it. + enabled: false + + # path sets the health check path. + path: "" + + # port sets the health check port. + # It defaults to 8083 if health check is enabled and it is not set. + port: 8083 + + # The name for the health check service port + portName: "" + + # annotations specifies annotations to be added Tyk Pump service. + annotations: {} + + # externalTrafficPolicy denotes if this Service desires to route external traffic to node-local or + # cluster-wide endpoints, while using LoadBalancer type of service. + externalTrafficPolicy: Local # containerPort represents the port where Tyk Pump serve the metrics, for instance metrics for Prometheus. # The default port is 9090. diff --git a/tyk-control-plane/values.yaml b/tyk-control-plane/values.yaml index c87cf51d..17fda02d 100644 --- a/tyk-control-plane/values.yaml +++ b/tyk-control-plane/values.yaml @@ -737,17 +737,6 @@ tyk-pump: # Tyk Pump svc is disabled by default. Set it to true to enable it. enabled: false - # healthEnabled enables health check service - healthEnabled: false - - # healthEndpointName sets the health check path. - # It defaults to hello if health check is enabled and it is not set. - healthEndpointName: "" - - # healthEndpointPort sets the health check port. - # It defaults to 8083 if health check is enabled and it is not set. - healthEndpointPort: - # type specifies type of the service. type: ClusterIP @@ -761,6 +750,31 @@ tyk-pump: # annotations specifies annotations to be added Tyk Pump service. annotations: {} + healthCheckService: + # type specifies type of the service. + type: ClusterIP + + # Tyk Pump health service is disabled by default. + # Set it to true to enable it. + enabled: false + + # path sets the health check path. + path: "" + + # port sets the health check port. + # It defaults to 8083 if health check is enabled and it is not set. + port: 8083 + + # The name for the health check service port + portName: "" + + # annotations specifies annotations to be added Tyk Pump service. + annotations: {} + + # externalTrafficPolicy denotes if this Service desires to route external traffic to node-local or + # cluster-wide endpoints, while using LoadBalancer type of service. + externalTrafficPolicy: Local + # containerPort represents the port where Tyk Pump serve the metrics, for instance metrics for Prometheus. # The default port is 9090. containerPort: 9090 diff --git a/tyk-data-plane/values.yaml b/tyk-data-plane/values.yaml index 67a23421..0f450771 100644 --- a/tyk-data-plane/values.yaml +++ b/tyk-data-plane/values.yaml @@ -618,17 +618,6 @@ tyk-pump: # Tyk Pump svc is disabled by default. Set it to true to enable it. enabled: false - # healthEnabled enables health check service - healthEnabled: false - - # healthEndpointName sets the health check path. - # It defaults to hello if health check is enabled and it is not set. - healthEndpointName: "" - - # healthEndpointPort sets the health check port. - # It defaults to 8083 if health check is enabled and it is not set. - healthEndpointPort: - # type specifies type of the service. type: ClusterIP @@ -642,6 +631,31 @@ tyk-pump: # annotations specifies annotations to be added Tyk Pump service. annotations: {} + healthCheckService: + # type specifies type of the service. + type: ClusterIP + + # Tyk Pump health service is disabled by default. + # Set it to true to enable it. + enabled: false + + # path sets the health check path. + path: "" + + # port sets the health check port. + # It defaults to 8083 if health check is enabled and it is not set. + port: 8083 + + # The name for the health check service port + portName: "" + + # annotations specifies annotations to be added Tyk Pump service. + annotations: {} + + # externalTrafficPolicy denotes if this Service desires to route external traffic to node-local or + # cluster-wide endpoints, while using LoadBalancer type of service. + externalTrafficPolicy: Local + # containerPort represents the port where Tyk Pump serve the metrics, for instance metrics for Prometheus. # The default port is 9090. containerPort: 9090 diff --git a/tyk-oss/values.yaml b/tyk-oss/values.yaml index 1c7f7809..ae7c71f8 100644 --- a/tyk-oss/values.yaml +++ b/tyk-oss/values.yaml @@ -659,17 +659,6 @@ tyk-pump: # Tyk Pump svc is disabled by default. Set it to true to enable it. enabled: false - # healthEnabled enables health check service - healthEnabled: false - - # healthEndpointName sets the health check path. - # It defaults to hello if health check is enabled and it is not set. - healthEndpointName: "" - - # healthEndpointPort sets the health check port. - # It defaults to 8083 if health check is enabled and it is not set. - healthEndpointPort: - # type specifies type of the service. type: ClusterIP @@ -683,6 +672,31 @@ tyk-pump: # annotations specifies annotations to be added Tyk Pump service. annotations: {} + healthCheckService: + # type specifies type of the service. + type: ClusterIP + + # Tyk Pump health service is disabled by default. + # Set it to true to enable it. + enabled: false + + # path sets the health check path. + path: "" + + # port sets the health check port. + # It defaults to 8083 if health check is enabled and it is not set. + port: 8083 + + # The name for the health check service port + portName: "" + + # annotations specifies annotations to be added Tyk Pump service. + annotations: {} + + # externalTrafficPolicy denotes if this Service desires to route external traffic to node-local or + # cluster-wide endpoints, while using LoadBalancer type of service. + externalTrafficPolicy: Local + # containerPort represents the port where Tyk Pump serve the metrics, for instance metrics for Prometheus. # The default port is 9090. containerPort: 9090 @@ -826,7 +840,7 @@ tyk-pump: # periodSeconds: 10 # timeoutSeconds: 3 # failureThreshold: 3 - readinessProbe: {} + readinessProbe: {} tests: enabled: true diff --git a/tyk-stack/values.yaml b/tyk-stack/values.yaml index fbd9bb0f..211845dd 100644 --- a/tyk-stack/values.yaml +++ b/tyk-stack/values.yaml @@ -755,17 +755,6 @@ tyk-pump: # Tyk Pump svc is disabled by default. Set it to true to enable it. enabled: false - # healthEnabled enables health check service - healthEnabled: false - - # healthEndpointName sets the health check path. - # It defaults to hello if health check is enabled and it is not set. - healthEndpointName: "" - - # healthEndpointPort sets the health check port. - # It defaults to 8083 if health check is enabled and it is not set. - healthEndpointPort: - # type specifies type of the service. type: ClusterIP @@ -779,6 +768,31 @@ tyk-pump: # annotations specifies annotations to be added Tyk Pump service. annotations: {} + healthCheckService: + # type specifies type of the service. + type: ClusterIP + + # Tyk Pump health service is disabled by default. + # Set it to true to enable it. + enabled: true + + # path sets the health check path. + path: "hello" + + # port sets the health check port. + # It defaults to 8083 if health check is enabled and it is not set. + port: 8083 + + # The name for the health check service port + portName: "" + + # annotations specifies annotations to be added Tyk Pump service. + annotations: {} + + # externalTrafficPolicy denotes if this Service desires to route external traffic to node-local or + # cluster-wide endpoints, while using LoadBalancer type of service. + externalTrafficPolicy: Local + # containerPort represents the port where Tyk Pump serve the metrics, for instance metrics for Prometheus. # The default port is 9090. containerPort: 9090 From 735e38542cb6f4527bb90eae0c97b79236e82d2f Mon Sep 17 00:00:00 2001 From: olalekan odukoya Date: Tue, 31 Dec 2024 14:02:43 +0100 Subject: [PATCH 3/3] TT-11901: move health check condition --- components/tyk-pump/templates/deployment-pmp.yaml | 8 ++------ components/tyk-pump/values.yaml | 2 +- tyk-control-plane/values.yaml | 2 +- tyk-data-plane/values.yaml | 2 +- tyk-oss/values.yaml | 2 +- tyk-stack/values.yaml | 2 +- 6 files changed, 7 insertions(+), 11 deletions(-) diff --git a/components/tyk-pump/templates/deployment-pmp.yaml b/components/tyk-pump/templates/deployment-pmp.yaml index 5e4eda71..59b55bd6 100644 --- a/components/tyk-pump/templates/deployment-pmp.yaml +++ b/components/tyk-pump/templates/deployment-pmp.yaml @@ -60,23 +60,19 @@ spec: {{- toYaml .Values.pump.containerSecurityContext | nindent 12 }} {{- end }} - {{- if .Values.pump.livenessProbe }} + {{- if .Values.pump.healthCheckService.enabled }} livenessProbe: httpGet: scheme: "HTTP" path: /{{ .Values.pump.healthCheckService.path }} port: {{ .Values.pump.healthCheckService.port }} - {{- toYaml .Values.pump.livenessProbe | nindent 10 }} - {{- end }} - {{- if .Values.pump.readinessProbe }} readinessProbe: httpGet: scheme: "HTTP" path: /{{ .Values.pump.healthCheckService.path }} port: {{ .Values.pump.healthCheckService.port }} - {{- toYaml .Values.pump.readinessProbe | nindent 10 }} - {{- end }} + {{- end }} env: # Legacy support for Redis Cluster driver. Driver dropped in v3.0.0. diff --git a/components/tyk-pump/values.yaml b/components/tyk-pump/values.yaml index 8c58ff53..8582be33 100644 --- a/components/tyk-pump/values.yaml +++ b/components/tyk-pump/values.yaml @@ -231,7 +231,7 @@ pump: enabled: false # path sets the health check path. - path: "" + path: "hello" # port sets the health check port. # It defaults to 8083 if health check is enabled and it is not set. diff --git a/tyk-control-plane/values.yaml b/tyk-control-plane/values.yaml index 17fda02d..7dafd3b9 100644 --- a/tyk-control-plane/values.yaml +++ b/tyk-control-plane/values.yaml @@ -759,7 +759,7 @@ tyk-pump: enabled: false # path sets the health check path. - path: "" + path: "hello" # port sets the health check port. # It defaults to 8083 if health check is enabled and it is not set. diff --git a/tyk-data-plane/values.yaml b/tyk-data-plane/values.yaml index 0f450771..3ce31bbe 100644 --- a/tyk-data-plane/values.yaml +++ b/tyk-data-plane/values.yaml @@ -640,7 +640,7 @@ tyk-pump: enabled: false # path sets the health check path. - path: "" + path: "hello" # port sets the health check port. # It defaults to 8083 if health check is enabled and it is not set. diff --git a/tyk-oss/values.yaml b/tyk-oss/values.yaml index ae7c71f8..c66a2e51 100644 --- a/tyk-oss/values.yaml +++ b/tyk-oss/values.yaml @@ -681,7 +681,7 @@ tyk-pump: enabled: false # path sets the health check path. - path: "" + path: "hello" # port sets the health check port. # It defaults to 8083 if health check is enabled and it is not set. diff --git a/tyk-stack/values.yaml b/tyk-stack/values.yaml index 211845dd..0644187d 100644 --- a/tyk-stack/values.yaml +++ b/tyk-stack/values.yaml @@ -774,7 +774,7 @@ tyk-pump: # Tyk Pump health service is disabled by default. # Set it to true to enable it. - enabled: true + enabled: false # path sets the health check path. path: "hello"