From e6fb32b214740cf56da1a697c671e21b0b788eeb Mon Sep 17 00:00:00 2001 From: Trevor Whitney Date: Wed, 8 Feb 2023 08:42:04 -0700 Subject: [PATCH] [helm] Bump to Loki 2.7.3 (#8445) --- docs/sources/installation/helm/reference.md | 4 ++-- production/helm/loki/CHANGELOG.md | 3 +++ production/helm/loki/Chart.yaml | 4 ++-- production/helm/loki/README.md | 2 +- production/helm/loki/ci/default-values.yaml | 2 ++ production/helm/loki/ci/enterprise.yaml | 2 ++ production/helm/loki/ci/ingress-values.yaml | 2 ++ production/helm/loki/values.yaml | 4 ++-- 8 files changed, 16 insertions(+), 7 deletions(-) diff --git a/docs/sources/installation/helm/reference.md b/docs/sources/installation/helm/reference.md index ce78942d3f..dbb3bc95a7 100644 --- a/docs/sources/installation/helm/reference.md +++ b/docs/sources/installation/helm/reference.md @@ -1658,7 +1658,7 @@ true string Overrides the image tag whose default is the chart's appVersion TODO: needed for 3rd target backend functionality revert to null or latest once this behavior is relased 
-"main-5e53303"
+null
@@ -2763,7 +2763,7 @@ null bool Whether or not to use the 2 target type simple scalable mode (read, write) or the 3 target type (read, write, backend). Legacy refers to the 2 target type, so true will run two targets, false will run 3 targets. 
-false
+true
diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index 28ab22c608..44b7064b32 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -18,6 +18,9 @@ Entries should include a reference to the pull request that introduced the chang - [BUGFIX] Fix rendering of namespace in provisioner job. - [ENHANCEMENT] Allow to configure `publishNotReadyAddresses` on memberlist service. - [BUGFIX] Correctly set `compactor_address` for 3 target scalable configuration. +## 4.6 + +- [Change] Bump Loki verstion to 2.7.3. Revert to 2 target simple scalable mode as default until third target ships in minor release. ## 4.5 diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml index 51c14a4794..5677118e1c 100644 --- a/production/helm/loki/Chart.yaml +++ b/production/helm/loki/Chart.yaml @@ -3,8 +3,8 @@ apiVersion: v2 name: loki description: Helm chart for Grafana Loki in simple, scalable mode type: application -appVersion: 2.7.2 -version: 4.5.1 +appVersion: 2.7.3 +version: 4.6.0 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 index e475b84d89..e0215a1ca1 100644 --- a/production/helm/loki/README.md +++ b/production/helm/loki/README.md @@ -1,6 +1,6 @@ # loki -![Version: 4.5.1](https://img.shields.io/badge/Version-4.5.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.7.2](https://img.shields.io/badge/AppVersion-2.7.2-informational?style=flat-square) +![Version: 4.6.0](https://img.shields.io/badge/Version-4.6.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.7.3](https://img.shields.io/badge/AppVersion-2.7.3-informational?style=flat-square) Helm chart for Grafana Loki in simple, scalable mode diff --git a/production/helm/loki/ci/default-values.yaml b/production/helm/loki/ci/default-values.yaml index 2b8340643c..c143b416be 100644 --- a/production/helm/loki/ci/default-values.yaml +++ b/production/helm/loki/ci/default-values.yaml @@ -2,6 +2,8 @@ loki: commonConfig: replication_factor: 1 + image: + tag: "main-5e53303" read: replicas: 1 write: diff --git a/production/helm/loki/ci/enterprise.yaml b/production/helm/loki/ci/enterprise.yaml index f271dc5637..95f24946d3 100644 --- a/production/helm/loki/ci/enterprise.yaml +++ b/production/helm/loki/ci/enterprise.yaml @@ -11,6 +11,8 @@ enterprise: loki: commonConfig: replication_factor: 1 + image: + tag: "main-5e53303" storage: type: local read: diff --git a/production/helm/loki/ci/ingress-values.yaml b/production/helm/loki/ci/ingress-values.yaml index 3d5fa688d1..adff785167 100644 --- a/production/helm/loki/ci/ingress-values.yaml +++ b/production/helm/loki/ci/ingress-values.yaml @@ -11,6 +11,8 @@ gateway: loki: commonConfig: replication_factor: 1 + image: + tag: "main-5e53303" read: replicas: 1 write: diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml index 696d095dfa..6058d18983 100644 --- a/production/helm/loki/values.yaml +++ b/production/helm/loki/values.yaml @@ -47,7 +47,7 @@ loki: # -- Overrides the image tag whose default is the chart's appVersion # TODO: needed for 3rd target backend functionality # revert to null or latest once this behavior is relased - tag: "main-5e53303" + tag: null # -- Docker image pull policy pullPolicy: IfNotPresent # -- Common annotations for all pods @@ -812,7 +812,7 @@ read: # -- Whether or not to use the 2 target type simple scalable mode (read, write) or the # 3 target type (read, write, backend). Legacy refers to the 2 target type, so true will # run two targets, false will run 3 targets. - legacyReadTarget: false + legacyReadTarget: true # -- Additional CLI args for the read extraArgs: [] # -- Environment variables to add to the read pods