[helm] Bump helm Loki and GEL version (#7760)

**What this PR does / why we need it**: Bumps Loki to 2.7.0 and GEL to 1.6.0 in the helm chart.
grafana · Dec 2, 2022 · 652e216 · 652e216
1 parent 96fc2ab
commit 652e216
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 19 deletions.
diff --git a/docs/sources/installation/helm/reference.md b/docs/sources/installation/helm/reference.md
@@ -126,15 +126,6 @@ null
 			<td><pre lang="json">
 "grafana/enterprise-logs"
 </pre>
-</td>
-		</tr>
-		<tr>
-			<td>enterprise.image.tag</td>
-			<td>string</td>
-			<td>Overrides the image tag whose default is the chart's appVersion</td>
-			<td><pre lang="json">
-"v1.4.0"
-</pre>
 </td>
 		</tr>
 		<tr>
@@ -477,7 +468,7 @@ false
 			<td>string</td>
 			<td></td>
 			<td><pre lang="json">
-"v1.5.2"
+"v1.6.0"
 </pre>
 </td>
 		</tr>

diff --git a/flake.nix b/flake.nix
@@ -46,16 +46,16 @@
           {
             buildGoModule = args:
               prev.buildGoModule (args // rec {
-                version = "1.8.1";
+                version = "1.11.0";
 
                 src = prev.fetchFromGitHub {
                   owner = "norwoodj";
                   repo = "helm-docs";
                   rev = "v${version}";
-                  sha256 = "sha256-OpS/CYBb2Ll6ktvEhqkw/bWMSrFa4duidK3Glu8EnPw=";
+                  sha256 = "sha256-476ZhjRwHlNJFkHzY8qQ7WbAUUpFNSoxXLGX9esDA/E=";
                 };
 
-                vendorSha256 = "sha256-FpmeOQ8nV+sEVu2+nY9o9aFbCpwSShQUFOmyzwEQ9Pw=";
+                vendorSha256 = "sha256-xXwunk9rmzZEtqmSo8biuXnAjPp7fqWdQ+Kt9+Di9N8=";
 
                 ldflags = [
                   "-w"

diff --git a/nix/loki.nix b/nix/loki.nix
@@ -30,6 +30,9 @@ pkgs.stdenv.mkDerivation {
       --replace "IMAGE_TAG := \$(shell ./tools/image-tag)" "IMAGE_TAG := ${imageTag}" \
       --replace "GIT_REVISION := \$(shell git rev-parse --short HEAD)" "GIT_REVISION := ${version}" \
       --replace "GIT_BRANCH := \$(shell git rev-parse --abbrev-ref HEAD)" "GIT_BRANCH := nix" \
+
+    substituteInPlace clients/cmd/fluentd/Makefile \
+      --replace "SHELL    = /usr/bin/env bash -o pipefail" "SHELL = ${bash}/bin/bash -o pipefail"
   '';
 
   buildPhase = ''

diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md
@@ -11,6 +11,10 @@ Entries should be ordered as follows:
 
 Entries should include a reference to the pull request that introduced the change.
 
+## 3.6.0
+
+- [CHANGE] Bump Loki version to 2.7.0 and GEL version to 1.6.0
+
 ## 3.5.0
 
 - [FEATURE] Add support for azure blob storage

diff --git 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.6.1
-version: 3.5.0
+appVersion: 2.7.0
+version: 3.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
@@ -1,6 +1,6 @@
 # loki
 
-![Version: 3.5.0](https://img.shields.io/badge/Version-3.5.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.1](https://img.shields.io/badge/AppVersion-2.6.1-informational?style=flat-square)
+![Version: 3.6.0](https://img.shields.io/badge/Version-3.6.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.7.0](https://img.shields.io/badge/AppVersion-2.7.0-informational?style=flat-square)
 
 Helm chart for Grafana Loki in simple, scalable mode
 

diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml
@@ -272,7 +272,7 @@ enterprise:
   enabled: false
 
   # Default verion of GEL to deploy
-  version: v1.5.2
+  version: v1.6.0
 
   # -- Optional name of the GEL cluster, otherwise will use .Release.Name
   # The cluster name must match what is in your GEL license
@@ -323,8 +323,6 @@ enterprise:
     registry: docker.io
     # -- Docker image repository
     repository: grafana/enterprise-logs
-    # -- Overrides the image tag whose default is the chart's appVersion
-    tag: v1.4.0
     # -- Docker image pull policy
     pullPolicy: IfNotPresent