Skip to content

Commit 49d8bd3

Browse files
Sheikh-AbubakerSheikh-Abubaker
authored
Merge branch 'main' into bump-rollout
Signed-off-by: Sheikh-Abubaker <sheikhabubaker761@gmail.com>
2 parents 2a4b4ee + 8ba262e commit 49d8bd3

File tree

23 files changed

+83
-23
lines changed

23 files changed

+83
-23
lines changed

‎charts/cloudcost-exporter/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ type: application
55

66
# This is the chart version. This version number should be incremented each time you make changes
77
# to the chart and its templates, including the app version.
8-
version: 1.0.5
8+
version: 1.0.6
99

1010
# This is the version of cloudcost-exporter to be deployed, which should be incremented
1111
# with each release.
12-
appVersion: "0.9.0"
12+
appVersion: "0.10.0"
1313

1414
home: https://github.com/grafana/cloudcost-exporter

‎charts/cloudcost-exporter/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Cloud Cost Exporter exports cloud provider agnostic cost metrics to Prometheus.
44

5-
![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)
5+
![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)
66

77
## Installing the Chart
88

‎charts/grafana/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: grafana
3-
version: 9.4.4
3+
version: 10.0.0
44
appVersion: 12.1.1
55
kubeVersion: "^1.8.0-0"
66
description: The leading tool for querying and visualizing time series and metrics.

‎charts/grafana/README.md‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,16 @@ to `global.imageRegistry`. If you were not previously setting `global.image.regi
5353
is required on upgrade. If you were previously setting `global.image.registry`, you will
5454
need to instead set `global.imageRegistry`.
5555

56+
### To 10.0.0
57+
58+
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.
59+
60+
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:
61+
62+
`{{ "{{" }} $labels.instance {{ "}}" }}`
63+
64+
This ensures the expressions are preserved for Alertmanager instead of being rendered by Helm.
65+
5666
## Configuration
5767

5868
| Parameter | Description | Default |
@@ -681,7 +691,7 @@ The two possibilities for static alerting resource provisioning are:
681691
* 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.
682692
* The chart supports importing YAML and JSON files.
683693
* The filename must be unique, otherwise one volume mount will overwrite the other.
684-
* 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.
694+
* 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.
685695
* 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.
686696
* The file size for each import is limited by what the function `.Files.Get` can handle, which suffices for most cases.
687697

‎charts/grafana/templates/_config.tpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ grafana.ini: |
5555

5656
{{- range $key, $value := .Values.alerting }}
5757
{{- if (hasKey $value "file") }}
58-
{{ $key }}:
59-
{{- toYaml ( $files.Get $value.file ) | nindent 2 }}
58+
{{ $key }}: |
59+
{{- tpl ($files.Get $value.file) $root | nindent 2 }}
6060
{{- else if (or (hasKey $value "secret") (hasKey $value "secretFile"))}}
6161
{{/* will be stored inside secret generated by "configSecret.yaml"*/}}
6262
{{- else }}

‎charts/grafana/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@ envFromSecrets: []
569569
## prefix: prefix
570570
## optional: true
571571

572-
## The names of conifgmaps in the same kubernetes namespace which contain values to be added to the environment
572+
## The names of configmaps in the same kubernetes namespace which contain values to be added to the environment
573573
## Each entry should contain a name key, and can optionally specify whether the configmap must be defined with an optional key.
574574
## Name is templated.
575575
## ref: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#configmapenvsource-v1-core

‎charts/rollout-operator/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: rollout-operator
33
description: "Grafana rollout-operator"
44
type: application
5-
version: 0.33.0
5+
version: 0.33.1
66
appVersion: v0.29.0
77
home: https://github.com/grafana/rollout-operator
88
kubeVersion: ^1.10.0-0

‎charts/rollout-operator/README.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Helm chart for deploying [Grafana rollout-operator](https://github.com/grafana/r
44

55
# rollout-operator
66

7-
![Version: 0.33.0](https://img.shields.io/badge/Version-0.33.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.29.0](https://img.shields.io/badge/AppVersion-v0.29.0-informational?style=flat-square)
7+
![Version: 0.33.1](https://img.shields.io/badge/Version-0.33.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.29.0](https://img.shields.io/badge/AppVersion-v0.29.0-informational?style=flat-square)
88

99
Grafana rollout-operator
1010

@@ -49,6 +49,8 @@ Manually applying these CRDs is only required if upgrading from a chart <= v0.32
4949
|-----|------|---------|-------------|
5050
| affinity | object | `{}` | |
5151
| extraArgs | list | `[]` | List of additional CLI arguments to configure rollout-operator (example: `--log.level=info`) |
52+
| extraEnv | list | `[]` | Environment variables to add to rollout-operator container |
53+
| extraEnvFrom | list | `[]` | Environment variables from secrets or configmaps to add to rollout-operator container |
5254
| fullnameOverride | string | `""` | |
5355
| global.commonLabels | object | `{}` | Common labels for all object directly managed by this chart. |
5456
| hostAliases | list | `[]` | hostAliases to add |

‎charts/rollout-operator/templates/deployment.yaml‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,18 @@ spec:
5858
{{- range .Values.extraArgs }}
5959
- {{ . }}
6060
{{- end }}
61+
{{- if .Values.extraEnv }}
62+
env:
63+
{{- with .Values.extraEnv }}
64+
{{- toYaml . | nindent 12 }}
65+
{{- end }}
66+
{{- end }}
67+
{{- if .Values.extraEnvFrom }}
68+
envFrom:
69+
{{- with .Values.extraEnvFrom }}
70+
{{- toYaml . | nindent 12 }}
71+
{{- end }}
72+
{{- end }}
6173
ports:
6274
- name: http-metrics
6375
containerPort: 8001
@@ -86,4 +98,4 @@ spec:
8698
{{- with .Values.tolerations }}
8799
tolerations:
88100
{{- toYaml . | nindent 8 }}
89-
{{- end }}
101+
{{- end }}

‎charts/rollout-operator/values.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,12 @@ securityContext: {}
5656
# -- List of additional CLI arguments to configure rollout-operator (example: `--log.level=info`)
5757
extraArgs: []
5858

59+
# -- Environment variables to add to rollout-operator container
60+
extraEnv: []
61+
62+
# -- Environment variables from secrets or configmaps to add to rollout-operator container
63+
extraEnvFrom: []
64+
5965
resources:
6066
limits:
6167
# cpu: "1"

0 commit comments

Comments
 (0)