Skip to content

Commit 66be8d5

Browse files
KyriosGN0KyriosGN0
authored
fix relabeling and compactor svc showing diff in argocd (#9195)
* fix relabeling and compactor svc showing diff in argocd Signed-off-by: AvivGuiser <[email protected]> * update changelog Signed-off-by: AvivGuiser <[email protected]> --------- Signed-off-by: AvivGuiser <[email protected]>
1 parent 764de8d commit 66be8d5

File tree

35 files changed

+93
-35
lines changed

35 files changed

+93
-35
lines changed

‎operations/helm/charts/mimir-distributed/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ Entries should include a reference to the Pull Request that introduced the chang
5050
* [BUGFIX] Add `global.extraVolumeMounts` to the exporter container on memcached statefulsets #8787
5151
* [BUGFIX] Fix helm releases failing when `querier.kedaAutoscaling.predictiveScalingEnabled=true`. #8731
5252
* [BUGFIX] Alertmanager: Set -server.http-idle-timeout to avoid EOF errors in ruler. #8192
53+
* [BUGFIX] Helm: fix second relabeling in ServiceMonitor and PVC template in compactor to not show diff in ArgoCD. #9195
5354

5455
## 5.4.1
5556

‎operations/helm/charts/mimir-distributed/templates/compactor/compactor-statefulset.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ spec:
2323
serviceName: {{ template "mimir.fullname" . }}-compactor
2424
{{- if .Values.compactor.persistentVolume.enabled }}
2525
volumeClaimTemplates:
26-
- metadata:
26+
- apiVersion: v1
27+
kind: PersistentVolumeClaim
28+
metadata:
2729
name: storage
2830
{{- if .Values.compactor.persistentVolume.annotations }}
2931
annotations:

‎operations/helm/charts/mimir-distributed/templates/lib/service-monitor.tpl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ spec:
5252
replacement: "{{ $.ctx.Release.Namespace }}/{{ $.component }}"
5353
targetLabel: job
5454
{{- if kindIs "string" .clusterLabel }}
55-
- replacement: "{{ .clusterLabel | default (include "mimir.clusterName" $.ctx) }}"
55+
- action: replace
56+
replacement: "{{ .clusterLabel | default (include "mimir.clusterName" $.ctx) }}"
5657
targetLabel: cluster
5758
{{- end }}
5859
{{- with .relabelings }}
@@ -71,4 +72,4 @@ spec:
7172
{{- end }}
7273
{{- end -}}
7374
{{- end -}}
74-
{{- end -}}
75+
{{- end -}}

‎operations/helm/tests/enterprise-https-values-generated/mimir-distributed/templates/compactor/compactor-statefulset.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ spec:
2525
type: RollingUpdate
2626
serviceName: enterprise-https-values-mimir-compactor
2727
volumeClaimTemplates:
28-
- metadata:
28+
- apiVersion: v1
29+
kind: PersistentVolumeClaim
30+
metadata:
2931
name: storage
3032
spec:
3133
accessModes:

‎operations/helm/tests/gateway-enterprise-values-generated/mimir-distributed/templates/compactor/compactor-statefulset.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ spec:
2525
type: RollingUpdate
2626
serviceName: gateway-enterprise-values-mimir-compactor
2727
volumeClaimTemplates:
28-
- metadata:
28+
- apiVersion: v1
29+
kind: PersistentVolumeClaim
30+
metadata:
2931
name: storage
3032
spec:
3133
accessModes:

‎operations/helm/tests/gateway-nginx-values-generated/mimir-distributed/templates/compactor/compactor-statefulset.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ spec:
2525
type: RollingUpdate
2626
serviceName: gateway-nginx-values-mimir-compactor
2727
volumeClaimTemplates:
28-
- metadata:
28+
- apiVersion: v1
29+
kind: PersistentVolumeClaim
30+
metadata:
2931
name: storage
3032
spec:
3133
accessModes:

‎operations/helm/tests/graphite-enabled-values-generated/mimir-distributed/templates/compactor/compactor-statefulset.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ spec:
2525
type: RollingUpdate
2626
serviceName: graphite-enabled-values-mimir-compactor
2727
volumeClaimTemplates:
28-
- metadata:
28+
- apiVersion: v1
29+
kind: PersistentVolumeClaim
30+
metadata:
2931
name: storage
3032
spec:
3133
accessModes:

‎operations/helm/tests/keda-autoscaling-global-values-generated/mimir-distributed/templates/compactor/compactor-statefulset.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ spec:
2525
type: RollingUpdate
2626
serviceName: keda-autoscaling-global-values-mimir-compactor
2727
volumeClaimTemplates:
28-
- metadata:
28+
- apiVersion: v1
29+
kind: PersistentVolumeClaim
30+
metadata:
2931
name: storage
3032
spec:
3133
accessModes:

‎operations/helm/tests/keda-autoscaling-metamonitoring-values-generated/mimir-distributed/templates/compactor/compactor-statefulset.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ spec:
2525
type: RollingUpdate
2626
serviceName: keda-autoscaling-metamonitoring-values-mimir-compactor
2727
volumeClaimTemplates:
28-
- metadata:
28+
- apiVersion: v1
29+
kind: PersistentVolumeClaim
30+
metadata:
2931
name: storage
3032
spec:
3133
accessModes:

‎operations/helm/tests/keda-autoscaling-values-generated/mimir-distributed/templates/compactor/compactor-statefulset.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ spec:
2525
type: RollingUpdate
2626
serviceName: keda-autoscaling-values-mimir-compactor
2727
volumeClaimTemplates:
28-
- metadata:
28+
- apiVersion: v1
29+
kind: PersistentVolumeClaim
30+
metadata:
2931
name: storage
3032
spec:
3133
accessModes:

0 commit comments

Comments
 (0)