[helm] Workaround Server-side apply diff on default action

Signed-off-by: Mathieu Parent <mathieu.parent@insee.fr>
grafana · Apr 19, 2023 · b2418fb · b2418fb
1 parent 59c1abe
commit b2418fb
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md
@@ -11,6 +11,10 @@ Entries should be ordered as follows:
 
 Entries should include a reference to the pull request that introduced the change.
 
+## 3.4.3
+
+- [BUGFIX] Workaround Server-side apply diff on default action
+
 ## 3.4.2
 
 - [BUGFIX] Fix read-only /tmp in single-binary mode

diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml
@@ -4,7 +4,7 @@ name: loki
 description: Helm chart for Grafana Loki in simple, scalable mode
 type: application
 appVersion: 2.6.1
-version: 3.4.2
+version: 3.4.3
 home: https://grafana.github.io/helm-charts
 sources:
   - https://github.com/grafana/loki

diff --git a/production/helm/loki/README.md b/production/helm/loki/README.md
@@ -1,6 +1,6 @@
 # loki
 
-![Version: 3.4.2](https://img.shields.io/badge/Version-3.4.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.1](https://img.shields.io/badge/AppVersion-2.6.1-informational?style=flat-square)
+![Version: 3.4.3](https://img.shields.io/badge/Version-3.4.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.1](https://img.shields.io/badge/AppVersion-2.6.1-informational?style=flat-square)
 
 Helm chart for Grafana Loki in simple, scalable mode
 

diff --git a/production/helm/loki/templates/monitoring/servicemonitor.yaml b/production/helm/loki/templates/monitoring/servicemonitor.yaml
@@ -43,8 +43,10 @@ spec:
         - sourceLabels: [job]
           replacement: "{{ $.Release.Namespace }}/$1"
           targetLabel: job
+          action: replace
         - replacement: "{{ include "loki.fullname" $ }}"
           targetLabel: cluster
+          action: replace
         {{- with .relabelings }}
         {{- toYaml . | nindent 8 }}
         {{- end }}