Merge branch 'main' into tempo_distributed_configure_empty_tenant_deletion_enabled

Signed-off-by: jacobcrawford <[email protected]>

Author: jacobcrawford

charts/cloudcost-exporter/Chart.yaml

@@ -5,10 +5,10 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 1.0.5
+version: 1.0.6
 
 # This is the version of cloudcost-exporter to be deployed, which should be incremented
 # with each release.
-appVersion: "0.9.0"
+appVersion: "0.10.0"
 
 home: https://github.com/grafana/cloudcost-exporter

charts/cloudcost-exporter/README.md

@@ -2,7 +2,7 @@
 
 Cloud Cost Exporter exports cloud provider agnostic cost metrics to Prometheus.
 
-![Version: 1.0.5](https://img.shields.io/badge/Version-1.0.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.9.0](https://img.shields.io/badge/AppVersion-0.9.0-informational?style=flat-square)
+![Version: 1.0.6](https://img.shields.io/badge/Version-1.0.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.10.0](https://img.shields.io/badge/AppVersion-0.10.0-informational?style=flat-square)
 
 ## Installing the Chart
 

charts/grafana-mcp/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: grafana-mcp
-version: 0.1.2
+version: 0.1.3
 appVersion: latest
 kubeVersion: "^1.8.0-0"
 description: MCP server for Grafana.

charts/grafana-mcp/templates/deployment.yaml

@@ -101,7 +101,8 @@ spec:
           env:
             - name: GRAFANA_URL
               value: {{ .Values.grafana.url | quote }}
-            - name: GRAFANA_API_KEY
+            {{- if or .Values.grafana.apiKey .Values.grafana.apiKeySecret.name }}
+            - name: GRAFANA_SERVICE_ACCOUNT_TOKEN
               valueFrom:
                 secretKeyRef:
                   {{- if .Values.grafana.apiKey }}
@@ -111,6 +112,7 @@ spec:
                   name: {{ .Values.grafana.apiKeySecret.name }}
                   key: {{ .Values.grafana.apiKeySecret.key }}
                   {{- end }}
+            {{- end }}
             {{- range $key, $value := .Values.env }}
             - name: {{ $key | quote }}
               value: {{ $value | quote }}

charts/grafana/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: grafana
-version: 9.3.6
-appVersion: 12.1.0
+version: 10.0.0
+appVersion: 12.1.1
 kubeVersion: "^1.8.0-0"
 description: The leading tool for querying and visualizing time series and metrics.
 home: https://grafana.com

charts/grafana/README.md

@@ -53,6 +53,16 @@ to `global.imageRegistry`. If you were not previously setting `global.image.regi
 is required on upgrade. If you were previously setting `global.image.registry`, you will
 need to instead set `global.imageRegistry`.
 
+### To 10.0.0
+
+Static alerting resources now support Helm templating. This means that alerting resources loaded from external files (`alerting.*.files`) are now processed by the Helm template engine.
+
+If you already use template expressions intended for Alertmanager (for example, `{{ $labels.instance }}`), these must now be escaped to avoid unintended Helm evaluation. To escape them, wrap the braces with an extra layer like this:
+
+`{{ "{{" }} $labels.instance {{ "}}" }}`
+
+This ensures the expressions are preserved for Alertmanager instead of being rendered by Helm.
+
 ## Configuration
 
 | Parameter                                 | Description                                   | Default                                                 |
@@ -168,7 +178,7 @@ need to instead set `global.imageRegistry`.
 | `lifecycleHooks`                          | Lifecycle hooks for podStart and preStop [Example](https://kubernetes.io/docs/tasks/configure-pod-container/attach-handler-lifecycle-event/#define-poststart-and-prestop-handlers)     | `{}`                                                    |
 | `sidecar.image.registry`                  | Sidecar image registry                        | `quay.io`                          |
 | `sidecar.image.repository`                | Sidecar image repository                      | `kiwigrid/k8s-sidecar`                          |
-| `sidecar.image.tag`                       | Sidecar image tag                             | `1.30.0`                                                |
+| `sidecar.image.tag`                       | Sidecar image tag                             | `1.30.10`                                                |
 | `sidecar.image.sha`                       | Sidecar image sha (optional)                  | `""`                                                    |
 | `sidecar.imagePullPolicy`                 | Sidecar image pull policy                     | `IfNotPresent`                                          |
 | `sidecar.resources`                       | Sidecar resources                             | `{}`                                                    |
@@ -681,7 +691,7 @@ The two possibilities for static alerting resource provisioning are:
 * The format of the files is defined in the [Grafana documentation](https://grafana.com/docs/grafana/next/alerting/set-up/provision-alerting-resources/file-provisioning/) on file provisioning.
 * The chart supports importing YAML and JSON files.
 * The filename must be unique, otherwise one volume mount will overwrite the other.
-* In case of inlining, double curly braces that arise from the Grafana configuration format and are not intended as templates for the chart must be escaped.
+* Alerting configurations support Helm templating. Double curly braces that arise from the Grafana configuration format and are not intended as templates for the chart must be escaped.
 * The number of total files under `alerting:` is not limited. Each file will end up as a volume mount in the corresponding provisioning folder of the deployed Grafana instance.
 * The file size for each import is limited by what the function `.Files.Get` can handle, which suffices for most cases.
 

charts/grafana/templates/_config.tpl

@@ -55,8 +55,8 @@ grafana.ini: |
 
 {{- range $key, $value := .Values.alerting }}
 {{- if (hasKey $value "file") }}
-{{ $key }}:
-{{- toYaml ( $files.Get $value.file ) | nindent 2 }}
+{{ $key }}: |
+{{- tpl ($files.Get $value.file) $root | nindent 2 }}
 {{- else if (or (hasKey $value "secret") (hasKey $value "secretFile"))}}
 {{/*  will be stored inside secret generated by "configSecret.yaml"*/}}
 {{- else }}

charts/grafana/templates/_pod.tpl

@@ -1196,6 +1196,13 @@ containers:
         value: {{ (get .Values "grafana.ini").paths.plugins }}
       - name: GF_PATHS_PROVISIONING
         value: {{ (get .Values "grafana.ini").paths.provisioning }}
+      {{- if (.Values.resources.limits).memory }}
+      - name: GOMEMLIMIT
+        valueFrom:
+          resourceFieldRef:
+            divisor: "1"
+            resource: limits.memory
+      {{- end }}
       {{- range $key, $value := .Values.envValueFrom }}
       - name: {{ $key | quote }}
         valueFrom:
@@ -1444,4 +1451,4 @@ volumes:
   {{- with .Values.extraContainerVolumes }}
   {{- tpl (toYaml .) $root | nindent 2 }}
   {{- end }}
-{{- end }}
+{{- end }}

charts/grafana/templates/statefulset.yaml

@@ -44,7 +44,10 @@ spec:
     metadata:
       name: storage
     spec:
-      accessModes: {{ .Values.persistence.accessModes }}
+      accessModes:
+        {{- range .Values.persistence.accessModes }}
+        - {{ . | quote }}
+        {{- end }}
       storageClassName: {{ .Values.persistence.storageClassName }}
       {{- with .Values.persistence.volumeName }}
       volumeName: {{ . | quote }}

charts/grafana/values.yaml

@@ -569,7 +569,7 @@ envFromSecrets: []
 ##   prefix: prefix
 ##   optional: true
 
-## The names of conifgmaps in the same kubernetes namespace which contain values to be added to the environment
+## The names of configmaps in the same kubernetes namespace which contain values to be added to the environment
 ## Each entry should contain a name key, and can optionally specify whether the configmap must be defined with an optional key.
 ## Name is templated.
 ## ref: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#configmapenvsource-v1-core
@@ -959,7 +959,7 @@ sidecar:
     # -- The Docker registry
     registry: quay.io
     repository: kiwigrid/k8s-sidecar
-    tag: 1.30.3
+    tag: 1.30.10
     sha: ""
   imagePullPolicy: IfNotPresent
   resources: {}