From 3be1c68d83e6a4cd984cb8b0aff2e7eb5a2f8a12 Mon Sep 17 00:00:00 2001 From: Daan Schipper <2778477+daanschipper@users.noreply.github.com> Date: Wed, 30 Oct 2024 19:48:23 +0100 Subject: [PATCH] fix alertmanager sts showing diff in argocd (#9774) --- .../helm/charts/mimir-distributed/CHANGELOG.md | 1 + .../alertmanager/alertmanager-statefulset.yaml | 4 +++- .../alertmanager/alertmanager-statefulset.yaml | 4 +++- .../alertmanager/alertmanager-statefulset.yaml | 4 +++- .../alertmanager/alertmanager-statefulset.yaml | 4 +++- .../alertmanager/alertmanager-statefulset.yaml | 4 +++- .../alertmanager/alertmanager-statefulset.yaml | 4 +++- .../alertmanager/alertmanager-statefulset.yaml | 4 +++- .../alertmanager/alertmanager-statefulset.yaml | 4 +++- .../alertmanager/alertmanager-statefulset.yaml | 4 +++- .../alertmanager/alertmanager-statefulset.yaml | 4 +++- .../alertmanager/alertmanager-statefulset.yaml | 4 +++- .../alertmanager/alertmanager-statefulset.yaml | 4 +++- .../alertmanager/alertmanager-statefulset.yaml | 4 +++- .../alertmanager/alertmanager-statefulset.yaml | 4 +++- .../alertmanager/alertmanager-statefulset.yaml | 4 +++- .../alertmanager/alertmanager-statefulset.yaml | 4 +++- .../alertmanager/alertmanager-statefulset.yaml | 4 +++- .../alertmanager/alertmanager-statefulset.yaml | 4 +++- .../alertmanager/alertmanager-statefulset.yaml | 12 +++++++++--- .../alertmanager/alertmanager-statefulset.yaml | 4 +++- .../alertmanager/alertmanager-statefulset.yaml | 4 +++- .../alertmanager/alertmanager-statefulset.yaml | 4 +++- .../alertmanager/alertmanager-statefulset.yaml | 4 +++- 24 files changed, 76 insertions(+), 25 deletions(-) diff --git a/operations/helm/charts/mimir-distributed/CHANGELOG.md b/operations/helm/charts/mimir-distributed/CHANGELOG.md index eb75bf9a4fb..1496e93f75a 100644 --- 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/operations/helm/charts/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml b/operations/helm/charts/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml index 4f4469af8f5..5437fc483db 100644 --- a/operations/helm/charts/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml +++ b/operations/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/operations/helm/tests/enterprise-https-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml b/operations/helm/tests/enterprise-https-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml index 31c95e1e6bc..72e407795ab 100644 --- a/operations/helm/tests/enterprise-https-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml +++ b/operations/helm/tests/enterprise-https-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/operations/helm/tests/gateway-enterprise-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml b/operations/helm/tests/gateway-enterprise-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml index a5b572297d0..85e3987717a 100644 --- a/operations/helm/tests/gateway-enterprise-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml +++ b/operations/helm/tests/gateway-enterprise-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/operations/helm/tests/gateway-nginx-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml b/operations/helm/tests/gateway-nginx-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml index 2577f6736ff..591d35d4c06 100644 --- a/operations/helm/tests/gateway-nginx-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml +++ b/operations/helm/tests/gateway-nginx-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/operations/helm/tests/graphite-enabled-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml b/operations/helm/tests/graphite-enabled-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml index 174f7aa1087..481826f88b7 100644 --- a/operations/helm/tests/graphite-enabled-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml +++ b/operations/helm/tests/graphite-enabled-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/operations/helm/tests/keda-autoscaling-global-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml b/operations/helm/tests/keda-autoscaling-global-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml index b1fda4a23a8..1760bff0f71 100644 --- a/operations/helm/tests/keda-autoscaling-global-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml +++ b/operations/helm/tests/keda-autoscaling-global-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/operations/helm/tests/keda-autoscaling-metamonitoring-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml b/operations/helm/tests/keda-autoscaling-metamonitoring-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml index ff7d8828872..2ef5c25b12e 100644 --- a/operations/helm/tests/keda-autoscaling-metamonitoring-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml +++ b/operations/helm/tests/keda-autoscaling-metamonitoring-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/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml b/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml index 81bb285e7f1..c5097f487dd 100644 --- a/operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml +++ b/operations/helm/tests/keda-autoscaling-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/operations/helm/tests/large-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml b/operations/helm/tests/large-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml index ed22c126bdd..af49627c48d 100644 --- a/operations/helm/tests/large-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml +++ b/operations/helm/tests/large-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/operations/helm/tests/metamonitoring-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml b/operations/helm/tests/metamonitoring-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml index e32e23fd820..6110d0c13e1 100644 --- a/operations/helm/tests/metamonitoring-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml +++ b/operations/helm/tests/metamonitoring-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/operations/helm/tests/openshift-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml b/operations/helm/tests/openshift-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml index d9a1b4f5a25..be5824feb06 100644 --- a/operations/helm/tests/openshift-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml +++ b/operations/helm/tests/openshift-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/operations/helm/tests/scheduler-name-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml b/operations/helm/tests/scheduler-name-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml index 9ca7cfbe010..ee6e11a6e39 100644 --- a/operations/helm/tests/scheduler-name-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml +++ b/operations/helm/tests/scheduler-name-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/operations/helm/tests/small-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml b/operations/helm/tests/small-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml index 6b0471ef660..96e228bda4b 100644 --- a/operations/helm/tests/small-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml +++ b/operations/helm/tests/small-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/operations/helm/tests/test-enterprise-k8s-1.25-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml b/operations/helm/tests/test-enterprise-k8s-1.25-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml index 942b353b629..83df6b5e6eb 100644 --- a/operations/helm/tests/test-enterprise-k8s-1.25-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml +++ b/operations/helm/tests/test-enterprise-k8s-1.25-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/operations/helm/tests/test-enterprise-legacy-label-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml b/operations/helm/tests/test-enterprise-legacy-label-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml index 7c515520671..0baf00b044b 100644 --- a/operations/helm/tests/test-enterprise-legacy-label-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml +++ b/operations/helm/tests/test-enterprise-legacy-label-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/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml index ebbd9d16a8f..3cf268285f6 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml +++ b/operations/helm/tests/test-enterprise-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/operations/helm/tests/test-ingress-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml b/operations/helm/tests/test-ingress-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml index f66ce683331..5bd729a43bc 100644 --- a/operations/helm/tests/test-ingress-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml +++ b/operations/helm/tests/test-ingress-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/operations/helm/tests/test-oss-k8s-1.25-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml b/operations/helm/tests/test-oss-k8s-1.25-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml index 823f34c3dea..e8c30ce46b1 100644 --- a/operations/helm/tests/test-oss-k8s-1.25-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml +++ b/operations/helm/tests/test-oss-k8s-1.25-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/operations/helm/tests/test-oss-multizone-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml b/operations/helm/tests/test-oss-multizone-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml index 7d277d35bb1..9f6d1116ed7 100644 --- a/operations/helm/tests/test-oss-multizone-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml +++ b/operations/helm/tests/test-oss-multizone-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/operations/helm/tests/test-oss-topology-spread-constraints-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml b/operations/helm/tests/test-oss-topology-spread-constraints-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml index 5581533ec63..f80df9e7bd2 100644 --- a/operations/helm/tests/test-oss-topology-spread-constraints-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml +++ b/operations/helm/tests/test-oss-topology-spread-constraints-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/operations/helm/tests/test-requests-and-limits-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml b/operations/helm/tests/test-requests-and-limits-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml index 00b795068fa..1467b644207 100644 --- a/operations/helm/tests/test-requests-and-limits-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml +++ b/operations/helm/tests/test-requests-and-limits-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/operations/helm/tests/test-ruler-dedicated-query-path-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml b/operations/helm/tests/test-ruler-dedicated-query-path-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml index eedc8ea2150..5cf2c6476af 100644 --- a/operations/helm/tests/test-ruler-dedicated-query-path-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml +++ b/operations/helm/tests/test-ruler-dedicated-query-path-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/operations/helm/tests/test-vault-agent-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml b/operations/helm/tests/test-vault-agent-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml index bde26463a92..e002e873766 100644 --- a/operations/helm/tests/test-vault-agent-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml +++ b/operations/helm/tests/test-vault-agent-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: