Merge pull request #2546 from YuleZ/hostAliases_for_promtail

[promtail] Add host aliases
grafana · Aug 1, 2023 · b9caf57 · b9caf57
2 parents 52c2754 + 46c8f7e
commit b9caf57
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
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: 2.8.3
-version: 6.11.9
+version: 6.12.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.11.9](https://img.shields.io/badge/Version-6.11.9-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.8.3](https://img.shields.io/badge/AppVersion-2.8.3-informational?style=flat-square)
+![Version: 6.12.0](https://img.shields.io/badge/Version-6.12.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.8.3](https://img.shields.io/badge/AppVersion-2.8.3-informational?style=flat-square)
 
 Promtail is an agent which ships the contents of local logs to a Loki instance
 
@@ -108,6 +108,7 @@ The new release which will pick up again from the existing `positions.yaml`.
 | fullnameOverride | string | `nil` | Overrides the chart's computed fullname |
 | global.imagePullSecrets | list | `[]` | Allow parent charts to override registry credentials |
 | global.imageRegistry | string | `""` | Allow parent charts to override registry hostname |
+| hostAliases | list | `[]` | hostAliases to add |
 | httpPathPrefix | string | `""` | Base path to server all API routes fro |
 | image.pullPolicy | string | `"IfNotPresent"` | Docker image pull policy |
 | image.registry | string | `"docker.io"` | The Docker registry |

diff --git a/charts/promtail/templates/_pod.tpl b/charts/promtail/templates/_pod.tpl
@@ -33,6 +33,10 @@ spec:
   imagePullSecrets:
     {{- toYaml . | nindent 4 }}
   {{- end }}
+  {{- with .Values.hostAliases }}
+  hostAliases:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   securityContext:
     {{- toYaml .Values.podSecurityContext | nindent 4 }}
   containers:

diff --git a/charts/promtail/values.yaml b/charts/promtail/values.yaml
@@ -69,6 +69,12 @@ image:
 # -- Image pull secrets for Docker images
 imagePullSecrets: []
 
+# -- hostAliases to add
+hostAliases: []
+#  - ip: 1.2.3.4
+#    hostnames:
+#      - domain.tld
+
 # -- Annotations for the DaemonSet
 annotations: {}