Skip to content

Commit

Permalink
helm: improve gitops compatibility (#10452)
Browse files Browse the repository at this point in the history
**What this PR does / why we need it**:

In its current form, this helm chart is annoying to deploy using GitOps
tools like fluxcd/argocd. This is due to missing fields that get added
automatically once the objects are applied in the cluster.

A workaround is to just add exceptions for these fields in the gitops
tool, but I think this is a more robust solution.

Screenshot from ArgoCD app diff:

![image](https://github.com/grafana/loki/assets/11833599/21644b4c-bffd-4052-8a4c-bf602e88a878)


**Which issue(s) this PR fixes**:

**Special notes for your reviewer**:

**Checklist**
- [x] Reviewed the
[`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md)
guide (**required**)
- [ ] Documentation added
- [ ] Tests updated
- [ ] `CHANGELOG.md` updated
- [ ] If the change is worth mentioning in the release notes, add
`add-to-release-notes` label
- [ ] Changes that require user attention or interaction to upgrade are
documented in `docs/sources/setup/upgrade/_index.md`
- [x] For Helm chart changes bump the Helm chart version in
`production/helm/loki/Chart.yaml` and update
`production/helm/loki/CHANGELOG.md` and
`production/helm/loki/README.md`. [Example
PR](d10549e)

---------

Co-authored-by: Michel Hollands <42814411+MichelHollands@users.noreply.github.com>
  • Loading branch information
LinAnt and MichelHollands committed Sep 21, 2023
1 parent 0f5fbb6 commit fe223a2
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 7 deletions.
5 changes: 4 additions & 1 deletion production/helm/loki/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ Entries should include a reference to the pull request that introduced the chang

[//]: # (<AUTOMATED_UPDATES_LOCATOR> : do not remove this line. This locator is used by the CI pipeline to automatically create a changelog entry for each new Loki release. Add other chart versions and respective changelog entries bellow this line.)

## 5.22.1

- ENHANCEMENT #10452 Improve gitops compatibility

## 5.22.0

- [CHANGE] Changed version of Loki to 2.9.1
Expand All @@ -27,7 +31,6 @@ Entries should include a reference to the pull request that introduced the chang

- [CHANGE] Changed version of Grafana Enterprise Logs to v1.8.0


## 5.19.0

- [FEATURE] Add optional sidecard to load rules from ConfigMaps and Secrets.
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: loki
description: Helm chart for Grafana Loki in simple, scalable mode
type: application
appVersion: 2.9.1
version: 5.22.0
version: 5.22.1
home: https://grafana.github.io/helm-charts
sources:
- https://github.com/grafana/loki
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# loki

![Version: 5.22.0](https://img.shields.io/badge/Version-5.22.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.1](https://img.shields.io/badge/AppVersion-2.9.1-informational?style=flat-square)
![Version: 5.22.1](https://img.shields.io/badge/Version-5.22.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.1](https://img.shields.io/badge/AppVersion-2.9.1-informational?style=flat-square)

Helm chart for Grafana Loki in simple, scalable mode

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,9 @@ spec:
{{- toYaml . | nindent 8 }}
{{- end }}
volumeClaimTemplates:
- metadata:
- apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: data
spec:
accessModes:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,11 @@ spec:
{{- end }}
relabelings:
- sourceLabels: [job]
action: replace
replacement: "{{ $.Release.Namespace }}/$1"
targetLabel: job
- replacement: "{{ include "loki.clusterLabel" $ }}"
- action: replace
replacement: "{{ include "loki.clusterLabel" $ }}"
targetLabel: cluster
{{- with .relabelings }}
{{- toYaml . | nindent 8 }}
Expand Down
4 changes: 3 additions & 1 deletion production/helm/loki/templates/read/statefulset-read.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,9 @@ spec:
{{- toYaml . | nindent 8 }}
{{- end }}
volumeClaimTemplates:
- metadata:
- apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: data
spec:
accessModes:
Expand Down
4 changes: 3 additions & 1 deletion production/helm/loki/templates/write/statefulset-write.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,9 @@ spec:
{{- toYaml . | nindent 8 }}
{{- end }}
volumeClaimTemplates:
- metadata:
- apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: data
spec:
accessModes:
Expand Down

0 comments on commit fe223a2

Please sign in to comment.