introduce dynamic probes for common-chart (#557)

* introduce dynamic probes for common-chart

* whoops

* deal with cases where no protocol is set for probes
This commit is contained in:
Kjeld Schouten-Lebbing
2021-06-14 12:29:10 +02:00
committed by GitHub
parent fc0504b2e4
commit 722ba2c5db
3 changed files with 22 additions and 3 deletions
+1 -1
View File
@@ -18,4 +18,4 @@ maintainers:
name: common
sources:
type: library
version: 6.2.0
version: 6.3.0
@@ -16,8 +16,18 @@ Probes selection logic.
{{- $probe.spec | toYaml | nindent 2 }}
{{- else }}
{{- if and $primaryService $primaryPort -}}
{{- "tcpSocket:" | nindent 2 }}
{{- printf "port: %v" $primaryPort.port | nindent 4 }}
{{- if $primaryPort.protocol -}}
{{- if or ( eq $primaryPort.protocol "HTTP" ) ( eq $primaryPort.protocol "HTTPS" ) -}}
{{- "httpGet:" | nindent 2 }}
{{- printf "path: %v" $probe.path | nindent 4 }}
{{- printf "scheme: %v" $primaryPort.protocol | nindent 4 }}
{{- else -}}
{{- "tcpSocket:" | nindent 2 }}
{{- end }}
{{- else -}}
{{- "tcpSocket:" | nindent 2 }}
{{- end }}
{{- printf "port: %v" $primaryPort.port | nindent 4 }}
{{- printf "initialDelaySeconds: %v" $probe.spec.initialDelaySeconds | nindent 2 }}
{{- printf "failureThreshold: %v" $probe.spec.failureThreshold | nindent 2 }}
{{- printf "timeoutSeconds: %v" $probe.spec.timeoutSeconds | nindent 2 }}
+9
View File
@@ -153,6 +153,9 @@ probes:
enabled: true
# -- Set this to `true` if you wish to specify your own livenessProbe
custom: false
# -- If a HTTP probe is used (default for HTTP/HTTPS services) this path is used
# @default -- "/"
path: "/"
# -- The spec field contains the values for the default livenessProbe.
# If you selected `custom: true`, this field holds the definition of the livenessProbe.
# @default -- See below
@@ -169,6 +172,9 @@ probes:
enabled: true
# -- Set this to `true` if you wish to specify your own readinessProbe
custom: false
# -- If a HTTP probe is used (default for HTTP/HTTPS services) this path is used
# @default -- "/"
path: "/"
# -- The spec field contains the values for the default readinessProbe.
# If you selected `custom: true`, this field holds the definition of the readinessProbe.
# @default -- See below
@@ -185,6 +191,9 @@ probes:
enabled: true
# -- Set this to `true` if you wish to specify your own startupProbe
custom: false
# -- If a HTTP probe is used (default for HTTP/HTTPS services) this path is used
# @default -- "/"
path: "/"
# -- The spec field contains the values for the default startupProbe.
# If you selected `custom: true`, this field holds the definition of the startupProbe.
# @default -- See below