Cloned2Preserve
/
TrueChartsClone
mirror of https://github.com/truecharts/charts.git
1
0
Fork 0
Code

use TCP probe by default and add docs for probetype (#594) 

* use TCP probe by default and add docs for probetype

* small fixup
This commit is contained in:
Kjeld Schouten-Lebbing 2021-06-26 09:39:58 +02:00 committed by GitHub
parent 6215a9a259
commit adff414b8e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/library/common/Chart.yaml
View File

@ -18,4 +18,4 @@ maintainers:
name: common
sources:
type: library
version: 6.3.7
version: 6.3.8

14
charts/library/common/templates/lib/controller/_probes.tpl
View File

@ -7,7 +7,7 @@ Probes selection logic.
{{- if $primaryService -}}
{{- $primaryPort = get $primaryService.ports (include "common.classes.service.ports.primary" (dict "serviceName" (include "common.service.primary" .) "values" $primaryService)) -}}
{{- end -}}
{{- $probeType := "HTTP" -}}
{{- $probeType := "TCP" -}}
{{- range $probeName, $probe := .Values.probes }}
{{- if $probe.enabled -}}
@ -17,13 +17,13 @@ Probes selection logic.
{{- $probe.spec | toYaml | nindent 2 }}
{{- else }}
{{- if and $primaryService $primaryPort -}}
{{- if $probe.type -}}
{{- $probeType = $probe.type -}}
{{- else -}}
{{- if $primaryPort.protocol -}}
{{- $probeType = $primaryPort.protocol -}}
{{- if $probe.type -}}
{{- if eq $probe.type "AUTO" -}}
{{- $probeType = $primaryPort.protocol -}}
{{- else -}}
{{- $probeType := $probe.type -}}
{{- end }}
{{- end }}
{{- end }}
{{- if or ( eq $probeType "HTTPS" ) ( eq $probeType "HTTP" ) -}}
{{- "httpGet:" | nindent 2 }}

9
charts/library/common/values.yaml
View File

@ -153,6 +153,9 @@ probes:
enabled: true
# -- Set this to `true` if you wish to specify your own livenessProbe
custom: false
# -- sets the probe type when not using a custom probe
# @default -- "TCP"
type: TCP
# -- If a HTTP probe is used (default for HTTP/HTTPS services) this path is used
# @default -- "/"
path: "/"
@ -172,6 +175,9 @@ probes:
enabled: true
# -- Set this to `true` if you wish to specify your own readinessProbe
custom: false
# -- sets the probe type when not using a custom probe
# @default -- "TCP"
type: TCP
# -- If a HTTP probe is used (default for HTTP/HTTPS services) this path is used
# @default -- "/"
path: "/"
@ -191,6 +197,9 @@ probes:
enabled: true
# -- Set this to `true` if you wish to specify your own startupProbe
custom: false
# -- sets the probe type when not using a custom probe
# @default -- "TCP"
type: TCP
# -- If a HTTP probe is used (default for HTTP/HTTPS services) this path is used
# @default -- "/"
path: "/"