Skip to content

Commit bacd54d

Browse files
Merge branch 'main' into tempo_add_appprotocol
Signed-off-by: Sheikh-Abubaker <sheikhabubaker761@gmail.com>
2 parents fc177c2 + 76d7026 commit bacd54d

File tree

77 files changed

+374
-945
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+374
-945
lines changed

.github/CODEOWNERS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
# Unless a later match takes precedence, they will be requested for review when someone opens a pull request.
77
* @grafana/helm-charts-admins
88

9-
/charts/grafana/ @jkroepke @maorfr @torstenwalter @Xtigyro @zanhsieh
9+
/charts/grafana/ @jkroepke @maorfr @torstenwalter @Xtigyro @zanhsieh @QuentinBisson
1010
/charts/loki-distributed/ @grafana/loki-squad @unguiculus @Whyeasy
1111
/charts/loki-canary/ @grafana/loki-squad @unguiculus @Whyeasy
1212
/charts/promtail/ @grafana/loki-squad @unguiculus @Whyeasy
1313
/charts/tempo/ @grafana/tempo @Sheikh-Abubaker @dgzlopes @swartz-k @BitProcessor @faustodavid
14-
/charts/tempo-distributed/ @grafana/tempo @Sheikh-Abubaker @swartz-k @BitProcessor @faustodavid
14+
/charts/tempo-distributed/ @grafana/tempo @Sheikh-Abubaker @swartz-k @BitProcessor @faustodavid @QuentinBisson
1515
/charts/enterprise-metrics/ @grafana/mimir-maintainers
1616
/charts/rollout-operator/ @grafana/mimir-maintainers
1717
/charts/enterprise-logs/ @grafana/loki-squad
1818
/charts/tempo-vulture/ @grafana/tempo @Whyeasy @dgzlopes
1919
/charts/synthetic-monitoring-agent/ @torstenwalter @zanhsieh
2020
/charts/agent-operator/ @grafana/grafana-agent-maintainers
2121
/charts/cloudcost-exporter/ @grafana/platform-monitoring
22-
/charts/grafana-mcp/ @jkroepke @Sheikh-Abubaker @KyriosGN0
22+
/charts/grafana-mcp/ @jkroepke @Sheikh-Abubaker @KyriosGN0 @QuentinBisson
2323
/charts/pdc-agent/ @grafana/grafana-datasources-core-services

.github/workflows/lint-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
python-version: 3.12
5555

5656
- name: Set up chart-testing
57-
uses: helm/chart-testing-action@5f16c27cf7a4fa9c776ff73734df3909b2b65127 # v2.1.0
57+
uses: helm/chart-testing-action@0d28d3144d3a25ea2cc349d6e59901c4ff469b3b # v2.7.0
5858

5959
- name: Run chart-testing (list-changed)
6060
id: list-changed

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
CR_SKIP_EXISTING: "true"
5050

5151
- name: Login to GHCR
52-
uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
52+
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
5353
with:
5454
registry: ghcr.io
5555
username: ${{ github.actor }}

.github/workflows/update-helm-repo.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
persist-credentials: false
6262

6363
- name: Set up chart-testing
64-
uses: helm/chart-testing-action@5f16c27cf7a4fa9c776ff73734df3909b2b65127 # v2.1.0
64+
uses: helm/chart-testing-action@0d28d3144d3a25ea2cc349d6e59901c4ff469b3b # v2.7.0
6565

6666
- name: List changed charts
6767
id: list-changed
@@ -263,7 +263,7 @@ jobs:
263263
"${CR_TOOL_PATH}/cr" index --config "${CR_CONFIGFILE}" --token "${{ env.AUTHTOKEN }}" --index-path "${CR_INDEX_PATH}" --package-path "${CR_PACKAGE_PATH}" --push
264264
265265
- name: Login to GHCR
266-
uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
266+
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
267267
with:
268268
registry: ghcr.io
269269
username: ${{ github.actor }}

.github/workflows/validate-pr.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
persist-credentials: false
2424

2525
- name: Set up chart-testing
26-
uses: helm/chart-testing-action@b0d4458c71155b54fcf33e11dd465dc923550009 # v2.0.1
26+
uses: helm/chart-testing-action@0d28d3144d3a25ea2cc349d6e59901c4ff469b3b # v2.7.0
2727
- name: Validate PR
2828
run: scripts/validate-pr.sh
2929
env:

charts/agent-operator/Chart.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ apiVersion: v2
22
name: grafana-agent-operator
33
description: A Helm chart for Grafana Agent Operator
44
type: application
5-
version: 0.5.1
5+
version: 0.5.2
6+
deprecated: true
67
appVersion: "0.44.2"
78
home: https://grafana.com/docs/agent/v0.44/
89
icon: https://raw.githubusercontent.com/grafana/agent/v0.44.2/docs/sources/assets/logo_and_name.png

charts/agent-operator/README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1+
# ⚠️ Deprecation Notice
2+
3+
**This chart is deprecated and will no longer receive updates or support.**
4+
15
# grafana-agent-operator
26

3-
![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)
7+
![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)
48

59
A Helm chart for Grafana Agent Operator
610

charts/agent-operator/README.md.gotmpl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# ⚠️ Deprecation Notice
2+
3+
**This chart is deprecated and will no longer receive updates or support.**
4+
15
{{ template "chart.header" . }}
26

37
{{ template "chart.versionBadge" . }}{{ template "chart.typeBadge" . }}{{ template "chart.appVersionBadge" . }}

charts/enterprise-logs-simple/Chart.lock

Lines changed: 0 additions & 9 deletions
This file was deleted.

charts/enterprise-logs-simple/Chart.yaml

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)