fix alertmanager sts showing diff in argocd (#9774)

grafana · Oct 30, 2024 · 3be1c68 · 3be1c68
1 parent 0f8b12b
commit 3be1c68
Show file tree

Hide file tree

Showing 24 changed files with 76 additions and 25 deletions.
diff --git a/operations/helm/charts/mimir-distributed/CHANGELOG.md b/operations/helm/charts/mimir-distributed/CHANGELOG.md
@@ -30,6 +30,7 @@ Entries should include a reference to the Pull Request that introduced the chang
 ## main / unreleased
 
 * [ENHANCEMENT] Add support for setting type and internal traffic policy for Kubernetes service. Set `internalTrafficPolicy=Cluster` by default in all services with type `ClusterIP`. #9619
+* [BUGFIX] Fix PVC template in AlertManager to not show diff in ArgoCD. #9774
 
 ## 5.5.1
 

diff --git a/...ations/helm/charts/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml b/...ations/helm/charts/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml
@@ -33,7 +33,9 @@ spec:
   serviceName: {{ template "mimir.fullname" . }}-alertmanager
   {{- if .Values.alertmanager.persistentVolume.enabled }}
   volumeClaimTemplates:
-    - metadata:
+    - apiVersion: v1
+      kind: PersistentVolumeClaim
+      metadata:
         name: storage
         {{- if .Values.alertmanager.persistentVolume.annotations }}
         annotations:

diff --git a/...s-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml b/...s-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml
@@ -24,7 +24,9 @@ spec:
     type: RollingUpdate
   serviceName: enterprise-https-values-mimir-alertmanager
   volumeClaimTemplates:
-    - metadata:
+    - apiVersion: v1
+      kind: PersistentVolumeClaim
+      metadata:
         name: storage
       spec:
         accessModes:

diff --git a/...e-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml b/...e-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml
@@ -24,7 +24,9 @@ spec:
     type: RollingUpdate
   serviceName: gateway-enterprise-values-mimir-alertmanager
   volumeClaimTemplates:
-    - metadata:
+    - apiVersion: v1
+      kind: PersistentVolumeClaim
+      metadata:
         name: storage
       spec:
         accessModes:

diff --git a/...x-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml b/...x-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml
@@ -24,7 +24,9 @@ spec:
     type: RollingUpdate
   serviceName: gateway-nginx-values-mimir-alertmanager
   volumeClaimTemplates:
-    - metadata:
+    - apiVersion: v1
+      kind: PersistentVolumeClaim
+      metadata:
         name: storage
       spec:
         accessModes:

diff --git a/...d-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml b/...d-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml
@@ -24,7 +24,9 @@ spec:
     type: RollingUpdate
   serviceName: graphite-enabled-values-mimir-alertmanager
   volumeClaimTemplates:
-    - metadata:
+    - apiVersion: v1
+      kind: PersistentVolumeClaim
+      metadata:
         name: storage
       spec:
         accessModes:

diff --git a/...l-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml b/...l-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml
@@ -24,7 +24,9 @@ spec:
     type: RollingUpdate
   serviceName: keda-autoscaling-global-values-mimir-alertmanager
   volumeClaimTemplates:
-    - metadata:
+    - apiVersion: v1
+      kind: PersistentVolumeClaim
+      metadata:
         name: storage
       spec:
         accessModes:

diff --git a/...g-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml b/...g-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml
@@ -24,7 +24,9 @@ spec:
     type: RollingUpdate
   serviceName: keda-autoscaling-metamonitoring-values-mimir-alertmanager
   volumeClaimTemplates:
-    - metadata:
+    - apiVersion: v1
+      kind: PersistentVolumeClaim
+      metadata:
         name: storage
       spec:
         accessModes:

diff --git a/...g-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml b/...g-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml
@@ -24,7 +24,9 @@ spec:
     type: RollingUpdate
   serviceName: keda-autoscaling-values-mimir-alertmanager
   volumeClaimTemplates:
-    - metadata:
+    - apiVersion: v1
+      kind: PersistentVolumeClaim
+      metadata:
         name: storage
       spec:
         accessModes:

diff --git a/...e-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml b/...e-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml
@@ -24,7 +24,9 @@ spec:
     type: RollingUpdate
   serviceName: large-values-mimir-alertmanager
   volumeClaimTemplates:
-    - metadata:
+    - apiVersion: v1
+      kind: PersistentVolumeClaim
+      metadata:
         name: storage
       spec:
         accessModes:

diff --git a/...g-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml b/...g-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml
@@ -24,7 +24,9 @@ spec:
     type: RollingUpdate
   serviceName: metamonitoring-values-mimir-alertmanager
   volumeClaimTemplates:
-    - metadata:
+    - apiVersion: v1
+      kind: PersistentVolumeClaim
+      metadata:
         name: storage
       spec:
         accessModes:

diff --git a/...t-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml b/...t-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml
@@ -24,7 +24,9 @@ spec:
     type: RollingUpdate
   serviceName: openshift-values-mimir-alertmanager
   volumeClaimTemplates:
-    - metadata:
+    - apiVersion: v1
+      kind: PersistentVolumeClaim
+      metadata:
         name: storage
       spec:
         accessModes:

diff --git a/...e-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml b/...e-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml
@@ -24,7 +24,9 @@ spec:
     type: RollingUpdate
   serviceName: scheduler-name-values-mimir-alertmanager
   volumeClaimTemplates:
-    - metadata:
+    - apiVersion: v1
+      kind: PersistentVolumeClaim
+      metadata:
         name: storage
       spec:
         accessModes:

diff --git a/...l-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml b/...l-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml
@@ -24,7 +24,9 @@ spec:
     type: RollingUpdate
   serviceName: small-values-mimir-alertmanager
   volumeClaimTemplates:
-    - metadata:
+    - apiVersion: v1
+      kind: PersistentVolumeClaim
+      metadata:
         name: storage
       spec:
         accessModes:

diff --git a/...5-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml b/...5-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml
@@ -24,7 +24,9 @@ spec:
     type: RollingUpdate
   serviceName: test-enterprise-k8s-1.25-values-mimir-alertmanager
   volumeClaimTemplates:
-    - metadata:
+    - apiVersion: v1
+      kind: PersistentVolumeClaim
+      metadata:
         name: storage
       spec:
         accessModes:

diff --git a/...l-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml b/...l-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml
@@ -21,7 +21,9 @@ spec:
     type: RollingUpdate
   serviceName: test-enterprise-legacy-label-values-enterprise-metrics-alertmanager
   volumeClaimTemplates:
-    - metadata:
+    - apiVersion: v1
+      kind: PersistentVolumeClaim
+      metadata:
         name: storage
       spec:
         accessModes:

diff --git a/...e-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml b/...e-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml
@@ -24,7 +24,9 @@ spec:
     type: RollingUpdate
   serviceName: test-enterprise-values-mimir-alertmanager
   volumeClaimTemplates:
-    - metadata:
+    - apiVersion: v1
+      kind: PersistentVolumeClaim
+      metadata:
         name: storage
       spec:
         accessModes:

diff --git a/...s-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml b/...s-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml
@@ -24,7 +24,9 @@ spec:
     type: RollingUpdate
   serviceName: test-ingress-values-mimir-alertmanager
   volumeClaimTemplates:
-    - metadata:
+    - apiVersion: v1
+      kind: PersistentVolumeClaim
+      metadata:
         name: storage
       spec:
         accessModes:

diff --git a/...5-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml b/...5-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml
@@ -24,7 +24,9 @@ spec:
     type: RollingUpdate
   serviceName: test-oss-k8s-1.25-values-mimir-alertmanager
   volumeClaimTemplates:
-    - metadata:
+    - apiVersion: v1
+      kind: PersistentVolumeClaim
+      metadata:
         name: storage
       spec:
         accessModes:

diff --git a/...e-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml b/...e-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml
@@ -29,7 +29,9 @@ spec:
     type: OnDelete
   serviceName: test-oss-multizone-values-mimir-alertmanager
   volumeClaimTemplates:
-    - metadata:
+    - apiVersion: v1
+      kind: PersistentVolumeClaim
+      metadata:
         name: storage
       spec:
         accessModes:
@@ -179,7 +181,9 @@ spec:
     type: OnDelete
   serviceName: test-oss-multizone-values-mimir-alertmanager
   volumeClaimTemplates:
-    - metadata:
+    - apiVersion: v1
+      kind: PersistentVolumeClaim
+      metadata:
         name: storage
       spec:
         accessModes:
@@ -329,7 +333,9 @@ spec:
     type: OnDelete
   serviceName: test-oss-multizone-values-mimir-alertmanager
   volumeClaimTemplates:
-    - metadata:
+    - apiVersion: v1
+      kind: PersistentVolumeClaim
+      metadata:
         name: storage
       spec:
         accessModes:

diff --git a/...s-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml b/...s-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml
@@ -24,7 +24,9 @@ spec:
     type: RollingUpdate
   serviceName: test-oss-topology-spread-constraints-values-mimir-alertmanager
   volumeClaimTemplates:
-    - metadata:
+    - apiVersion: v1
+      kind: PersistentVolumeClaim
+      metadata:
         name: storage
       spec:
         accessModes:

diff --git a/...s-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml b/...s-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml
@@ -24,7 +24,9 @@ spec:
     type: RollingUpdate
   serviceName: test-requests-and-limits-values-mimir-alertmanager
   volumeClaimTemplates:
-    - metadata:
+    - apiVersion: v1
+      kind: PersistentVolumeClaim
+      metadata:
         name: storage
       spec:
         accessModes:

diff --git a/...h-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml b/...h-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml
@@ -24,7 +24,9 @@ spec:
     type: RollingUpdate
   serviceName: test-ruler-dedicated-query-path-values-mimir-alertmanager
   volumeClaimTemplates:
-    - metadata:
+    - apiVersion: v1
+      kind: PersistentVolumeClaim
+      metadata:
         name: storage
       spec:
         accessModes:

diff --git a/...t-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml b/...t-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml
@@ -24,7 +24,9 @@ spec:
     type: RollingUpdate
   serviceName: test-vault-agent-values-mimir-alertmanager
   volumeClaimTemplates:
-    - metadata:
+    - apiVersion: v1
+      kind: PersistentVolumeClaim
+      metadata:
         name: storage
       spec:
         accessModes: