Skip to content

Commit 061bf54

Browse files
QuentinBissonQuentinBisson
authored
Merge branch 'main' into main
Signed-off-by: Quentin Bisson <[email protected]>
2 parents 9ca8bbd + 19d2747 commit 061bf54

File tree

6 files changed

+16
-16
lines changed

6 files changed

+16
-16
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: 10.1.2
4-
appVersion: 12.2.0
3+
version: 10.1.4
4+
appVersion: 12.2.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/templates/_pod.tpl‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ containers:
397397
- name: SCRIPT
398398
value: {{ quote . }}
399399
{{- end }}
400-
{{- if and (not .Values.env.GF_SECURITY_ADMIN_USER) (not .Values.env.GF_SECURITY_DISABLE_INITIAL_ADMIN_CREATION) }}
400+
{{- if and (not .Values.env.GF_SECURITY_ADMIN_USER) (not .Values.env.GF_SECURITY_ADMIN_USER__FILE) (not .Values.env.GF_SECURITY_DISABLE_INITIAL_ADMIN_CREATION) }}
401401
- name: REQ_USERNAME
402402
valueFrom:
403403
secretKeyRef:
@@ -530,7 +530,7 @@ containers:
530530
value: {{ quote . }}
531531
{{- end }}
532532
{{- if not .Values.sidecar.dashboards.skipReload }}
533-
{{- if and (not .Values.env.GF_SECURITY_ADMIN_USER) (not .Values.env.GF_SECURITY_DISABLE_INITIAL_ADMIN_CREATION) }}
533+
{{- if and (not .Values.env.GF_SECURITY_ADMIN_USER) (not .Values.env.GF_SECURITY_ADMIN_USER__FILE) (not .Values.env.GF_SECURITY_DISABLE_INITIAL_ADMIN_CREATION) }}
534534
- name: REQ_USERNAME
535535
valueFrom:
536536
secretKeyRef:
@@ -657,7 +657,7 @@ containers:
657657
- name: SCRIPT
658658
value: {{ quote . }}
659659
{{- end }}
660-
{{- if and (not .Values.env.GF_SECURITY_ADMIN_USER) (not .Values.env.GF_SECURITY_DISABLE_INITIAL_ADMIN_CREATION) }}
660+
{{- if and (not .Values.env.GF_SECURITY_ADMIN_USER) (not .Values.env.GF_SECURITY_ADMIN_USER__FILE) (not .Values.env.GF_SECURITY_DISABLE_INITIAL_ADMIN_CREATION) }}
661661
- name: REQ_USERNAME
662662
valueFrom:
663663
secretKeyRef:
@@ -780,7 +780,7 @@ containers:
780780
- name: SCRIPT
781781
value: {{ quote . }}
782782
{{- end }}
783-
{{- if and (not .Values.env.GF_SECURITY_ADMIN_USER) (not .Values.env.GF_SECURITY_DISABLE_INITIAL_ADMIN_CREATION) }}
783+
{{- if and (not .Values.env.GF_SECURITY_ADMIN_USER) (not .Values.env.GF_SECURITY_ADMIN_USER__FILE) (not .Values.env.GF_SECURITY_DISABLE_INITIAL_ADMIN_CREATION) }}
784784
- name: REQ_USERNAME
785785
valueFrom:
786786
secretKeyRef:
@@ -903,7 +903,7 @@ containers:
903903
- name: SKIP_TLS_VERIFY
904904
value: "{{ . }}"
905905
{{- end }}
906-
{{- if and (not .Values.env.GF_SECURITY_ADMIN_USER) (not .Values.env.GF_SECURITY_DISABLE_INITIAL_ADMIN_CREATION) }}
906+
{{- if and (not .Values.env.GF_SECURITY_ADMIN_USER) (not .Values.env.GF_SECURITY_ADMIN_USER__FILE) (not .Values.env.GF_SECURITY_DISABLE_INITIAL_ADMIN_CREATION) }}
907907
- name: REQ_USERNAME
908908
valueFrom:
909909
secretKeyRef:
@@ -1141,7 +1141,7 @@ containers:
11411141
valueFrom:
11421142
fieldRef:
11431143
fieldPath: status.podIP
1144-
{{- if and (not .Values.env.GF_SECURITY_ADMIN_USER) (not .Values.env.GF_SECURITY_DISABLE_INITIAL_ADMIN_CREATION) }}
1144+
{{- if and (not .Values.env.GF_SECURITY_ADMIN_USER) (not .Values.env.GF_SECURITY_ADMIN_USER__FILE) (not .Values.env.GF_SECURITY_DISABLE_INITIAL_ADMIN_CREATION) }}
11451145
- name: GF_SECURITY_ADMIN_USER
11461146
valueFrom:
11471147
secretKeyRef:

‎charts/rollout-operator/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
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.36.0
6-
appVersion: v0.31.1
5+
version: 0.37.0
6+
appVersion: v0.32.0
77
home: https://github.com/grafana/rollout-operator
88
kubeVersion: ^1.10.0-0

‎charts/rollout-operator/README.md‎

Lines changed: 1 addition & 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.36.0](https://img.shields.io/badge/Version-0.36.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.31.1](https://img.shields.io/badge/AppVersion-v0.31.1-informational?style=flat-square)
7+
![Version: 0.37.0](https://img.shields.io/badge/Version-0.37.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.32.0](https://img.shields.io/badge/AppVersion-v0.32.0-informational?style=flat-square)
88

99
Grafana rollout-operator
1010

‎charts/tempo-distributed/README.md‎

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

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

55
Grafana Tempo in MicroService mode
66

@@ -681,7 +681,7 @@ The memcached default args are removed and should be provided manually. The sett
681681
| memcached.image.pullSecrets | list | `[]` | Optional list of imagePullSecrets. Overrides `global.image.pullSecrets` |
682682
| memcached.image.registry | string | `nil` | The Docker registry for the Memcached image. Overrides `global.image.registry` |
683683
| memcached.image.repository | string | `"memcached"` | Memcached Docker image repository |
684-
| memcached.image.tag | string | `"1.6.33-alpine"` | Memcached Docker image tag |
684+
| memcached.image.tag | string | `"1.6.39-alpine"` | Memcached Docker image tag |
685685
| memcached.initContainers | list | `[]` | Init containers for the memcached pod |
686686
| memcached.livenessProbe | object | `{"failureThreshold":6,"initialDelaySeconds":30,"periodSeconds":10,"successThreshold":1,"timeoutSeconds":5}` | configuration for liveness probe for memcached statefulset |
687687
| memcached.maxUnavailable | int | `1` | Pod Disruption Budget maxUnavailable |
@@ -700,7 +700,7 @@ The memcached default args are removed and should be provided manually. The sett
700700
| memcachedExporter.image.pullSecrets | list | `[]` | Optional list of imagePullSecrets. Overrides `global.image.pullSecrets` |
701701
| memcachedExporter.image.registry | string | `nil` | The Docker registry for the Memcached Exporter image. Overrides `global.image.registry` |
702702
| memcachedExporter.image.repository | string | `"prom/memcached-exporter"` | Memcached Exporter Docker image repository |
703-
| memcachedExporter.image.tag | string | `"v0.14.4"` | Memcached Exporter Docker image tag |
703+
| memcachedExporter.image.tag | string | `"v0.15.3"` | Memcached Exporter Docker image tag |
704704
| memcachedExporter.resources | object | `{}` | |
705705
| metaMonitoring.grafanaAgent.annotations | object | `{}` | Annotations to add to all monitoring.grafana.com custom resources. Does not affect the ServiceMonitors for kubernetes metrics; use serviceMonitor.annotations for that. |
706706
| metaMonitoring.grafanaAgent.enabled | bool | `false` | Controls whether to create PodLogs, MetricsInstance, LogsInstance, and GrafanaAgent CRs to scrape the ServiceMonitors of the chart and ship metrics and logs to the remote endpoints below. Note that you need to configure serviceMonitor in order to have some metrics available. |

‎charts/tempo-distributed/values.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1735,7 +1735,7 @@ memcached:
17351735
# -- Memcached Docker image repository
17361736
repository: memcached
17371737
# -- Memcached Docker image tag
1738-
tag: 1.6.33-alpine
1738+
tag: 1.6.39-alpine
17391739
# -- Memcached Docker image pull policy
17401740
pullPolicy: IfNotPresent
17411741
host: memcached
@@ -1826,7 +1826,7 @@ memcachedExporter:
18261826
# -- Memcached Exporter Docker image repository
18271827
repository: prom/memcached-exporter
18281828
# -- Memcached Exporter Docker image tag
1829-
tag: v0.14.4
1829+
tag: v0.15.3
18301830
# -- Memcached Exporter Docker image pull policy
18311831
pullPolicy: IfNotPresent
18321832
# -- Memcached Exporter resource requests and limits

0 commit comments

Comments
 (0)