[prometheus] Add readiness/liveness/startup probes to config-reloader…

… container (#4696) * Added readiness/liveness/startup probe to reload container in Prometheus pod Signed-off-by: Luigi Bitonti <[email protected]> * Changed chart version Signed-off-by: Luigi Bitonti <[email protected]> * Improved code and modified sts Signed-off-by: Luigi Bitonti <[email protected]> * Add code improvement Signed-off-by: Luigi Bitonti <[email protected]> * Removed variable Signed-off-by: Luigi Bitonti <[email protected]> * Removed space after metrics word Signed-off-by: Luigi Bitonti <[email protected]> * Enabled startup probe in ci pipeline Signed-off-by: Luigi Bitonti <[email protected]> --------- Signed-off-by: Luigi Bitonti <[email protected]> Signed-off-by: MH <[email protected]> Co-authored-by: MH <[email protected]>
prometheus-community · Jul 8, 2024 · b320323 · b320323
1 parent 094734b
commit b320323
Show file tree

Hide file tree

Showing 6 changed files with 75 additions and 2 deletions.
diff --git a/charts/prometheus/Chart.yaml b/charts/prometheus/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: prometheus
 appVersion: v2.53.0
-version: 25.22.1
+version: 25.23.0
 kubeVersion: ">=1.19.0-0"
 description: Prometheus is a monitoring system and time series database.
 home: https://prometheus.io/

diff --git a/charts/prometheus/ci/02-config-reloader-deployment-values.yaml b/charts/prometheus/ci/02-config-reloader-deployment-values.yaml
@@ -20,6 +20,9 @@ configmapReload:
       log-level: debug
       watch-interval: 1m
 
+    startupProbe:
+      enabled: true
+
 server:
   statefulSet:
     enabled: false
diff --git a/charts/prometheus/ci/03-config-reloader-sts-values.yaml b/charts/prometheus/ci/03-config-reloader-sts-values.yaml
@@ -20,6 +20,9 @@ configmapReload:
       log-level: debug
       watch-interval: 1m
 
+    startupProbe:
+      enabled: true
+
 server:
   statefulSet:
     enabled: true
diff --git a/charts/prometheus/templates/deploy.yaml b/charts/prometheus/templates/deploy.yaml
@@ -72,6 +72,9 @@ spec:
           {{- $default_url := "http://127.0.0.1:9090/-/reload" }}
           {{- with .Values.server.prefixURL }}
           {{- $default_url = printf "http://127.0.0.1:9090%s/-/reload" . }}
+          {{- end }}
+          {{- if .Values.configmapReload.prometheus.containerPort }}
+            - --listen-address=0.0.0.0:{{ .Values.configmapReload.prometheus.containerPort }}
           {{- end }}
             - --reload-url={{ default $default_url .Values.configmapReload.reloadUrl }}
           {{- range $key, $value := .Values.configmapReload.prometheus.extraArgs }}
@@ -91,6 +94,22 @@ spec:
           {{- if .Values.configmapReload.prometheus.containerPort }}
           ports:
             - containerPort: {{ .Values.configmapReload.prometheus.containerPort }}
+              {{- if .Values.configmapReload.prometheus.containerPortName }}
+              name: {{ .Values.configmapReload.prometheus.containerPortName }}
+              {{- end }}
+          {{- end }}
+          {{- with .Values.configmapReload.prometheus.livenessProbe }}
+          livenessProbe:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.configmapReload.prometheus.readinessProbe }}
+          readinessProbe:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- if .Values.configmapReload.prometheus.startupProbe.enabled }}
+          {{- $startupProbe := omit .Values.configmapReload.prometheus.startupProbe "enabled" }}
+          startupProbe:
+            {{- toYaml $startupProbe | nindent 12 }}
           {{- end }}
           {{- with .Values.configmapReload.prometheus.resources }}
           resources:

diff --git a/charts/prometheus/templates/sts.yaml b/charts/prometheus/templates/sts.yaml
@@ -77,6 +77,9 @@ spec:
           {{- $default_url := "http://127.0.0.1:9090/-/reload" }}
           {{- with .Values.server.prefixURL }}
           {{- $default_url = printf "http://127.0.0.1:9090%s/-/reload" . }}
+          {{- end }}
+          {{- if .Values.configmapReload.prometheus.containerPort }}
+            - --listen-address=0.0.0.0:{{ .Values.configmapReload.prometheus.containerPort }}
           {{- end }}
             - --reload-url={{ default $default_url .Values.configmapReload.reloadUrl }}
           {{- range $key, $value := .Values.configmapReload.prometheus.extraArgs }}
@@ -96,6 +99,22 @@ spec:
           {{- if .Values.configmapReload.prometheus.containerPort }}
           ports:
             - containerPort: {{ .Values.configmapReload.prometheus.containerPort }}
+              {{- if .Values.configmapReload.prometheus.containerPortName }}
+              name: {{ .Values.configmapReload.prometheus.containerPortName }}
+              {{- end }}
+          {{- end }}
+          {{- with .Values.configmapReload.prometheus.livenessProbe }}
+          livenessProbe:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.configmapReload.prometheus.readinessProbe }}
+          readinessProbe:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- if .Values.configmapReload.prometheus.startupProbe }}
+          {{- $startupProbe := omit .Values.configmapReload.prometheus.startupProbe "enabled" }}
+          startupProbe:
+            {{- toYaml $startupProbe | nindent 12 }}
           {{- end }}
           {{- with .Values.configmapReload.prometheus.resources }}
           resources:

diff --git a/charts/prometheus/values.yaml b/charts/prometheus/values.yaml
@@ -65,7 +65,9 @@ configmapReload:
       digest: ""
       pullPolicy: IfNotPresent
 
-    # containerPort: 9533
+    ## config-reloader's container port and port name for probes and metrics
+    containerPort: 8080
+    containerPortName: metrics
 
     ## Additional configmap-reload container arguments
     ## Set to null for argumentless flags
@@ -92,6 +94,33 @@ configmapReload:
     ## Security context to be added to configmap-reload container
     containerSecurityContext: {}
 
+    ## Settings for Prometheus reloader's readiness, liveness and startup probes
+    ## Ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/
+    ##
+
+    livenessProbe:
+      httpGet:
+        path: /healthz
+        port: metrics
+        scheme: HTTP
+      periodSeconds: 10
+      initialDelaySeconds: 2
+
+    readinessProbe:
+      httpGet:
+        path: /healthz
+        port: metrics
+        scheme: HTTP
+      periodSeconds: 10
+
+    startupProbe:
+      enabled: false
+      httpGet:
+        path: /healthz
+        port: metrics
+        scheme: HTTP
+      periodSeconds: 10
+
     ## configmap-reload resource requests and limits
     ## Ref: http://kubernetes.io/docs/user-guide/compute-resources/
     ##