Resolve conflicts

Signed-off-by: Sheikh-Abubaker <[email protected]>

Author: Sheikh-Abubaker

charts/tempo-distributed/Chart.lock

@@ -1,12 +1,12 @@
 dependencies:
 - name: minio
   repository: https://charts.min.io/
-  version: 4.0.12
+  version: 4.1.0
 - name: grafana-agent-operator
   repository: https://grafana.github.io/helm-charts
   version: 0.5.1
 - name: rollout-operator
   repository: https://grafana.github.io/helm-charts
   version: 0.35.1
-digest: sha256:2f713e57f880df47e5f503e14302f9d9f9a93dd6ad4e0441d23e6d888f633fe5
-generated: "2025-10-27T15:29:03.244431871Z"
+digest: sha256:809a6a0493d8e8300d45784276160a2926efa12a64fbc7008bd8dea047151201
+generated: "2025-11-06T21:25:36.847803273Z"

charts/tempo-distributed/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: tempo-distributed
 description: Grafana Tempo in MicroService mode
 type: application
-version: 1.53.3
+version: 1.54.1
 appVersion: 2.9.0
 engine: gotpl
 home: https://grafana.com/docs/tempo/latest/
@@ -27,7 +27,7 @@ maintainers:
 dependencies:
   - name: minio
     alias: minio
-    version: 4.0.12
+    version: 4.1.0
     repository: https://charts.min.io/
     condition: minio.enabled
   - name: grafana-agent-operator

charts/tempo-distributed/README.md

@@ -1,6 +1,6 @@
 # tempo-distributed
 
-![Version: 1.53.3](https://img.shields.io/badge/Version-1.53.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.0](https://img.shields.io/badge/AppVersion-2.9.0-informational?style=flat-square)
+![Version: 1.54.1](https://img.shields.io/badge/Version-1.54.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.0](https://img.shields.io/badge/AppVersion-2.9.0-informational?style=flat-square)
 
 Grafana Tempo in MicroService mode
 
@@ -12,7 +12,7 @@ Grafana Tempo in MicroService mode
 
 | Repository | Name | Version |
 |------------|------|---------|
-| https://charts.min.io/ | minio(minio) | 4.0.12 |
+| https://charts.min.io/ | minio(minio) | 4.1.0 |
 | https://grafana.github.io/helm-charts | grafana-agent-operator(grafana-agent-operator) | 0.5.1 |
 | https://grafana.github.io/helm-charts | rollout_operator(rollout-operator) | 0.35.1 |