Merge branch 'main' into fix/dont-automount-default-serviceaccount

grafana · Sep 22, 2024 · 12cf69b · 12cf69b
2 parents 93f5900 + 06e9131
commit 12cf69b
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/charts/agent-operator/Chart.yaml b/charts/agent-operator/Chart.yaml
@@ -2,12 +2,12 @@ apiVersion: v2
 name: grafana-agent-operator
 description: A Helm chart for Grafana Agent Operator
 type: application
-version: 0.4.1
-appVersion: "0.42.0"
-home: https://grafana.com/docs/agent/v0.42/
-icon: https://raw.githubusercontent.com/grafana/agent/v0.42.0/docs/sources/assets/logo_and_name.png
+version: 0.4.2
+appVersion: "0.43.0"
+home: https://grafana.com/docs/agent/v0.43/
+icon: https://raw.githubusercontent.com/grafana/agent/v0.43.0/docs/sources/assets/logo_and_name.png
 sources:
-  - https://github.com/grafana/agent/tree/v0.42.0/static/operator
+  - https://github.com/grafana/agent/tree/v0.43.0/static/operator
 maintainers:
   - name: Grafana Agent Team
     email: [email protected]
diff --git a/charts/agent-operator/README.md b/charts/agent-operator/README.md
@@ -1,14 +1,14 @@
 # grafana-agent-operator
 
-![Version: 0.4.1](https://img.shields.io/badge/Version-0.4.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.42.0](https://img.shields.io/badge/AppVersion-0.42.0-informational?style=flat-square)
+![Version: 0.4.2](https://img.shields.io/badge/Version-0.4.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.43.0](https://img.shields.io/badge/AppVersion-0.43.0-informational?style=flat-square)
 
 A Helm chart for Grafana Agent Operator
 
 ⚠️  **Please create issues relating to this Helm chart in the [Agent](https://github.com/grafana/agent/issues) repo.**
 
 ## Source Code
 
-* <https://github.com/grafana/agent/tree/v0.42.0/static/operator>
+* <https://github.com/grafana/agent/tree/v0.43.0/static/operator>
 
 Note that this chart does not provision custom resources like `GrafanaAgent` and `MetricsInstance` (formerly `PrometheusInstance`) or any `*Monitor` resources.
 
@@ -63,7 +63,7 @@ A major chart version change (like v1.2.3 -> v2.0.0) indicates that there is an
 | image.pullSecrets | list | `[]` | Image pull secrets |
 | image.registry | string | `"docker.io"` | Image registry |
 | image.repository | string | `"grafana/agent-operator"` | Image repo |
-| image.tag | string | `"v0.42.0"` | Image tag |
+| image.tag | string | `"v0.43.0"` | Image tag |
 | kubeletService | object | `{"namespace":"default","serviceName":"kubelet"}` | If both are set, Agent Operator will create and maintain a service for scraping kubelets https://grafana.com/docs/agent/latest/operator/getting-started/#monitor-kubelets |
 | nameOverride | string | `""` | Overrides the chart's name |
 | nodeSelector | object | `{}` | nodeSelector configuration |

diff --git a/charts/agent-operator/values.yaml b/charts/agent-operator/values.yaml
@@ -37,7 +37,7 @@ image:
   # -- Image repo
   repository: grafana/agent-operator
   # -- Image tag
-  tag: v0.42.0
+  tag: v0.43.0
   # -- Image pull policy
   pullPolicy: IfNotPresent
   # -- Image pull secrets

diff --git a/charts/promtail/Chart.yaml b/charts/promtail/Chart.yaml
@@ -3,7 +3,7 @@ name: promtail
 description: Promtail is an agent which ships the contents of local logs to a Loki instance
 type: application
 appVersion: 3.0.0
-version: 6.16.5
+version: 6.16.6
 home: https://grafana.com/loki
 sources:
   - https://github.com/grafana/loki

diff --git a/charts/promtail/README.md b/charts/promtail/README.md
@@ -1,6 +1,6 @@
 # promtail
 
-![Version: 6.16.5](https://img.shields.io/badge/Version-6.16.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.0](https://img.shields.io/badge/AppVersion-3.0.0-informational?style=flat-square)
+![Version: 6.16.6](https://img.shields.io/badge/Version-6.16.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.0](https://img.shields.io/badge/AppVersion-3.0.0-informational?style=flat-square)
 
 Promtail is an agent which ships the contents of local logs to a Loki instance
 

diff --git a/charts/promtail/templates/_pod.tpl b/charts/promtail/templates/_pod.tpl
@@ -27,7 +27,7 @@ spec:
   {{- end }}
   {{- with .Values.initContainer }}
   initContainers:
-    {{- toYaml . | nindent 4 }}
+    {{- tpl (toYaml .) $ | nindent 4 }}
   {{- end }}
   {{- with .Values.global.imagePullSecrets | default .Values.imagePullSecrets }}
   imagePullSecrets:
@@ -167,6 +167,6 @@ spec:
     {{- toYaml . | nindent 4 }}
     {{- end }}
     {{- with .Values.extraVolumes }}
-    {{- toYaml . | nindent 4 }}
+    {{- tpl (toYaml .) $ | nindent 4 }}
     {{- end }}
 {{- end }}