Merge pull request #3083 from mjnagel/promtail-chart-changes

[promtail] update to 3.0.0
grafana · Jun 8, 2024 · 0806507 · 0806507
2 parents cc9f1b4 + c2ad887
commit 0806507
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 8 deletions.
diff --git a/charts/promtail/Chart.yaml b/charts/promtail/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: promtail
 description: Promtail is an agent which ships the contents of local logs to a Loki instance
 type: application
-appVersion: 2.9.3
-version: 6.15.5
+appVersion: 3.0.0
+version: 6.16.0
 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.15.5](https://img.shields.io/badge/Version-6.15.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.3](https://img.shields.io/badge/AppVersion-2.9.3-informational?style=flat-square)
+![Version: 6.16.0](https://img.shields.io/badge/Version-6.16.0-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
 
@@ -143,6 +143,9 @@ The new release which will pick up again from the existing `positions.yaml`.
 | resources | object | `{}` | Resource requests and limits |
 | secret.annotations | object | `{}` | Annotations for the Secret |
 | secret.labels | object | `{}` | Labels for the Secret |
+| service.annotations | object | `{}` | Annotations for the service |
+| service.enabled | bool | `false` |  |
+| service.labels | object | `{}` | Labels for the service |
 | serviceAccount.annotations | object | `{}` | Annotations for the service account |
 | serviceAccount.create | bool | `true` | Specifies whether a ServiceAccount should be created |
 | serviceAccount.imagePullSecrets | list | `[]` | Image pull secrets for the service account |
@@ -167,9 +170,9 @@ The new release which will pick up again from the existing `positions.yaml`.
 | sidecar.configReloader.extraEnv | list | `[]` | Extra environment variables for sidecar config-reloader |
 | sidecar.configReloader.extraEnvFrom | list | `[]` | Extra environment variables from secrets or configmaps for sidecar config-reloader |
 | sidecar.configReloader.image.pullPolicy | string | `"IfNotPresent"` | Docker image pull policy for sidecar config-reloader |
-| sidecar.configReloader.image.registry | string | `"docker.io"` | The Docker registry for sidecar config-reloader |
+| sidecar.configReloader.image.registry | string | `"ghcr.io"` | The Docker registry for sidecar config-reloader |
 | sidecar.configReloader.image.repository | string | `"jimmidyson/configmap-reload"` | Docker image repository for sidecar config-reloader |
-| sidecar.configReloader.image.tag | string | `"v0.8.0"` | Docker image tag for sidecar config-reloader |
+| sidecar.configReloader.image.tag | string | `"v0.12.0"` | Docker image tag for sidecar config-reloader |
 | sidecar.configReloader.livenessProbe | object | `{}` | Liveness probe for sidecar config-reloader |
 | sidecar.configReloader.readinessProbe | object | `{}` | Readiness probe for sidecar config-reloader |
 | sidecar.configReloader.resources | object | `{}` | Resource requests and limits for sidecar config-reloader |

diff --git a/charts/promtail/templates/service-metrics.yaml b/charts/promtail/templates/service-metrics.yaml
@@ -1,11 +1,14 @@
-{{- if .Values.serviceMonitor.enabled }}
+{{- if or .Values.serviceMonitor.enabled .Values.service.enabled }}
 apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "promtail.fullname" . }}-metrics
   namespace: {{ include "promtail.namespaceName" . }}
   labels:
     {{- include "promtail.labels" . | nindent 4 }}
+    {{- toYaml .Values.service.labels | nindent 4 }}
+  annotations:
+    {{- toYaml .Values.service.annotations | nindent 4 }}
 spec:
   clusterIP: None
   ports:

diff --git a/charts/promtail/values.yaml b/charts/promtail/values.yaml
@@ -62,6 +62,13 @@ deployment:
     strategy:
       type: RollingUpdate
 
+service:
+  enabled: false
+  # -- Labels for the service
+  labels: {}
+  # -- Annotations for the service
+  annotations: {}
+
 secret:
   # -- Labels for the Secret
   labels: {}
@@ -584,11 +591,11 @@ sidecar:
     enabled: false
     image:
       # -- The Docker registry for sidecar config-reloader
-      registry: docker.io
+      registry: ghcr.io
       # -- Docker image repository for sidecar config-reloader
       repository: jimmidyson/configmap-reload
       # -- Docker image tag for sidecar config-reloader
-      tag: v0.8.0
+      tag: v0.12.0
       # -- Docker image pull policy for sidecar config-reloader
       pullPolicy: IfNotPresent
     # Extra args for the config-reloader container.