Merge branch 'main' into mburgos/Adding_commonLabels_to_tempo-distributed

Signed-off-by: Martin Burgos <[email protected]>

Author: tincho-burgos

.github/CODEOWNERS

@@ -6,18 +6,18 @@
 # Unless a later match takes precedence, they will be requested for review when someone opens a pull request.
 * @grafana/helm-charts-admins
 
-/charts/grafana/ @jkroepke @maorfr @torstenwalter @Xtigyro @zanhsieh
+/charts/grafana/ @jkroepke @maorfr @torstenwalter @Xtigyro @zanhsieh @QuentinBisson
 /charts/loki-distributed/ @grafana/loki-squad @unguiculus @Whyeasy
 /charts/loki-canary/ @grafana/loki-squad @unguiculus @Whyeasy
 /charts/promtail/ @grafana/loki-squad @unguiculus @Whyeasy
 /charts/tempo/ @grafana/tempo @Sheikh-Abubaker @dgzlopes @swartz-k @BitProcessor @faustodavid
-/charts/tempo-distributed/ @grafana/tempo @Sheikh-Abubaker @swartz-k @BitProcessor @faustodavid
+/charts/tempo-distributed/ @grafana/tempo @Sheikh-Abubaker @swartz-k @BitProcessor @faustodavid @QuentinBisson
 /charts/enterprise-metrics/ @grafana/mimir-maintainers
 /charts/rollout-operator/ @grafana/mimir-maintainers
 /charts/enterprise-logs/ @grafana/loki-squad
 /charts/tempo-vulture/ @grafana/tempo @Whyeasy @dgzlopes
 /charts/synthetic-monitoring-agent/ @torstenwalter @zanhsieh
 /charts/agent-operator/ @grafana/grafana-agent-maintainers
 /charts/cloudcost-exporter/ @grafana/platform-monitoring
-/charts/grafana-mcp/ @jkroepke @Sheikh-Abubaker @KyriosGN0
+/charts/grafana-mcp/ @jkroepke @Sheikh-Abubaker @KyriosGN0 @QuentinBisson
 /charts/pdc-agent/ @grafana/grafana-datasources-core-services

charts/grafana-mcp/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: grafana-mcp
-version: 0.1.3
-appVersion: latest
+version: 0.2.0
+appVersion: 0.7.6
 kubeVersion: "^1.8.0-0"
 description: MCP server for Grafana.
 home: https://grafana.com
@@ -23,6 +23,8 @@ maintainers:
     email: [email protected]
   - name: KyriosGN0
     email: [email protected]
+  - name: QuentinBisson
+    email: [email protected]
 type: application
 keywords:
   - monitoring

charts/grafana-mcp/README.md

@@ -37,6 +37,14 @@ helm delete my-release
 
 The command removes all the Kubernetes components associated with the chart and deletes the release.
 
+## Upgrading
+
+A major chart version change indicates that there is an incompatible breaking change needing manual actions.
+
+### From Chart versions < 0.1.3
+If you are upgrading from a chart version older than 0.1.3, we have changed the image to be pulled from
+`grafana/mcp-grafana` instead of `mcp/grafana` and the default tag to be the chart's appVersion instead of `latest`.
+
 ## Values
 
 | Key | Type | Default | Description |
@@ -63,11 +71,11 @@ The command removes all the Kubernetes components associated with the chart and
 | grafana.apiKeySecret.name | string | `""` | Name of the secret containing the API key |
 | grafana.url | string | `"http://grafana:3000"` | Grafana URL (should point to the main Grafana service) |
 | hostAliases | list | `[]` | Host aliases |
-| image | object | `{"pullPolicy":"IfNotPresent","registry":"docker.io","repository":"mcp/grafana","tag":"latest"}` | Image configuration |
+| image | object | `{"pullPolicy":"IfNotPresent","registry":"docker.io","repository":"grafana/mcp-grafana","tag":""}` | Image configuration |
 | image.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
 | image.registry | string | `"docker.io"` | The Docker registry |
-| image.repository | string | `"mcp/grafana"` | The Docker repository |
-| image.tag | string | `"latest"` | Image tag |
+| image.repository | string | `"grafana/mcp-grafana"` | The Docker repository |
+| image.tag | string | `""` | Image tag |
 | imagePullSecrets | list | `[]` | Image pull secrets |
 | ingress | object | `{"annotations":{},"className":"","enabled":false,"hosts":[{"host":"mcp-grafana.local","paths":[{"path":"/","pathType":"Prefix"}]}],"labels":{},"tls":[]}` | Ingress configuration |
 | ingress.annotations | object | `{}` | Ingress annotations |

charts/grafana-mcp/README.md.gotmpl

@@ -33,4 +33,12 @@ helm delete my-release
 
 The command removes all the Kubernetes components associated with the chart and deletes the release.
 
+## Upgrading
+
+A major chart version change indicates that there is an incompatible breaking change needing manual actions.
+
+### From Chart versions < 0.1.3
+If you are upgrading from a chart version older than 0.1.3, we have changed the image to be pulled from
+`grafana/mcp-grafana` instead of `mcp/grafana` and the default tag to be the chart's appVersion instead of `latest`.
+
 {{ template "chart.valuesSection" . }}

charts/grafana-mcp/templates/deployment.yaml

@@ -73,9 +73,9 @@ spec:
         - name: mcp-grafana
           {{- $registry := .Values.image.registry -}}
           {{- if $registry }}
-          image: "{{ $registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ $registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           {{- else }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           {{- end }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           {{- with .Values.readinessProbe }}

charts/grafana-mcp/values.yaml

@@ -13,9 +13,9 @@ image:
   # -- The Docker registry
   registry: docker.io
   # -- The Docker repository
-  repository: mcp/grafana
+  repository: grafana/mcp-grafana
   # -- Image tag
-  tag: "latest"
+  tag: ""
   # -- Image pull policy
   pullPolicy: IfNotPresent
 

charts/grafana/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: grafana
-version: 10.0.0
-appVersion: 12.1.1
+version: 10.1.2
+appVersion: 12.2.0
 kubeVersion: "^1.8.0-0"
 description: The leading tool for querying and visualizing time series and metrics.
 home: https://grafana.com
@@ -29,6 +29,8 @@ maintainers:
     email: [email protected]
   - name: jkroepke
     email: [email protected]
+  - name: QuentinBisson
+    email: [email protected]
 type: application
 keywords:
   - monitoring

charts/grafana/templates/secret-env.yaml

@@ -6,6 +6,7 @@ metadata:
   namespace: {{ include "grafana.namespace" . }}
   labels:
     {{- include "grafana.labels" . | nindent 4 }}
+    app.kubernetes.io/component: env-secret
 type: Opaque
 data:
 {{- range $key, $val := .Values.envRenderSecret }}

charts/grafana/templates/secret.yaml

@@ -6,6 +6,7 @@ metadata:
   namespace: {{ include "grafana.namespace" . }}
   labels:
     {{- include "grafana.labels" . | nindent 4 }}
+    app.kubernetes.io/component: admin-secret
   {{- with .Values.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}

charts/rollout-operator/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: rollout-operator
 description: "Grafana rollout-operator"
 type: application
-version: 0.33.1
-appVersion: v0.29.0
+version: 0.35.1
+appVersion: v0.31.1
 home: https://github.com/grafana/rollout-operator
 kubeVersion: ^1.10.0-0