[prometheus] Add support for PVC retention policy in statefulset (pro…

…metheus-community#3748) * Add support for statefulset PVC retention policy * Introduce fields statefulSet.pvcDeleteOnStsDelete and statefulSet.pvcDeleteOnStsScale (bool) to delete or retain PVCs on deleting and scaling the statefulset (default is false). Signed-off-by: zeritti <[email protected]> * Bump chart version Signed-off-by: zeritti <[email protected]> --------- Signed-off-by: zeritti <[email protected]> Co-authored-by: MH <[email protected]>
giffgaff · Mar 20, 2024 · c78c55c · c78c55c
1 parent 391c9fd
commit c78c55c
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 1 deletion.
diff --git a/charts/prometheus/Chart.yaml b/charts/prometheus/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: prometheus
 appVersion: v2.46.0
-version: 24.2.0
+version: 24.3.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/templates/sts.yaml b/charts/prometheus/templates/sts.yaml
@@ -14,6 +14,11 @@ metadata:
   name: {{ template "prometheus.server.fullname" . }}
   namespace: {{ include "prometheus.namespace" . }}
 spec:
+  {{- if semverCompare ">= 1.27.x" (include "prometheus.kubeVersion" .) }}
+  persistentVolumeClaimRetentionPolicy:
+    whenDeleted: {{ ternary "Delete" "Retain" .Values.server.statefulSet.pvcDeleteOnStsDelete }}
+    whenScaled: {{ ternary "Delete" "Retain" .Values.server.statefulSet.pvcDeleteOnStsScale }}
+  {{- end }}
   serviceName: {{ template "prometheus.server.fullname" . }}-headless
   selector:
     matchLabels:

diff --git a/charts/prometheus/values.schema.json b/charts/prometheus/values.schema.json
@@ -62,6 +62,9 @@
                         "extraVolumeDirs": {
                             "type": "array"
                         },
+                        "extraVolumeMounts": {
+                            "type": "array"
+                        },
                         "image": {
                             "type": "object",
                             "properties": {
@@ -439,6 +442,9 @@
                 "readinessProbeTimeout": {
                     "type": "integer"
                 },
+                "releaseNamespace": {
+                    "type": "boolean"
+                },
                 "remoteRead": {
                     "type": "array"
                 },
@@ -454,6 +460,9 @@
                 "retention": {
                     "type": "string"
                 },
+                "revisionHistoryLimit": {
+                    "type": "integer"
+                },
                 "securityContext": {
                     "type": "object",
                     "properties": {
@@ -590,6 +599,12 @@
                         },
                         "podManagementPolicy": {
                             "type": "string"
+                        },
+                        "pvcDeleteOnStsDelete": {
+                            "type": "boolean"
+                        },
+                        "pvcDeleteOnStsScale": {
+                            "type": "boolean"
                         }
                     }
                 },

diff --git a/charts/prometheus/values.yaml b/charts/prometheus/values.yaml
@@ -522,6 +522,15 @@ server:
         servicePort: 10901
         # nodePort: 10901
 
+    ## Statefulset's persistent volume claim retention policy
+    ## pvcDeleteOnStsDelete and pvcDeleteOnStsScale determine whether
+    ## statefulset's PVCs are deleted (true) or retained (false) on scaling down
+    ## and deleting statefulset, respectively. Requires 1.27.0+.
+    ## Ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#persistentvolumeclaim-retention
+    ##
+    pvcDeleteOnStsDelete: false
+    pvcDeleteOnStsScale: false
+
   ## Prometheus server readiness and liveness probe initial delay and timeout
   ## Ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/
   ##