Merge branch 'main' into fork

hwwi · hwwi · commit 21596f9e2e62 · 2025-11-02T10:55:41.000+09:00
diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml
@@ -54,7 +54,7 @@ jobs:
           python-version: 3.12
 
       - name: Set up chart-testing
-        uses: helm/chart-testing-action@5f16c27cf7a4fa9c776ff73734df3909b2b65127 # v2.1.0
+        uses: helm/chart-testing-action@0d28d3144d3a25ea2cc349d6e59901c4ff469b3b # v2.7.0
 
       - name: Run chart-testing (list-changed)
         id: list-changed
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -49,7 +49,7 @@ jobs:
           CR_SKIP_EXISTING: "true"
 
       - name: Login to GHCR
-        uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
+        uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
diff --git a/.github/workflows/update-helm-repo.yaml b/.github/workflows/update-helm-repo.yaml
@@ -61,7 +61,7 @@ jobs:
           persist-credentials: false
 
       - name: Set up chart-testing
-        uses: helm/chart-testing-action@5f16c27cf7a4fa9c776ff73734df3909b2b65127 # v2.1.0
+        uses: helm/chart-testing-action@0d28d3144d3a25ea2cc349d6e59901c4ff469b3b # v2.7.0
 
       - name: List changed charts
         id: list-changed
@@ -263,7 +263,7 @@ jobs:
           "${CR_TOOL_PATH}/cr" index --config "${CR_CONFIGFILE}" --token "${{ env.AUTHTOKEN }}" --index-path "${CR_INDEX_PATH}" --package-path "${CR_PACKAGE_PATH}" --push
 
       - name: Login to GHCR
-        uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
+        uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
diff --git a/.github/workflows/validate-pr.yaml b/.github/workflows/validate-pr.yaml
@@ -23,7 +23,7 @@ jobs:
           persist-credentials: false
 
       - name: Set up chart-testing
-        uses: helm/chart-testing-action@b0d4458c71155b54fcf33e11dd465dc923550009 # v2.0.1
+        uses: helm/chart-testing-action@0d28d3144d3a25ea2cc349d6e59901c4ff469b3b # v2.7.0
       - name: Validate PR
         run: scripts/validate-pr.sh
         env:
diff --git a/charts/agent-operator/Chart.yaml b/charts/agent-operator/Chart.yaml
@@ -2,7 +2,8 @@ apiVersion: v2
 name: grafana-agent-operator
 description: A Helm chart for Grafana Agent Operator
 type: application
-version: 0.5.1
+version: 0.5.2
+deprecated: true
 appVersion: "0.44.2"
 home: https://grafana.com/docs/agent/v0.44/
 icon: https://raw.githubusercontent.com/grafana/agent/v0.44.2/docs/sources/assets/logo_and_name.png
diff --git a/charts/agent-operator/README.md b/charts/agent-operator/README.md
@@ -1,6 +1,10 @@
+# ⚠️ Deprecation Notice
+
+**This chart is deprecated and will no longer receive updates or support.**
+
 # grafana-agent-operator
 
-![Version: 0.5.1](https://img.shields.io/badge/Version-0.5.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.44.2](https://img.shields.io/badge/AppVersion-0.44.2-informational?style=flat-square)
+![Version: 0.5.2](https://img.shields.io/badge/Version-0.5.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.44.2](https://img.shields.io/badge/AppVersion-0.44.2-informational?style=flat-square)
 
 A Helm chart for Grafana Agent Operator
 
diff --git a/charts/agent-operator/README.md.gotmpl b/charts/agent-operator/README.md.gotmpl
@@ -1,3 +1,7 @@
+# ⚠️ Deprecation Notice
+
+**This chart is deprecated and will no longer receive updates or support.**
+
 {{ template "chart.header" . }}
 
 {{ template "chart.versionBadge" . }}{{ template "chart.typeBadge" . }}{{ template "chart.appVersionBadge" . }}
diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: grafana
-version: 10.1.2
-appVersion: 12.2.0
+version: 10.1.4
+appVersion: 12.2.1
 kubeVersion: "^1.8.0-0"
 description: The leading tool for querying and visualizing time series and metrics.
 home: https://grafana.com
diff --git a/charts/grafana/templates/_pod.tpl b/charts/grafana/templates/_pod.tpl
@@ -397,7 +397,7 @@ containers:
       - name: SCRIPT
         value: {{ quote . }}
       {{- end }}
-      {{- if and (not .Values.env.GF_SECURITY_ADMIN_USER) (not .Values.env.GF_SECURITY_DISABLE_INITIAL_ADMIN_CREATION) }}
+      {{- if and (not .Values.env.GF_SECURITY_ADMIN_USER) (not .Values.env.GF_SECURITY_ADMIN_USER__FILE) (not .Values.env.GF_SECURITY_DISABLE_INITIAL_ADMIN_CREATION) }}
       - name: REQ_USERNAME
         valueFrom:
           secretKeyRef:
@@ -530,7 +530,7 @@ containers:
         value: {{ quote . }}
       {{- end }}
       {{- if not .Values.sidecar.dashboards.skipReload }}
-      {{- if and (not .Values.env.GF_SECURITY_ADMIN_USER) (not .Values.env.GF_SECURITY_DISABLE_INITIAL_ADMIN_CREATION) }}
+      {{- if and (not .Values.env.GF_SECURITY_ADMIN_USER) (not .Values.env.GF_SECURITY_ADMIN_USER__FILE) (not .Values.env.GF_SECURITY_DISABLE_INITIAL_ADMIN_CREATION) }}
       - name: REQ_USERNAME
         valueFrom:
           secretKeyRef:
@@ -657,7 +657,7 @@ containers:
       - name: SCRIPT
         value: {{ quote . }}
       {{- end }}
-      {{- if and (not .Values.env.GF_SECURITY_ADMIN_USER) (not .Values.env.GF_SECURITY_DISABLE_INITIAL_ADMIN_CREATION) }}
+      {{- if and (not .Values.env.GF_SECURITY_ADMIN_USER) (not .Values.env.GF_SECURITY_ADMIN_USER__FILE) (not .Values.env.GF_SECURITY_DISABLE_INITIAL_ADMIN_CREATION) }}
       - name: REQ_USERNAME
         valueFrom:
           secretKeyRef:
@@ -780,7 +780,7 @@ containers:
       - name: SCRIPT
         value: {{ quote . }}
       {{- end }}
-      {{- if and (not .Values.env.GF_SECURITY_ADMIN_USER) (not .Values.env.GF_SECURITY_DISABLE_INITIAL_ADMIN_CREATION) }}
+      {{- if and (not .Values.env.GF_SECURITY_ADMIN_USER) (not .Values.env.GF_SECURITY_ADMIN_USER__FILE) (not .Values.env.GF_SECURITY_DISABLE_INITIAL_ADMIN_CREATION) }}
       - name: REQ_USERNAME
         valueFrom:
           secretKeyRef:
@@ -903,7 +903,7 @@ containers:
       - name: SKIP_TLS_VERIFY
         value: "{{ . }}"
       {{- end }}
-      {{- if and (not .Values.env.GF_SECURITY_ADMIN_USER) (not .Values.env.GF_SECURITY_DISABLE_INITIAL_ADMIN_CREATION) }}
+      {{- if and (not .Values.env.GF_SECURITY_ADMIN_USER) (not .Values.env.GF_SECURITY_ADMIN_USER__FILE) (not .Values.env.GF_SECURITY_DISABLE_INITIAL_ADMIN_CREATION) }}
       - name: REQ_USERNAME
         valueFrom:
           secretKeyRef:
@@ -1141,7 +1141,7 @@ containers:
         valueFrom:
           fieldRef:
             fieldPath: status.podIP
-      {{- if and (not .Values.env.GF_SECURITY_ADMIN_USER) (not .Values.env.GF_SECURITY_DISABLE_INITIAL_ADMIN_CREATION) }}
+      {{- if and (not .Values.env.GF_SECURITY_ADMIN_USER) (not .Values.env.GF_SECURITY_ADMIN_USER__FILE) (not .Values.env.GF_SECURITY_DISABLE_INITIAL_ADMIN_CREATION) }}
       - name: GF_SECURITY_ADMIN_USER
         valueFrom:
           secretKeyRef:
diff --git a/charts/lgtm-distributed/Chart.yaml b/charts/lgtm-distributed/Chart.yaml
@@ -3,8 +3,9 @@ apiVersion: v2
 name: lgtm-distributed
 description: Umbrella chart for a distributed Loki, Grafana, Tempo and Mimir stack
 type: application
-version: 2.1.0
-appVersion: "^7.3.9"
+version: 3.0.1
+appVersion: "^12.1.1"
+deprecated: true
 
 home: https://grafana.com/oss/
 icon: https://artifacthub.io/image/b4fed1a7-6c8f-4945-b99d-096efa3e4116
@@ -35,6 +36,8 @@ annotations:
       url: https://github.com/grafana/mimir
     - name: Tempo
       url: https://github.com/grafana/tempo
+    - name: Oncall
+      url: https://github.com/grafana/oncall
 
 maintainers:
   - name: timberhill
@@ -44,24 +47,24 @@ dependencies:
     alias: grafana
     condition: grafana.enabled
     repository: https://grafana.github.io/helm-charts
-    version: "^7.3.9"
+    version: "^10.0.0"
   - name: loki-distributed
     alias: loki
     condition: loki.enabled
     repository: "https://grafana.github.io/helm-charts"
-    version: "^0.79.0"
+    version: "^0.80.5"
   - name: mimir-distributed
     alias: mimir
     condition: mimir.enabled
     repository: "https://grafana.github.io/helm-charts"
-    version: "^5.3.0"
+    version: "^5.8.0"
   - name: tempo-distributed
     alias: tempo
     condition: tempo.enabled
     repository: "https://grafana.github.io/helm-charts"
-    version: "^1.9.2"
+    version: "^1.48.0"
   - name: oncall
     alias: grafana-oncall
     condition: grafana-oncall.enabled
     repository: "https://grafana.github.io/helm-charts"
-    version: "^1.3.114"
+    version: "^1.16.5"
diff --git a/charts/lgtm-distributed/README.md b/charts/lgtm-distributed/README.md
@@ -1,6 +1,8 @@
 # lgtm-distributed
 
-![Version: 2.1.0](https://img.shields.io/badge/Version-2.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: ^7.3.9](https://img.shields.io/badge/AppVersion-^7.3.9-informational?style=flat-square)
+> **:exclamation: This Helm Chart is deprecated!**
+
+![Version: 3.0.1](https://img.shields.io/badge/Version-3.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: ^12.1.1](https://img.shields.io/badge/AppVersion-^12.1.1-informational?style=flat-square)
 
 Umbrella chart for a distributed Loki, Grafana, Tempo and Mimir stack
 
@@ -24,19 +26,19 @@ Umbrella chart for a distributed Loki, Grafana, Tempo and Mimir stack
 
 | Repository | Name | Version |
 |------------|------|---------|
-| https://grafana.github.io/helm-charts | grafana(grafana) | ^7.3.9 |
-| https://grafana.github.io/helm-charts | loki(loki-distributed) | ^0.79.0 |
-| https://grafana.github.io/helm-charts | mimir(mimir-distributed) | ^5.3.0 |
-| https://grafana.github.io/helm-charts | grafana-oncall(oncall) | ^1.3.114 |
-| https://grafana.github.io/helm-charts | tempo(tempo-distributed) | ^1.9.2 |
+| https://grafana.github.io/helm-charts | grafana(grafana) | ^10.0.0 |
+| https://grafana.github.io/helm-charts | loki(loki-distributed) | ^0.80.5 |
+| https://grafana.github.io/helm-charts | mimir(mimir-distributed) | ^5.8.0 |
+| https://grafana.github.io/helm-charts | grafana-oncall(oncall) | ^1.16.5 |
+| https://grafana.github.io/helm-charts | tempo(tempo-distributed) | ^1.48.0 |
 
 ## Values
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | grafana-oncall.enabled | bool | `false` | Deploy Grafana OnCall if enabled. See [upstream values.yaml](https://github.com/grafana/oncall/blob/dev/helm/oncall/values.yaml) for full values reference. |
-| grafana.datasources | object | `{"datasources.yaml":{"apiVersion":1,"datasources":[{"isDefault":false,"name":"Loki","type":"loki","uid":"loki","url":"http://{{ .Release.Name }}-loki-gateway"},{"isDefault":true,"name":"Mimir","type":"prometheus","uid":"prom","url":"http://{{ .Release.Name }}-mimir-nginx/prometheus"},{"isDefault":false,"jsonData":{"lokiSearch":{"datasourceUid":"loki"},"serviceMap":{"datasourceUid":"prom"},"tracesToLogsV2":{"datasourceUid":"loki"},"tracesToMetrics":{"datasourceUid":"prom"}},"name":"Tempo","type":"tempo","uid":"tempo","url":"http://{{ .Release.Name }}-tempo-query-frontend:3100"}]}}` | Grafana data sources config. Connects to all three by default |
-| grafana.datasources."datasources.yaml".datasources | list | `[{"isDefault":false,"name":"Loki","type":"loki","uid":"loki","url":"http://{{ .Release.Name }}-loki-gateway"},{"isDefault":true,"name":"Mimir","type":"prometheus","uid":"prom","url":"http://{{ .Release.Name }}-mimir-nginx/prometheus"},{"isDefault":false,"jsonData":{"lokiSearch":{"datasourceUid":"loki"},"serviceMap":{"datasourceUid":"prom"},"tracesToLogsV2":{"datasourceUid":"loki"},"tracesToMetrics":{"datasourceUid":"prom"}},"name":"Tempo","type":"tempo","uid":"tempo","url":"http://{{ .Release.Name }}-tempo-query-frontend:3100"}]` | Datasources linked to the Grafana instance. Override if you disable any components. |
+| grafana.datasources | object | `{"datasources.yaml":{"apiVersion":1,"datasources":[{"isDefault":false,"name":"Loki","type":"loki","uid":"loki","url":"http://{{ .Release.Name }}-loki-gateway"},{"isDefault":true,"name":"Mimir","type":"prometheus","uid":"prom","url":"http://{{ .Release.Name }}-mimir-nginx/prometheus"},{"isDefault":false,"jsonData":{"lokiSearch":{"datasourceUid":"loki"},"serviceMap":{"datasourceUid":"prom"},"tracesToLogsV2":{"datasourceUid":"loki"},"tracesToMetrics":{"datasourceUid":"prom"}},"name":"Tempo","type":"tempo","uid":"tempo","url":"http://{{ .Release.Name }}-tempo-query-frontend:3200"}]}}` | Grafana data sources config. Connects to all three by default |
+| grafana.datasources."datasources.yaml".datasources | list | `[{"isDefault":false,"name":"Loki","type":"loki","uid":"loki","url":"http://{{ .Release.Name }}-loki-gateway"},{"isDefault":true,"name":"Mimir","type":"prometheus","uid":"prom","url":"http://{{ .Release.Name }}-mimir-nginx/prometheus"},{"isDefault":false,"jsonData":{"lokiSearch":{"datasourceUid":"loki"},"serviceMap":{"datasourceUid":"prom"},"tracesToLogsV2":{"datasourceUid":"loki"},"tracesToMetrics":{"datasourceUid":"prom"}},"name":"Tempo","type":"tempo","uid":"tempo","url":"http://{{ .Release.Name }}-tempo-query-frontend:3200"}]` | Datasources linked to the Grafana instance. Override if you disable any components. |
 | grafana.enabled | bool | `true` | Deploy Grafana if enabled. See [upstream readme](https://github.com/grafana/helm-charts/tree/main/charts/grafana#configuration) for full values reference. |
 | loki.enabled | bool | `true` | Deploy Loki if enabled. See [upstream readme](https://github.com/grafana/helm-charts/tree/main/charts/loki-distributed#values) for full values reference. |
 | mimir | object | `{"alertmanager":{"resources":{"requests":{"cpu":"20m"}}},"compactor":{"resources":{"requests":{"cpu":"20m"}}},"distributor":{"resources":{"requests":{"cpu":"20m"}}},"enabled":true,"ingester":{"replicas":2,"resources":{"requests":{"cpu":"20m"}},"zoneAwareReplication":{"enabled":false}},"minio":{"resources":{"requests":{"cpu":"20m"}}},"overrides_exporter":{"resources":{"requests":{"cpu":"20m"}}},"querier":{"replicas":1,"resources":{"requests":{"cpu":"20m"}}},"query_frontend":{"resources":{"requests":{"cpu":"20m"}}},"query_scheduler":{"replicas":1,"resources":{"requests":{"cpu":"20m"}}},"rollout_operator":{"resources":{"requests":{"cpu":"20m"}}},"ruler":{"resources":{"requests":{"cpu":"20m"}}},"store_gateway":{"resources":{"requests":{"cpu":"20m"}},"zoneAwareReplication":{"enabled":false}}}` | Mimir chart values. Resources are set to a minimum by default. |
diff --git a/charts/lgtm-distributed/values.yaml b/charts/lgtm-distributed/values.yaml
@@ -25,7 +25,7 @@ grafana:
         - name: Tempo
           uid: tempo
           type: tempo
-          url: http://{{ .Release.Name }}-tempo-query-frontend:3100
+          url: http://{{ .Release.Name }}-tempo-query-frontend:3200
           isDefault: false
           jsonData:
             tracesToLogsV2:
diff --git a/charts/loki-canary/Chart.yaml b/charts/loki-canary/Chart.yaml
@@ -2,8 +2,9 @@ apiVersion: v2
 name: loki-canary
 description: Helm chart for Grafana Loki Canary
 type: application
+deprecated: true
 appVersion: 2.9.1
-version: 0.14.0
+version: 0.14.1
 home: https://github.com/grafana/helm-charts
 sources:
   - https://github.com/grafana/loki
diff --git a/charts/loki-canary/README.md b/charts/loki-canary/README.md
@@ -1,6 +1,13 @@
+# Deprecation Notice
+
+**This chart is deprecated and will no longer receive updates or support.**
+
+Please consider using the [loki](https://github.com/grafana/loki/tree/main/production/helm/loki)
+chart instead, which provides comprehensive features and ongoing maintenance.
+
 # loki-canary
 
-![Version: 0.14.0](https://img.shields.io/badge/Version-0.14.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.1](https://img.shields.io/badge/AppVersion-2.9.1-informational?style=flat-square)
+![Version: 0.14.1](https://img.shields.io/badge/Version-0.14.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.1](https://img.shields.io/badge/AppVersion-2.9.1-informational?style=flat-square)
 
 Helm chart for Grafana Loki Canary
 
diff --git a/charts/loki-canary/README.md.gotmpl b/charts/loki-canary/README.md.gotmpl
@@ -1,3 +1,10 @@
+# Deprecation Notice
+
+**This chart is deprecated and will no longer receive updates or support.**
+
+Please consider using the [loki](https://github.com/grafana/loki/tree/main/production/helm/loki)
+chart instead, which provides comprehensive features and ongoing maintenance.
+
 {{ template "chart.header" . }}
 
 {{ template "chart.versionBadge" . }}{{ template "chart.typeBadge" . }}{{ template "chart.appVersionBadge" . }}
diff --git a/charts/loki-distributed/Chart.yaml b/charts/loki-distributed/Chart.yaml
@@ -1,9 +1,10 @@
 apiVersion: v2
+deprecated: true
 name: loki-distributed
 description: Helm chart for Grafana Loki in microservices mode
 type: application
 appVersion: 2.9.13
-version: 0.80.5
+version: 0.80.6
 home: https://grafana.github.io/helm-charts
 sources:
   - https://github.com/grafana/loki
diff --git a/charts/loki-distributed/README.md b/charts/loki-distributed/README.md
@@ -1,6 +1,13 @@
+# Deprecation Notice
+
+**This chart is deprecated and will no longer receive updates or support.**
+
+Please consider using the [loki](https://github.com/grafana/loki/tree/main/production/helm/loki)
+chart instead, which provides comprehensive features and ongoing maintenance.
+
 # loki-distributed
 
-![Version: 0.80.5](https://img.shields.io/badge/Version-0.80.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.13](https://img.shields.io/badge/AppVersion-2.9.13-informational?style=flat-square)
+![Version: 0.80.6](https://img.shields.io/badge/Version-0.80.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.13](https://img.shields.io/badge/AppVersion-2.9.13-informational?style=flat-square)
 
 Helm chart for Grafana Loki in microservices mode
 
diff --git a/charts/loki-distributed/README.md.gotmpl b/charts/loki-distributed/README.md.gotmpl
@@ -1,3 +1,10 @@
+# Deprecation Notice
+
+**This chart is deprecated and will no longer receive updates or support.**
+
+Please consider using the [loki](https://github.com/grafana/loki/tree/main/production/helm/loki)
+chart instead, which provides comprehensive features and ongoing maintenance.
+
 {{ template "chart.header" . }}
 
 {{ template "chart.versionBadge" . }}{{ template "chart.typeBadge" . }}{{ template "chart.appVersionBadge" . }}
diff --git a/charts/loki-stack/Chart.yaml b/charts/loki-stack/Chart.yaml
@@ -1,6 +1,7 @@
 apiVersion: "v1"
 name: loki-stack
-version: 2.10.2
+deprecated: true
+version: 2.10.3
 appVersion: v2.9.3
 kubeVersion: "^1.10.0-0"
 description: "Loki: like Prometheus, but for logs."
diff --git a/charts/loki-stack/README.md b/charts/loki-stack/README.md
@@ -1,3 +1,10 @@
+# Deprecation Notice
+
+**This chart is deprecated and will no longer receive updates or support.**
+
+Please consider using the [loki](https://github.com/grafana/loki/tree/main/production/helm/loki)
+chart instead, which provides comprehensive features and ongoing maintenance.
+
 # Loki-Stack Helm Chart
 
 This `loki-stack` Helm chart is a community maintained chart.
@@ -69,4 +76,4 @@ Provide support configurable datasource urls [#1374](https://github.com/grafana/
 Update promtail dependency to ^6.2.3 [#1692](https://github.com/grafana/helm-charts/pull/1692)
 
 ### Version >=2.6.0
-Bumped grafana 8.1.6->8.3.4 [#1013](https://github.com/grafana/helm-charts/pull/1013)
+Bumped grafana 8.1.6->8.3.4 [#1013](https://github.com/grafana/helm-charts/pull/1013)
diff --git a/charts/promtail/Chart.yaml b/charts/promtail/Chart.yaml
@@ -1,9 +1,10 @@
 apiVersion: v2
 name: promtail
+deprecated: true
 description: Promtail is an agent which ships the contents of local logs to a Loki instance
 type: application
 appVersion: 3.5.1
-version: 6.17.0
+version: 6.17.1
 home: https://grafana.com/loki
 sources:
   - https://github.com/grafana/loki
diff --git a/charts/promtail/README.md b/charts/promtail/README.md
@@ -1,6 +1,10 @@
+# Deprecation Notice
+
+**This promtail and this chart is deprecated and will no longer receive updates or support.**
+
 # promtail
 
-![Version: 6.17.0](https://img.shields.io/badge/Version-6.17.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.5.1](https://img.shields.io/badge/AppVersion-3.5.1-informational?style=flat-square)
+![Version: 6.17.1](https://img.shields.io/badge/Version-6.17.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.5.1](https://img.shields.io/badge/AppVersion-3.5.1-informational?style=flat-square)
 
 Promtail is an agent which ships the contents of local logs to a Loki instance
 
diff --git a/charts/promtail/README.md.gotmpl b/charts/promtail/README.md.gotmpl
@@ -1,3 +1,7 @@
+# Deprecation Notice
+
+**This promtail and this chart is deprecated and will no longer receive updates or support.**
+
 {{ template "chart.header" . }}
 
 {{ template "chart.versionBadge" . }}{{ template "chart.typeBadge" . }}{{ template "chart.appVersionBadge" . }}
diff --git a/charts/rollout-operator/Chart.yaml b/charts/rollout-operator/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: rollout-operator
 description: "Grafana rollout-operator"
 type: application
-version: 0.35.1
-appVersion: v0.31.1
+version: 0.37.0
+appVersion: v0.32.0
 home: https://github.com/grafana/rollout-operator
 kubeVersion: ^1.10.0-0
diff --git a/charts/rollout-operator/README.md b/charts/rollout-operator/README.md
diff --git a/charts/rollout-operator/templates/_helpers.tpl b/charts/rollout-operator/templates/_helpers.tpl
diff --git a/charts/rollout-operator/templates/deployment.yaml b/charts/rollout-operator/templates/deployment.yaml
diff --git a/charts/rollout-operator/values.yaml b/charts/rollout-operator/values.yaml
diff --git a/charts/tempo-distributed/Chart.lock b/charts/tempo-distributed/Chart.lock
diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml
diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md
diff --git a/charts/tempo-distributed/templates/ingester/_helpers-ingester.tpl b/charts/tempo-distributed/templates/ingester/_helpers-ingester.tpl
diff --git a/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml b/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml
diff --git a/charts/tempo-distributed/templates/query-frontend/servicemonitor-jaeger-query.yaml b/charts/tempo-distributed/templates/query-frontend/servicemonitor-jaeger-query.yaml
diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml
