Merge branch 'improvement/bump-loki-6.16.0' into q/129.0

CHANGELOG.md

@@ -102,6 +102,12 @@
   [1.21](https://golang.org/doc/devel/release.html#go1.21.minor)
   (PR[#4462](https://github.com/scality/metalk8s/pull/4462))
 
+- Bump Loki chart version to
+  [6.20.0](https://github.com/grafana/loki/releases/tag/helm-loki-6.20.0)
+  The Loki image has been bumped accordingly to
+  [3.2.0](https://github.com/grafana/loki/releases/tag/v3.2.0)
+  (PR[#4450](https://github.com/scality/metalk8s/pull/4450))
+
 ## Release 128.0.1 (in development)
 
 ## Release 128.0.0

buildchain/buildchain/versions.py

@@ -268,8 +268,8 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
     ),
     Image(
         name="loki",
-        version="2.9.6",
-        digest="sha256:6ca6e2cd3b6f45e0eb298da2920610fde63ecd8ab6c595d9c941c8559d1d9407",
+        version="3.2.0",
+        digest="sha256:882e30c20683a48a8b7ca123e6c19988980b4bd13d2ff221dfcbef0fdc631694",
     ),
     Image(
         name="fluent-bit",

charts/loki.yaml

@@ -8,19 +8,32 @@ loki:
     registry: ""
     repository: '__image__(loki)'
 
-  existingSecretForConfig: loki
+  # needs to be removed asap when https://github.com/grafana/loki/issues/14497 is fixed
+  schemaConfig:
+    remove: me 
+
+  configStorageType: Secret
+  configObjectName: loki
+  generatedConfigObjectName: ""
 
   podAnnotations:
     # Override default checksum as we want to manage it with salt
     checksum/config: '__slot__:salt:metalk8s_kubernetes.get_object_digest(kind="Secret", apiVersion="v1", namespace="metalk8s-logging", name="loki", path="data:config.yaml")'
 
+chunksCache:
+  enabled: false
+resultsCache:
+  enabled: false
+
 backend:
   replicas: 0
 read:
   replicas: 0
 write:
   replicas: 0
 
+deploymentMode: SingleBinary
+
 singleBinary:
   targetModule: "all,table-manager"
 
@@ -60,12 +73,12 @@ monitoring:
     grafanaAgent:
       installOperator: false
 
-  lokiCanary:
-    enabled: false
-
   dashboards:
     enabled: false
 
+lokiCanary:
+  enabled: false
+
 gateway:
   enabled: false
 

charts/loki/Chart.lock

@@ -1,9 +1,12 @@
 dependencies:
 - name: minio
   repository: https://charts.min.io/
-  version: 4.0.15
+  version: 4.1.0
 - name: grafana-agent-operator
   repository: https://grafana.github.io/helm-charts
-  version: 0.3.15
-digest: sha256:b7a42cd0e56544f6168a586fde03e26c801bb20cf69bc004a8f6000d93b98100
-generated: "2024-01-27T21:57:28.190462917+05:30"
+  version: 0.5.0
+- name: rollout-operator
+  repository: https://grafana.github.io/helm-charts
+  version: 0.19.1
+digest: sha256:c5c928ea56124dd145a4d3e8b1cc478cc6ce8d002e8dafa7a7457cd096e4d6e2
+generated: "2024-11-15T21:25:36.196519401Z"

charts/loki/Chart.yaml

@@ -1,27 +1,32 @@
 apiVersion: v2
-appVersion: 2.9.6
+appVersion: 3.2.0
 dependencies:
 - alias: minio
   condition: minio.enabled
   name: minio
   repository: https://charts.min.io/
-  version: 4.0.15
+  version: 4.1.0
 - alias: grafana-agent-operator
   condition: monitoring.selfMonitoring.grafanaAgent.installOperator
   name: grafana-agent-operator
   repository: https://grafana.github.io/helm-charts
-  version: 0.3.15
-description: Helm chart for Grafana Loki in simple, scalable mode
+  version: 0.5.0
+- alias: rollout_operator
+  condition: rollout_operator.enabled
+  name: rollout-operator
+  repository: https://grafana.github.io/helm-charts
+  version: 0.19.1
+description: Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both
+  simple, scalable and distributed modes.
 home: https://grafana.github.io/helm-charts
 icon: https://grafana.com/docs/loki/latest/logo_and_name.png
 maintainers:
 - name: trevorwhitney
 - name: jeschkies
-- name: slim-bean
 name: loki
 sources:
 - https://github.com/grafana/loki
 - https://grafana.com/oss/loki/
 - https://grafana.com/docs/loki/latest/
 type: application
-version: 5.48.0
+version: 6.20.0

charts/loki/README.md

@@ -1,8 +1,8 @@
 # loki
 
-![Version: 5.48.0](https://img.shields.io/badge/Version-5.48.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.6](https://img.shields.io/badge/AppVersion-2.9.6-informational?style=flat-square)
+![Version: 6.20.0](https://img.shields.io/badge/Version-6.20.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.2.0](https://img.shields.io/badge/AppVersion-3.2.0-informational?style=flat-square)
 
-Helm chart for Grafana Loki in simple, scalable mode
+Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both simple, scalable and distributed modes.
 
 ## Source Code
 
@@ -14,7 +14,52 @@ Helm chart for Grafana Loki in simple, scalable mode
 
 | Repository | Name | Version |
 |------------|------|---------|
-| https://charts.min.io/ | minio(minio) | 4.0.15 |
-| https://grafana.github.io/helm-charts | grafana-agent-operator(grafana-agent-operator) | 0.3.15 |
+| https://charts.min.io/ | minio(minio) | 4.1.0 |
+| https://grafana.github.io/helm-charts | grafana-agent-operator(grafana-agent-operator) | 0.5.0 |
+| https://grafana.github.io/helm-charts | rollout_operator(rollout-operator) | 0.19.1 |
 
 Find more information in the Loki Helm Chart [documentation](https://grafana.com/docs/loki/next/installation/helm).
+
+## Contributing and releasing
+
+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.
+
+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:
+
+```
+[//]: # (<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.)
+````
+
+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:
+
+```
+[//]: # (<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.)
+
+- [CHANGE] Changed the thing
+- [FEATURE] Cool new feature
+
+## 1.20.0
+
+- [BUGFIX] Fixed the bug
+```
+
+Then the weekly release will create a `CHANGELOG.md` with the following content:
+```
+[//]: # (<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.)
+
+## 1.21.0
+
+- [CHANGE] Changed the thing
+- [FEATURE] Cool new feature
+
+## 1.20.0
+
+- [BUGFIX] Fixed the bug
+```
+
+#### Versioning
+
+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:
+- Automatic weekly releases
+- Releases that coincide with Loki/GEL releases
+- Manual releases when necessary (ie. to address a CVE or critical bug)

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

@@ -1,13 +1,13 @@
 apiVersion: v2
-appVersion: 0.39.1
+appVersion: 0.43.3
 description: A Helm chart for Grafana Agent Operator
-home: https://grafana.com/docs/agent/v0.39/
-icon: https://raw.githubusercontent.com/grafana/agent/v0.39.1/docs/sources/assets/logo_and_name.png
+home: https://grafana.com/docs/agent/v0.43/
+icon: https://raw.githubusercontent.com/grafana/agent/v0.43.3/docs/sources/assets/logo_and_name.png
 maintainers:
 - email: [email protected]
   name: Grafana Agent Team
 name: grafana-agent-operator
 sources:
-- https://github.com/grafana/agent/tree/v0.39.1/pkg/operator
+- https://github.com/grafana/agent/tree/v0.43.3/static/operator
 type: application
-version: 0.3.15
+version: 0.5.0

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

@@ -1,14 +1,14 @@
 # grafana-agent-operator
 
-![Version: 0.3.15](https://img.shields.io/badge/Version-0.3.15-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.39.1](https://img.shields.io/badge/AppVersion-0.39.1-informational?style=flat-square)
+![Version: 0.5.0](https://img.shields.io/badge/Version-0.5.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.43.3](https://img.shields.io/badge/AppVersion-0.43.3-informational?style=flat-square)
 
 A Helm chart for Grafana Agent Operator
 
 ⚠️  **Please create issues relating to this Helm chart in the [Agent](https://github.com/grafana/agent/issues) repo.**
 
 ## Source Code
 
-* <https://github.com/grafana/agent/tree/v0.39.1/pkg/operator>
+* <https://github.com/grafana/agent/tree/v0.43.3/static/operator>
 
 Note that this chart does not provision custom resources like `GrafanaAgent` and `MetricsInstance` (formerly `PrometheusInstance`) or any `*Monitor` resources.
 
@@ -58,12 +58,13 @@ A major chart version change (like v1.2.3 -> v2.0.0) indicates that there is an
 | containerSecurityContext | object | `{}` | Container security context (allowPrivilegeEscalation, etc.) |
 | extraArgs | list | `[]` | List of additional cli arguments to configure agent-operator (example: `--log.level`) |
 | fullnameOverride | string | `""` | Overrides the chart's computed fullname |
+| global.commonLabels | object | `{}` | Common labels for all object directly managed by this chart. |
 | hostAliases | list | `[]` | hostAliases to add |
 | image.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
 | image.pullSecrets | list | `[]` | Image pull secrets |
 | image.registry | string | `"docker.io"` | Image registry |
 | image.repository | string | `"grafana/agent-operator"` | Image repo |
-| image.tag | string | `"v0.39.1"` | Image tag |
+| image.tag | string | `"v0.43.3"` | Image tag |
 | kubeletService | object | `{"namespace":"default","serviceName":"kubelet"}` | If both are set, Agent Operator will create and maintain a service for scraping kubelets https://grafana.com/docs/agent/latest/operator/getting-started/#monitor-kubelets |
 | nameOverride | string | `""` | Overrides the chart's name |
 | nodeSelector | object | `{}` | nodeSelector configuration |
@@ -75,4 +76,7 @@ A major chart version change (like v1.2.3 -> v2.0.0) indicates that there is an
 | resources | object | `{}` | Resource limits and requests config |
 | serviceAccount.create | bool | `true` | Toggle to create ServiceAccount |
 | serviceAccount.name | string | `nil` | Service account name |
+| test.image.registry | string | `"docker.io"` | Test image registry |
+| test.image.repository | string | `"library/busybox"` | Test image repo |
+| test.image.tag | string | `"latest"` | Test image tag |
 | tolerations | list | `[]` | Tolerations applied to Pods |