[prometheus-rabbitmq-exporter] fix connection parameters not passing …

…to the deployment (#3649) * enable passing rabbitmq conection parameters Signed-off-by: Daniel Gotlieb <[email protected]> * Update chart version Signed-off-by: dgotlieb <[email protected]> * Update charts/prometheus-rabbitmq-exporter/Chart.yaml Signed-off-by: André Bauer <[email protected]> --------- Signed-off-by: Daniel Gotlieb <[email protected]> Signed-off-by: dgotlieb <[email protected]> Signed-off-by: André Bauer <[email protected]> Co-authored-by: Daniel Gotlieb <[email protected]> Co-authored-by: MH <[email protected]> Co-authored-by: André Bauer <[email protected]> [alertmanager] Add if block to ingressClassName to use default ingressClass (#3824) * add-if-block-to-ingressClassName Signed-off-by: jmnote <[email protected]> * Chart Version bumped Signed-off-by: jmnote <[email protected]> --------- Signed-off-by: jmnote <[email protected]> Co-authored-by: André Bauer <[email protected]> [alertmanager] Add optional seperate ingress per replica (#3689) * [alertmanager] Add optional seperate ingress per replica Signed-off-by: Knut Götz <[email protected]> * chore(alertmanger): bump chart version Signed-off-by: Knut Götz <[email protected]> --------- Signed-off-by: Knut Götz <[email protected]> Signed-off-by: André Bauer <[email protected]> Co-authored-by: André Bauer <[email protected]> Signed-off-by: peterabarr <[email protected]> [alertmanager] Add support for PVC retention policy in statefulset Fix Fix PVC policy Fix fmt Signed-off-by: peterabarr <[email protected]> Adjustments Remove ternary rm blank space Signed-off-by: peterabarr <[email protected]> Change chart version Signed-off-by: peterabarr <[email protected]> Json changes Signed-off-by: peterabarr <[email protected]> Add to templates file Signed-off-by: peterabarr <[email protected]> Statefulset fix Signed-off-by: peterabarr <[email protected]> Fixes Signed-off-by: peterabarr <[email protected]>
prometheus-community · Oct 6, 2023 · 79f6231 · 79f6231
1 parent f57ff66
commit 79f6231
Show file tree

Hide file tree

Showing 6 changed files with 74 additions and 3 deletions.
diff --git a/alertmanager.kubeVersion b/alertmanager.kubeVersion
diff --git a/charts/alertmanager/Chart.yaml b/charts/alertmanager/Chart.yaml
@@ -6,7 +6,7 @@ icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/a
 sources:
   - https://github.com/prometheus/alertmanager
 type: application
-version: 1.7.0
+version: 1.8.0
 appVersion: v0.26.0
 kubeVersion: ">=1.19.0-0"
 keywords:

diff --git a/charts/alertmanager/templates/_helpers.tpl b/charts/alertmanager/templates/_helpers.tpl
@@ -24,6 +24,13 @@ If release name contains chart name it will be used as a full name.
 {{- end }}
 {{- end }}
 
+{{/*
+Get KubeVersion removing pre-release information.
+*/}}
+{{- define "alertmanager.kubeVersion" -}}
+  {{- default .Capabilities.KubeVersion.Version (regexFind "v[0-9]+\\.[0-9]+\\.[0-9]+" .Capabilities.KubeVersion.Version) -}}
+{{- end -}}
+
 {{/*
 Create chart name and version as used by the chart label.
 */}}

diff --git a/charts/alertmanager/templates/statefulset.yaml b/charts/alertmanager/templates/statefulset.yaml
@@ -11,6 +11,11 @@ metadata:
   {{- end }}
   namespace: {{ include "alertmanager.namespace" . }}
 spec:
+  {{- if semverCompare ">= 1.27-0" .Capabilities.KubeVersion.Version }}
+  persistentVolumeClaimRetentionPolicy:
+    whenDeleted: {{ .Values.statefulSet.persistentVolumeClaimRetentionPolicy.whenDeleted }}
+    whenScaled: {{ .Values.statefulSet.persistentVolumeClaimRetentionPolicy.whenScaled }}
+  {{- end }}
   replicas: {{ .Values.replicaCount }}
   revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
   selector:

diff --git a/charts/alertmanager/values.schema.json b/charts/alertmanager/values.schema.json
@@ -747,7 +747,56 @@
             "properties": {
                 "annotations": {
                     "type": "object"
-                }
+                },
+                "enabled": {
+                  "type": "boolean"
+                },
+                "headless": {
+                  "type": "object",
+                  "properties": {
+                    "annotations": {
+                      "type": "object"
+                    },
+                    "gRPC": {
+                      "type": "object",
+                      "properties": {
+                        "enabled": {
+                          "type": "boolean"
+                        },
+                        "servicePort": {
+                          "type": "integer"
+                        }
+                      }
+                    },
+                    "labels": {
+                      "type": "object"
+                    },
+                    "servicePort": {
+                      "type": "integer"
+                    }
+                  }
+                },
+                "labels": {
+                  "type": "object"
+                },
+                "podManagementPolicy": {
+                  "type": "string"
+                },
+                "persistentVolumeClaimRetentionPolicy": {
+                    "type": "object",
+                    "properties": {
+                      "whenDeleted": {
+                        "type": "string",
+                        "enum": ["Retain", "Delete"]
+                      },
+                      "whenScaled": {
+                        "type": "string",
+                        "enum": ["Retain", "Delete"]
+                      }
+                    },
+                    "additionalProperties": false,
+                    "required": ["whenDeleted", "whenScaled"]
+              }
             }
         },
         "podAnnotations": {
@@ -912,4 +961,4 @@
             }
         }
     }
-}
+}
diff --git a/charts/alertmanager/values.yaml b/charts/alertmanager/values.yaml
@@ -258,6 +258,16 @@ persistence:
     - ReadWriteOnce
   size: 50Mi
 
+  ## 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
+  ##
+  persistentVolumeClaimRetentionPolicy:
+    whenDeleted: Retain
+    whenScaled: Retain
+
 configAnnotations: {}
   ## For example if you want to provide private data from a secret vault
   ## https://github.com/banzaicloud/bank-vaults/tree/main/charts/vault-secrets-webhook