Skip to content

Commit 1d71e3b

Browse files
committed
Merge branch 'improvement/bump-loki-6.52.0' into q/133.0
2 parents 32c1075 + 168d61d commit 1d71e3b

File tree

215 files changed

+4278
-1590
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

215 files changed

+4278
-1590
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ junit/
3232
# Buildchain artifacts
3333
/_build/
3434

35-
vagrant_config.rb
35+
vagrant_config.rb

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@
2626
[v2.44.0](https://github.com/dexidp/dex/releases/tag/v2.44.0)
2727
(PR[#4774](https://github.com/scality/metalk8s/pull/4774))
2828

29+
- Bump Loki chart version to [6.53.0](https://github.com/grafana/helm-charts/releases/tag/loki-6.53.0)
30+
and Loki image version to [3.6.5](https://github.com/grafana/loki/releases/tag/v3.6.5)
31+
(PR[#4792](https://github.com/scality/metalk8s/pull/4792))
32+
2933
## Release 132.0.1 (in development)
3034

3135
## Release 132.0.0

buildchain/buildchain/versions.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,8 +276,8 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
276276
),
277277
Image(
278278
name="loki",
279-
version="3.4.2",
280-
digest="sha256:58a6c186ce78ba04d58bfe2a927eff296ba733a430df09645d56cdc158f3ba08",
279+
version="3.6.5",
280+
digest="sha256:847c287ada0e12603910589f42038c5cdaaad04e248bd1dc6c6e0920a235f427",
281281
),
282282
Image(
283283
name="fluent-bit",

charts/loki.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,12 @@ monitoring:
7979
lokiCanary:
8080
enabled: false
8181

82+
sidecar:
83+
image:
84+
registry: ""
85+
repository: "__image__(k8s-sidecar)"
86+
tag: 1.28.0
87+
8288
gateway:
8389
enabled: false
8490

charts/loki/CONTRIBUTING.md

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
# Contributing to the Loki Helm Chart
2+
3+
Thank you for your interest in contributing to the Loki Helm Chart! This document provides guidelines for contributing to ensure the chart remains maintainable, broadly useful, and accessible to the community.
4+
5+
For general Loki project contributions, please also see the main [Contributing Guide](../../../CONTRIBUTING.md).
6+
7+
## Contribution Guidelines
8+
9+
### What We Welcome
10+
11+
We encourage contributions that:
12+
13+
- **Improve general usability**: Features that benefit the majority of users
14+
- **Fix bugs**: Clear bug fixes with reproduction steps
15+
- **Enhance documentation**: Better examples, clearer explanations
16+
- **Security improvements**: Security-related enhancements
17+
- **Performance optimizations**: Changes that improve performance broadly
18+
- **Standards compliance**: Updates to follow Kubernetes best practices
19+
20+
### What We Avoid
21+
22+
To keep the chart maintainable and broadly useful, we avoid:
23+
24+
- **Project-specific integrations**: Features specific to other projects that serve only a small group of users
25+
- **Company/individual-specific requirements**: Customizations that serve only specific organizations
26+
- **Bizarre constraints**: Unusual or overly complex requirements that don't serve the general community
27+
- **Breaking changes**: Changes that would break existing deployments without clear migration paths
28+
29+
### Decision Criteria
30+
31+
When reviewing contributions, we ask:
32+
33+
1. **Is this generally useful?** Does it benefit the broader community or just specific users?
34+
2. **Is it simple and reasonable?** Does it add unnecessary complexity?
35+
3. **Does it align with Kubernetes best practices?** Is it following established patterns?
36+
4. **Is it maintainable?** Can the community maintain this feature long-term?
37+
38+
**Important**: If your use case is highly specific to your organization, consider using the Loki chart as a subchart instead of being called directly. This allows you to customize without adding complexity to the main chart.
39+
40+
## Technical Requirements
41+
42+
### Before Submitting a PR
43+
44+
1. **Update documentation**: Run `make helm-docs` from the repository root if you modified:
45+
- `Chart.yaml`
46+
- `values.yaml`
47+
- Any template files
48+
49+
2. **Update the changelog**: Add an entry to [CHANGELOG.md](./CHANGELOG.md) in the `Unreleased` section using the format:
50+
```
51+
- [CHANGE|FEATURE|BUGFIX|ENHANCEMENT] Brief description of your change, and a link to the PR number. For examples, see the CHANGELOG.
52+
```
53+
54+
3. **Test your changes**: The CICD workflow will run comprehensive tests, however it's a good idea to run a few "quick and dirty" tests locally before committing, as those workflows can take quite a while in comparison.
55+
- Single binary: `helm template --values single-binary-values.yaml`
56+
- Simple scalable: `helm template --values simple-scalable-values.yaml`
57+
- Distributed: `helm template --values distributed-values.yaml`
58+
59+
4. **Commit your changes**: Our commits follow the style of [Conventional Commits](https://www.conventionalcommits.org/). High level this looks like `<type>: description`. For example:
60+
- `feat(helm): add resource limits to querier`
61+
- `fix(helm): correct service selector`
62+
63+
Thank you for contributing to the Loki Helm Chart! Your contributions help make log aggregation accessible to the entire community.

charts/loki/Chart.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ dependencies:
44
version: 5.4.0
55
- name: grafana-agent-operator
66
repository: https://grafana.github.io/helm-charts
7-
version: 0.5.1
7+
version: 0.5.2
88
- name: rollout-operator
99
repository: https://grafana.github.io/helm-charts
10-
version: 0.24.0
11-
digest: sha256:beb08aeb31a1fa6b88c326b307c9960ca5fc5032892f7acd5deae6b859884638
12-
generated: "2025-02-26T01:09:19.861074559Z"
10+
version: 0.41.0
11+
digest: sha256:8c45cdff45c47ed4f15c529703475d7921e2720062f31e35f9e3052b7abd0ca1
12+
generated: "2026-02-10T14:08:17.625986897Z"

charts/loki/Chart.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
apiVersion: v2
2-
appVersion: 3.4.2
2+
appVersion: 3.6.5
33
dependencies:
44
- alias: minio
55
condition: minio.enabled
@@ -10,12 +10,12 @@ dependencies:
1010
condition: monitoring.selfMonitoring.grafanaAgent.installOperator
1111
name: grafana-agent-operator
1212
repository: https://grafana.github.io/helm-charts
13-
version: 0.5.1
13+
version: 0.5.2
1414
- alias: rollout_operator
1515
condition: rollout_operator.enabled
1616
name: rollout-operator
1717
repository: https://grafana.github.io/helm-charts
18-
version: 0.24.0
18+
version: 0.41.0
1919
description: Helm chart for Grafana Loki and Grafana Enterprise Logs supporting monolithic,
2020
simple scalable, and microservices modes.
2121
home: https://grafana.github.io/helm-charts
@@ -29,4 +29,4 @@ sources:
2929
- https://grafana.com/oss/loki/
3030
- https://grafana.com/docs/loki/latest/
3131
type: application
32-
version: 6.29.0
32+
version: 6.53.0

charts/loki/README.md

Lines changed: 11 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
# loki
22

3-
![Version: 6.29.0](https://img.shields.io/badge/Version-6.29.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.4.2](https://img.shields.io/badge/AppVersion-3.4.2-informational?style=flat-square)
3+
![Version: 6.53.0](https://img.shields.io/badge/Version-6.53.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.6.5](https://img.shields.io/badge/AppVersion-3.6.5-informational?style=flat-square)
44

55
Helm chart for Grafana Loki and Grafana Enterprise Logs supporting monolithic, simple scalable, and microservices modes.
66

7+
## ⚠️ Helm Chart Migration
8+
Effective March 16, 2026, the Grafana Loki Helm chart will be forked to a new repository [grafana-community/helm-charts](https://github.com/grafana-community/helm-charts). The chart in the Loki repository will continue to be maintained for GEL users only. See [#20705](https://github.com/grafana/loki/issues/20705) for details.
9+
710
## Source Code
811

912
* <https://github.com/grafana/loki>
@@ -15,51 +18,18 @@ Helm chart for Grafana Loki and Grafana Enterprise Logs supporting monolithic, s
1518
| Repository | Name | Version |
1619
|------------|------|---------|
1720
| https://charts.min.io/ | minio(minio) | 5.4.0 |
18-
| https://grafana.github.io/helm-charts | grafana-agent-operator(grafana-agent-operator) | 0.5.1 |
19-
| https://grafana.github.io/helm-charts | rollout_operator(rollout-operator) | 0.24.0 |
20-
21-
Find more information in the Loki Helm Chart [documentation](https://grafana.com/docs/loki/next/installation/helm).
22-
23-
## Contributing and releasing
24-
25-
If you made any changes to the [Chart.yaml](https://github.com/grafana/loki/blob/main/production/helm/loki/Chart.yaml) or [values.yaml](https://github.com/grafana/loki/blob/main/production/helm/loki/values.yaml) run `make helm-docs` from the root of the repository to update the documentation and commit the changed files.
26-
27-
Futhermore, please add an entry to the [CHANGELOG.md](./CHANGELOG.md) file about what you changed. This file has a header that looks like this:
28-
29-
```
30-
[//]: # (<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.)
31-
````
32-
33-
Place your changes as a bulleted list below this header. The helm chart is automatically released once a week, at which point the `CHANGELOG.md` file will be updated to reflect the release of all changes between this header the the header of the previous version as the changes for that weeks release. For example, if the weekly release will be `1.21.0`, and the `CHANGELOG.md` file has the following entries:
34-
35-
```
36-
[//]: # (<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.)
37-
38-
- [CHANGE] Changed the thing
39-
- [FEATURE] Cool new feature
40-
41-
## 1.20.0
42-
43-
- [BUGFIX] Fixed the bug
44-
```
45-
46-
Then the weekly release will create a `CHANGELOG.md` with the following content:
47-
```
48-
[//]: # (<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.)
49-
50-
## 1.21.0
21+
| https://grafana.github.io/helm-charts | grafana-agent-operator(grafana-agent-operator) | 0.5.2 |
22+
| https://grafana.github.io/helm-charts | rollout_operator(rollout-operator) | 0.40.0 |
5123

52-
- [CHANGE] Changed the thing
53-
- [FEATURE] Cool new feature
24+
Find more information in the Loki Helm Chart [documentation](https://grafana.com/docs/loki/latest/setup/install/helm/).
5425

55-
## 1.20.0
26+
## Contributing
5627

57-
- [BUGFIX] Fixed the bug
58-
```
28+
Please see our [Helm Contributing Guidelines](./CONTRIBUTING.md) for detailed information about contributing to the Loki Helm Chart.
5929

60-
#### Versioning
30+
## Releases
6131

62-
Normally contributors need _not_ bump the version nor update the [CHANGELOG.md](https://github.com/grafana/loki/blob/main/production/helm/loki/CHANGELOG.md). A new version of the Chart will follow this cadence:
32+
Normally, contributors need _not_ bump the Chart version. A new version of the Chart will follow this cadence:
6333
- Automatic weekly releases
6434
- Releases that coincide with Loki/GEL releases
6535
- Manual releases when necessary (ie. to address a CVE or critical bug)

charts/loki/charts/grafana-agent-operator/Chart.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
apiVersion: v2
22
appVersion: 0.44.2
3+
deprecated: true
34
description: A Helm chart for Grafana Agent Operator
45
home: https://grafana.com/docs/agent/v0.44/
56
icon: https://raw.githubusercontent.com/grafana/agent/v0.44.2/docs/sources/assets/logo_and_name.png
@@ -10,4 +11,4 @@ name: grafana-agent-operator
1011
sources:
1112
- https://github.com/grafana/agent/tree/v0.44.2/static/operator
1213
type: application
13-
version: 0.5.1
14+
version: 0.5.2

charts/loki/charts/grafana-agent-operator/README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1+
# ⚠️ Deprecation Notice
2+
3+
**This chart is deprecated and will no longer receive updates or support.**
4+
15
# grafana-agent-operator
26

3-
![Version: 0.5.1](https://img.shields.io/badge/Version-0.5.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.44.2](https://img.shields.io/badge/AppVersion-0.44.2-informational?style=flat-square)
7+
![Version: 0.5.2](https://img.shields.io/badge/Version-0.5.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.44.2](https://img.shields.io/badge/AppVersion-0.44.2-informational?style=flat-square)
48

59
A Helm chart for Grafana Agent Operator
610

0 commit comments

Comments
 (0)