Skip to content

Commit cce2291

Browse files
authored
Merge branch 'main' into enable_webhooks_in_rollout_operator
2 parents 1f18a63 + 3597342 commit cce2291

File tree

7 files changed

+15
-12
lines changed

7 files changed

+15
-12
lines changed

charts/grafana/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v2
22
name: grafana
3-
version: 9.4.0
4-
appVersion: 12.1.0
3+
version: 9.4.3
4+
appVersion: 12.1.1
55
kubeVersion: "^1.8.0-0"
66
description: The leading tool for querying and visualizing time series and metrics.
77
home: https://grafana.com

charts/grafana/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ need to instead set `global.imageRegistry`.
168168
| `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) | `{}` |
169169
| `sidecar.image.registry` | Sidecar image registry | `quay.io` |
170170
| `sidecar.image.repository` | Sidecar image repository | `kiwigrid/k8s-sidecar` |
171-
| `sidecar.image.tag` | Sidecar image tag | `1.30.0` |
171+
| `sidecar.image.tag` | Sidecar image tag | `1.30.10` |
172172
| `sidecar.image.sha` | Sidecar image sha (optional) | `""` |
173173
| `sidecar.imagePullPolicy` | Sidecar image pull policy | `IfNotPresent` |
174174
| `sidecar.resources` | Sidecar resources | `{}` |

charts/grafana/templates/statefulset.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,10 @@ spec:
4444
metadata:
4545
name: storage
4646
spec:
47-
accessModes: {{ .Values.persistence.accessModes }}
47+
accessModes:
48+
{{- range .Values.persistence.accessModes }}
49+
- {{ . | quote }}
50+
{{- end }}
4851
storageClassName: {{ .Values.persistence.storageClassName }}
4952
{{- with .Values.persistence.volumeName }}
5053
volumeName: {{ . | quote }}

charts/grafana/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -959,7 +959,7 @@ sidecar:
959959
# -- The Docker registry
960960
registry: quay.io
961961
repository: kiwigrid/k8s-sidecar
962-
tag: 1.30.3
962+
tag: 1.30.10
963963
sha: ""
964964
imagePullPolicy: IfNotPresent
965965
resources: {}

charts/tempo-distributed/Chart.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ dependencies:
77
version: 0.5.0
88
- name: rollout-operator
99
repository: https://grafana.github.io/helm-charts
10-
version: 0.30.0
11-
digest: sha256:07fffb46b6227c0fcb61737b8e1ec355f4fa01c7a12804c1699ba88607866d45
12-
generated: "2025-06-27T12:40:51.413636+03:00"
10+
version: 0.32.0
11+
digest: sha256:602a35e77f9ba8760c5b0ea21d041053ade43eaf3e9c1a4d4194da1c61865e3b
12+
generated: "2025-08-29T13:25:03.086242-04:00"

charts/tempo-distributed/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: tempo-distributed
33
description: Grafana Tempo in MicroService mode
44
type: application
5-
version: 1.47.0
5+
version: 1.47.1
66
appVersion: 2.8.2
77
engine: gotpl
88
home: https://grafana.com/docs/tempo/latest/
@@ -36,5 +36,5 @@ dependencies:
3636
- name: rollout-operator
3737
alias: rollout_operator
3838
repository: https://grafana.github.io/helm-charts
39-
version: 0.30.0
39+
version: 0.32.0
4040
condition: rollout_operator.enabled

charts/tempo-distributed/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# tempo-distributed
22

3-
![Version: 1.47.0](https://img.shields.io/badge/Version-1.47.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.8.2](https://img.shields.io/badge/AppVersion-2.8.2-informational?style=flat-square)
3+
![Version: 1.47.1](https://img.shields.io/badge/Version-1.47.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.8.2](https://img.shields.io/badge/AppVersion-2.8.2-informational?style=flat-square)
44

55
Grafana Tempo in MicroService mode
66

@@ -14,7 +14,7 @@ Grafana Tempo in MicroService mode
1414
|------------|------|---------|
1515
| https://charts.min.io/ | minio(minio) | 4.0.12 |
1616
| https://grafana.github.io/helm-charts | grafana-agent-operator(grafana-agent-operator) | 0.5.0 |
17-
| https://grafana.github.io/helm-charts | rollout_operator(rollout-operator) | 0.30.0 |
17+
| https://grafana.github.io/helm-charts | rollout_operator(rollout-operator) | 0.32.0 |
1818

1919
## Chart Repo
2020

0 commit comments

Comments
 (0)