Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add dnsmasq as extraContainer to loki-gateway #238

Merged
merged 3 commits into from
Nov 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Fixed

- Add dnsmasq as extraContainer to loki-gateway.
- Upgraded loki from 2.9.2 to 2.9.3 - see [changelog](https://github.com/grafana/loki/blob/main/CHANGELOG.md) for more information.
- Upgraded upstream chart from 5.34.0 to 5.36.3 - see [changelog](https://github.com/grafana/loki/blob/main/production/helm/loki/CHANGELOG.md) for more information.

## [0.14.1] - 2023-10-31

### Changed
Expand Down
4 changes: 2 additions & 2 deletions helm/loki/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ apiVersion: v2
name: loki
description: Helm chart for Grafana Loki in simple, scalable mode
type: application
appVersion: 2.9.2
appVersion: 2.9.3
version: 0.14.1
home: https://github.com/giantswarm/loki-app
sources:
- https://github.com/giantswarm/loki-app
icon: https://s.giantswarm.io/app-icons/loki-stack/1/dark.svg
dependencies:
- name: loki
version: 5.34.0
version: 5.36.3
repository: https://grafana.github.io/helm-charts
condition: loki.enabled
maintainers:
Expand Down
11 changes: 11 additions & 0 deletions helm/loki/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,18 @@ loki:
enabled: true

gateway:
extraContainers:
- name: dnsmasq
image: "giantswarm/go-dnsmasq:release-1.0.7"
imagePullPolicy: IfNotPresent
args:
- --listen
- "127.0.0.1:8053"
- --hostsfile=/etc/hosts
- --enable-search
- --verbose
nginxConfig:
resolver: "127.0.0.1:8053 valid=60s"
genMultiTenant: false
# To be set when using MultiTenant with GiantSwarm multi-tenant-proxy
#customReadUrl: http://loki-multi-tenant-proxy.default.svc.cluster.local:3100
Expand Down