Skip to content

Commit

Permalink
chart, build, salt: bump loki chart to 6.19.0
Browse files Browse the repository at this point in the history
apply breaking changes to loki config.
  • Loading branch information
eg-ayoub committed Nov 19, 2024
1 parent dd285fb commit 6962bc4
Show file tree
Hide file tree
Showing 146 changed files with 10,163 additions and 1,171 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.19.0](https://github.com/grafana/loki/releases/tag/helm-loki-6.19.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
Expand Down
4 changes: 2 additions & 2 deletions buildchain/buildchain/versions.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
21 changes: 17 additions & 4 deletions charts/loki.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -60,12 +73,12 @@ monitoring:
grafanaAgent:
installOperator: false

lokiCanary:
enabled: false

dashboards:
enabled: false

lokiCanary:
enabled: false

gateway:
enabled: false

Expand Down
7 changes: 5 additions & 2 deletions charts/loki/Chart.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,8 @@ dependencies:
- 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"
- name: rollout-operator
repository: https://grafana.github.io/helm-charts
version: 0.13.0
digest: sha256:d0e60c2879039ee5e8b7b10530f0e8790d6d328ee8afca71f01128627e921587
generated: "2024-04-07T14:12:43.317329844-04:00"
13 changes: 9 additions & 4 deletions charts/loki/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v2
appVersion: 2.9.6
appVersion: 3.2.0
dependencies:
- alias: minio
condition: minio.enabled
Expand All @@ -11,17 +11,22 @@ dependencies:
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
- alias: rollout_operator
condition: rollout_operator.enabled
name: rollout-operator
repository: https://grafana.github.io/helm-charts
version: 0.13.0
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.19.0
49 changes: 47 additions & 2 deletions charts/loki/README.md
Original file line number Diff line number Diff line change
@@ -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.19.0](https://img.shields.io/badge/Version-6.19.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

Expand All @@ -16,5 +16,50 @@ Helm chart for Grafana Loki in simple, scalable mode
|------------|------|---------|
| 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://grafana.github.io/helm-charts | rollout_operator(rollout-operator) | 0.13.0 |

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)
23 changes: 23 additions & 0 deletions charts/loki/charts/rollout-operator/.helmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Patterns to ignore when building packages.
# This supports shell glob matching, relative path matching, and
# negation (prefixed with !). Only one pattern per line.
.DS_Store
# Common VCS dirs
.git/
.gitignore
.bzr/
.bzrignore
.hg/
.hgignore
.svn/
# Common backup files
*.swp
*.bak
*.tmp
*.orig
*~
# Various IDEs
.project
.idea/
*.tmproj
.vscode/
8 changes: 8 additions & 0 deletions charts/loki/charts/rollout-operator/Chart.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
apiVersion: v2
appVersion: v0.11.0
description: Grafana rollout-operator
home: https://github.com/grafana/rollout-operator
kubeVersion: ^1.10.0-0
name: rollout-operator
type: application
version: 0.13.0
71 changes: 71 additions & 0 deletions charts/loki/charts/rollout-operator/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
# Grafana rollout-operator Helm Chart

Helm chart for deploying [Grafana rollout-operator](https://github.com/grafana/rollout-operator) to Kubernetes.

# rollout-operator

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

Grafana rollout-operator

## Requirements

Kubernetes: `^1.10.0-0`

## Installation

This section describes various use cases for installation, upgrade and migration from different systems and versions.

### Preparation

These are the common tasks to perform before any of the use cases.

```bash
# Add the repository
helm repo add grafana https://grafana.github.io/helm-charts
helm repo update
```

### Installation of Grafana Rollout Operator

```bash
helm install -n <namespace> <release> grafana/rollout-operator
```

The Grafana rollout-operator should be installed in the same namespace as the statefulsets it is operating upon.
It is not a highly available application and runs as a single pod.

## Values

| Key | Type | Default | Description |
|-----|------|---------|-------------|
| affinity | object | `{}` | |
| fullnameOverride | string | `""` | |
| hostAliases | list | `[]` | hostAliases to add |
| image.pullPolicy | string | `"IfNotPresent"` | |
| image.repository | string | `"grafana/rollout-operator"` | |
| image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion. |
| imagePullSecrets | list | `[]` | |
| minReadySeconds | int | `10` | |
| nameOverride | string | `""` | |
| nodeSelector | object | `{}` | |
| podAnnotations | object | `{}` | Pod Annotations |
| podLabels | object | `{}` | Pod (extra) Labels |
| podSecurityContext | object | `{}` | |
| priorityClassName | string | `""` | |
| resources.limits.memory | string | `"200Mi"` | |
| resources.requests.cpu | string | `"100m"` | |
| resources.requests.memory | string | `"100Mi"` | |
| securityContext | object | `{}` | |
| serviceAccount.annotations | object | `{}` | Annotations to add to the service account |
| serviceAccount.create | bool | `true` | Specifies whether a service account should be created |
| serviceAccount.name | string | `""` | The name of the service account to use. If not set and create is true, a name is generated using the fullname template |
| serviceMonitor.annotations | object | `{}` | ServiceMonitor annotations |
| serviceMonitor.enabled | bool | `false` | Create ServiceMonitor to scrape metrics for Prometheus |
| serviceMonitor.interval | string | `nil` | ServiceMonitor scrape interval |
| serviceMonitor.labels | object | `{}` | Additional ServiceMonitor labels |
| serviceMonitor.namespace | string | `nil` | Alternative namespace for ServiceMonitor resources |
| serviceMonitor.namespaceSelector | object | `{}` | Namespace selector for ServiceMonitor resources |
| serviceMonitor.relabelings | list | `[]` | ServiceMonitor relabel configs to apply to samples before scraping https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#relabelconfig |
| serviceMonitor.scrapeTimeout | string | `nil` | ServiceMonitor scrape timeout in Go duration format (e.g. 15s) |
| tolerations | list | `[]` | |
38 changes: 38 additions & 0 deletions charts/loki/charts/rollout-operator/README.md.gotmpl
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# Grafana rollout-operator Helm Chart

Helm chart for deploying [Grafana rollout-operator]({{ template "chart.homepage" . }}) to Kubernetes.

{{ template "chart.header" . }}

{{ template "chart.versionBadge" . }}{{ template "chart.typeBadge" . }}{{ template "chart.appVersionBadge" . }}

{{ template "chart.description" . }}

{{ template "chart.sourcesSection" . }}

{{ template "chart.requirementsSection" . }}

## Installation

This section describes various use cases for installation, upgrade and migration from different systems and versions.

### Preparation

These are the common tasks to perform before any of the use cases.

```bash
# Add the repository
helm repo add grafana https://grafana.github.io/helm-charts
helm repo update
```

### Installation of Grafana Rollout Operator

```bash
helm install -n <namespace> <release> grafana/rollout-operator
```

The Grafana rollout-operator should be installed in the same namespace as the statefulsets it is operating upon.
It is not a highly available application and runs as a single pod.

{{ template "chart.valuesSection" . }}
10 changes: 10 additions & 0 deletions charts/loki/charts/rollout-operator/templates/NOTES.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
Repo : {{ .Chart.Home }}

Validation:

Check the logs of the pod and ensure messages for reconcilliation of the statefulsets are present.
```
kubectl logs -n {{ .Release.Namespace }} -l {{ include "cli.labels" . }}
```
Example log line:
level=debug ts=2022-04-20T13:59:52.783051541Z msg="reconciling StatefulSet" statefulset=mimir-store-gateway-zone-a
Loading

0 comments on commit 6962bc4

Please sign in to comment.