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.

Sign up for GitHub

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

Jump to bottom

feat(helm): Make gateway container port configurable. #13294

Merged
merged 3 commits into from
Jun 24, 2024
+14 −3
Merged

feat(helm): Make gateway container port configurable. #13294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
41a2c6d
helm: Make gateway container port configurable.
kavirajk Jun 24, 2024
3a0c7f9
`make helm-docs`
kavirajk Jun 24, 2024
6e84c31
update helm reference.md
kavirajk Jun 24, 2024
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
9 changes: 9 additions & 0 deletions docs/sources/setup/install/helm/reference.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3487,6 +3487,15 @@ null
<td><pre lang="json">
null
</pre>
</td>
</tr>
<tr>
<td>gateway.containerPort</td>
<td>int</td>
<td>Default container port</td>
<td><pre lang="json">
8080
</pre>
</td>
</tr>
<tr>
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: loki
description: Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both simple, scalable and distributed modes.
type: application
appVersion: 3.0.0
version: 6.6.3
version: 6.6.4
home: https://grafana.github.io/helm-charts
sources:
- https://github.com/grafana/loki
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# loki

![Version: 6.6.3](https://img.shields.io/badge/Version-6.6.3-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.6.4](https://img.shields.io/badge/Version-6.6.4-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)

Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both simple, scalable and distributed modes.

Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/templates/gateway/deployment-gateway-nginx.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ spec:
imagePullPolicy: {{ .Values.gateway.image.pullPolicy }}
ports:
- name: http-metrics
containerPort: 8080
containerPort: {{ .Values.gateway.containerPort }}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I remember something that numbers in YAML may be rendered with scientific notation, e.g. 8.08e3 ... does this work with K8s?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nevermind, I think this was related to something else (printf)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not aware of that. Will check it in local and confirm before merging. Thanks for the heads up.

Copy link
Contributor Author

@kavirajk kavirajk Jun 24, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

template rending just fine (custom port 8081)

helm template loki ./ --values distributed-values.yaml | rg nginx -A 4

        - name: nginx
          image: docker.io/nginxinc/nginx-unprivileged:1.24-alpine
          imagePullPolicy: IfNotPresent
          ports:
            - name: http-metrics
              containerPort: 8081

Also rendering default without any overrides.

 - name: nginx
          image: docker.io/nginxinc/nginx-unprivileged:1.24-alpine
          imagePullPolicy: IfNotPresent
          ports:
            - name: http-metrics
              containerPort: 8080

protocol: TCP
{{- with .Values.gateway.extraEnv }}
env:
Expand Down
2 changes: 2 additions & 0 deletions production/helm/loki/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -858,6 +858,8 @@ gateway:
enabled: true
# -- Number of replicas for the gateway
replicas: 1
# -- Default container port
containerPort: 8080
# -- Enable logging of 2xx and 3xx HTTP requests
verboseLogging: true
autoscaling:
Expand Down
Loading