Merge branch 'main' into fix-ciliumnetworkpolicy

Signed-off-by: Kristjan Koppel <[email protected]>

Author: kkoppel

docs/sources/setup/install/helm/reference.md

@@ -3964,7 +3964,7 @@ null
     "pullPolicy": "IfNotPresent",
     "registry": "docker.io",
     "repository": "grafana/enterprise-logs",
-    "tag": "3.6.1"
+    "tag": "3.6.3"
   },
   "license": {
     "contents": "NOTAVALIDLICENSE"
@@ -4111,7 +4111,7 @@ null
 			<td>string</td>
 			<td>Docker image tag</td>
 			<td><pre lang="json">
-"3.6.1"
+"3.6.3"
 </pre>
 </td>
 		</tr>
@@ -7104,7 +7104,7 @@ null
 			<td>string</td>
 			<td>Overrides the image tag whose default is the chart's appVersion</td>
 			<td><pre lang="json">
-"3.6.2"
+"3.6.3"
 </pre>
 </td>
 		</tr>

production/helm/loki/CHANGELOG.md

@@ -15,6 +15,11 @@ Entries should include a reference to the pull request that introduced the chang
 
 - [BUGFIX] Fix incorrect syntax in loki-egress-dns CiliumNetworkPolicy manifest [#20221](https://github.com/grafana/loki/pull/20221)
 
+## 6.49.0
+
+- [CHANGE] Updated version of Grafana Loki to 3.6.3
+- [CHANGE] Updated version of Rollout Operator to 0.38.2
+
 ## 6.48.0
 
 - [CHANGE] Changed version of Grafana Loki to 3.6.2

production/helm/loki/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: loki
 description: Helm chart for Grafana Loki and Grafana Enterprise Logs supporting monolithic, simple scalable, and microservices modes.
 type: application
-appVersion: 3.6.2
-version: 6.48.0
+appVersion: 3.6.3
+version: 6.49.0
 home: https://grafana.github.io/helm-charts
 sources:
   - https://github.com/grafana/loki

production/helm/loki/README.md

@@ -1,6 +1,6 @@
 # loki
 
-![Version: 6.48.0](https://img.shields.io/badge/Version-6.48.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.6.2](https://img.shields.io/badge/AppVersion-3.6.2-informational?style=flat-square)
+![Version: 6.49.0](https://img.shields.io/badge/Version-6.49.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.6.3](https://img.shields.io/badge/AppVersion-3.6.3-informational?style=flat-square)
 
 Helm chart for Grafana Loki and Grafana Enterprise Logs supporting monolithic, simple scalable, and microservices modes.
 

production/helm/loki/values.yaml

@@ -86,7 +86,7 @@ loki:
     # -- Docker image repository
     repository: grafana/loki
     # -- Overrides the image tag whose default is the chart's appVersion
-    tag: 3.6.2
+    tag: 3.6.3
     # -- Overrides the image tag with an image digest
     digest: null
     # -- Docker image pull policy
@@ -672,7 +672,7 @@ enterprise:
     # -- Docker image repository
     repository: grafana/enterprise-logs
     # -- Docker image tag
-    tag: 3.6.1
+    tag: 3.6.3
     # -- Overrides the image tag with an image digest
     digest: null
     # -- Docker image pull policy