diff --git a/libvirt/templates/daemonset-libvirt.yaml b/libvirt/templates/daemonset-libvirt.yaml index cdd3d53f22..00599f6563 100644 --- a/libvirt/templates/daemonset-libvirt.yaml +++ b/libvirt/templates/daemonset-libvirt.yaml @@ -20,6 +20,13 @@ exec: - /usr/bin/virsh connect {{- end }} +{{- define "libvirtExporterProbeTemplate" }} +httpGet: + path: / + port: metrics + scheme: HTTP +{{- end }} + {{- define "libvirt.daemonset" }} {{- $daemonset := index . 0 }} {{- $configMapName := index . 1 }} @@ -312,16 +319,8 @@ spec: - name: metrics protocol: TCP containerPort: {{ tuple "libvirt_exporter" "direct" "metrics" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} - livenessProbe: - httpGet: - path: / - port: metrics - timeoutSeconds: 5 - readinessProbe: - httpGet: - path: / - port: metrics - timeoutSeconds: 5 +{{ dict "envAll" . "component" "libvirt" "container" "libvirt_exporter" "type" "readiness" "probeTemplate" (include "libvirtExporterProbeTemplate" . | fromYaml) | include "helm-toolkit.snippets.kubernetes_probe" | indent 10 }} +{{ dict "envAll" . "component" "libvirt" "container" "libvirt_exporter" "type" "liveness" "probeTemplate" (include "libvirtExporterProbeTemplate" . | fromYaml) | include "helm-toolkit.snippets.kubernetes_probe" | indent 10 }} volumeMounts: - name: run mountPath: /run diff --git a/libvirt/values.yaml b/libvirt/values.yaml index 4900048856..ef36d25880 100644 --- a/libvirt/values.yaml +++ b/libvirt/values.yaml @@ -262,6 +262,19 @@ pod: initialDelaySeconds: 15 periodSeconds: 60 timeoutSeconds: 5 + libvirt_exporter: + liveness: + enabled: true + params: + initialDelaySeconds: 30 + periodSeconds: 60 + timeoutSeconds: 5 + readiness: + enabled: true + params: + initialDelaySeconds: 15 + periodSeconds: 60 + timeoutSeconds: 5 security_context: libvirt: pod: diff --git a/releasenotes/notes/libvirt-e8ba1d91a8ca4999.yaml b/releasenotes/notes/libvirt-e8ba1d91a8ca4999.yaml new file mode 100644 index 0000000000..e93c13bbcb --- /dev/null +++ b/releasenotes/notes/libvirt-e8ba1d91a8ca4999.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Added readiness and liveness probes for the libvirt-exporter sidecar container. +...