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

feat: area/helm: Modify helm template to use http_listen_port and grpc_listen_port instead of hardcoded value #11646

Merged
merged 32 commits into from
Mar 15, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
c36271d
Modified helm template to use variables http_listen_port and grpc_lis…
Sheikh-Abubaker Jan 10, 2024
37f1d91
Updated CHANGELOG.md
Sheikh-Abubaker Jan 10, 2024
c598943
Remove defaults from service objects, already in values.yaml
bebosudo Jan 11, 2024
65531b2
Replace all occurrences of port 9095 with value from values.yaml
bebosudo Jan 11, 2024
c540201
Replace all occurrences of port 3100 with value from values.yaml
bebosudo Jan 11, 2024
3a89bf7
Format port numbers to string
bebosudo Jan 11, 2024
4b2d13d
Merge pull request #1 from bebosudo/chiusole/replace_all_hardcoded_lo…
Sheikh-Abubaker Jan 11, 2024
7c4154a
Merge branch 'main' of https://github.com/Sheikh-Abubaker/grafana-lok…
Sheikh-Abubaker Jan 11, 2024
a381054
Updated branch and Modified CHANGELOG.md
Sheikh-Abubaker Jan 11, 2024
b01c17a
Merge branch 'http-grpc-pr' of https://github.com/Sheikh-Abubaker/gra…
Sheikh-Abubaker Jan 11, 2024
7d5fafc
Fixed Linting error
Sheikh-Abubaker Jan 11, 2024
8f6f367
Merge branch 'main' of https://github.com/Sheikh-Abubaker/grafana-lok…
Sheikh-Abubaker Jan 11, 2024
8759798
Merge branch 'main' of https://github.com/Sheikh-Abubaker/grafana-lok…
Sheikh-Abubaker Jan 13, 2024
cf12e4c
Resolved merge conflicts
Sheikh-Abubaker Jan 13, 2024
d86817f
Merge branch 'main' of https://github.com/Sheikh-Abubaker/grafana-lok…
Sheikh-Abubaker Jan 17, 2024
4bbb6bb
Resolved conflicts
Sheikh-Abubaker Jan 17, 2024
951e574
Merge branch 'main' of https://github.com/Sheikh-Abubaker/grafana-lok…
Sheikh-Abubaker Jan 18, 2024
36d50c9
Merge branch 'main' of https://github.com/Sheikh-Abubaker/grafana-lok…
Sheikh-Abubaker Jan 19, 2024
cb2bbd5
Merge branch 'main' of https://github.com/Sheikh-Abubaker/grafana-lok…
Sheikh-Abubaker Jan 20, 2024
4ab4dc4
Merge branch 'main' of https://github.com/Sheikh-Abubaker/grafana-lok…
Sheikh-Abubaker Jan 24, 2024
af929f1
Resolved Conflicts
Sheikh-Abubaker Jan 24, 2024
99c3794
Resolved conflicts
Sheikh-Abubaker Feb 8, 2024
91b26ad
Merge branch 'main' of https://github.com/Sheikh-Abubaker/grafana-lok…
Sheikh-Abubaker Feb 13, 2024
aec0e88
Resolved conflicts
Sheikh-Abubaker Feb 17, 2024
e36fa1c
Resolved conflicts
Sheikh-Abubaker Feb 22, 2024
73b64f1
Updated CHANGELOG.md
Sheikh-Abubaker Feb 22, 2024
5757e90
Merge branch 'main' of https://github.com/Sheikh-Abubaker/grafana-lok…
Sheikh-Abubaker Feb 22, 2024
483ceb3
Merge branch 'main' of https://github.com/Sheikh-Abubaker/grafana-lok…
Sheikh-Abubaker Feb 27, 2024
4376ae6
Merge branch 'main' of https://github.com/Sheikh-Abubaker/grafana-lok…
Sheikh-Abubaker Feb 29, 2024
c754aa6
Resolved conflicts
Sheikh-Abubaker Mar 14, 2024
ebbe299
Merge branch 'main' into http-grpc-pr
MichelHollands Mar 15, 2024
fb81edf
Merge branch 'main' into http-grpc-pr
MichelHollands Mar 15, 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
4 changes: 4 additions & 0 deletions production/helm/loki/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ Entries should include a reference to the pull request that introduced the chang

[//]: # (<AUTOMATED_UPDATES_LOCATOR> : do not remove this line. This locator is used by the CI pipeline to automatically create a changelog entry for each new Loki release. Add other chart versions and respective changelog entries bellow this line.)

## 5.41.6

- [ENHANCEMENT] Modified helm template to use parameters http_listen_port and grpc_listen_port instead of hardcoded value of 3100 and 9095.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
- [ENHANCEMENT] Modified helm template to use parameters http_listen_port and grpc_listen_port instead of hardcoded value of 3100 and 9095.
- [ENHANCEMENT] Modified helm template to use parameters http_listen_port and grpc_listen_port instead of hardcoded values.


## 5.41.5

- [BUGFIX] Added "swift" type object storage to resolve Loki HELM Chart error.
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: loki
description: Helm chart for Grafana Loki in simple, scalable mode
type: application
appVersion: 2.9.3
version: 5.41.5
version: 5.41.6
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
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# loki

![Version: 5.41.5](https://img.shields.io/badge/Version-5.41.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: 5.41.6](https://img.shields.io/badge/Version-5.41.6-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)

Helm chart for Grafana Loki in simple, scalable mode

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ spec:
publishNotReadyAddresses: true
ports:
- name: http-metrics
port: 3100
port: {{ .Values.loki.server.http_listen_port | default 3100 }}
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
port: {{ .Values.loki.server.http_listen_port | default 3100 }}
port: {{ .Values.loki.server.http_listen_port }}

No need to set defaults here too, if the user didn't specify the value, helm will use the default from the values.yaml provided by the helm chart, so that resolves to {{ 3100 | default 3100 }}.
This means that there are less "magic numbers" defined across the helm chart, and if the default values will need to be changed in the future they could be changed only in the values.yaml and it would be updated everywhere immediately.

targetPort: http-metrics
protocol: TCP
- name: grpc
port: 9095
port: {{ .Values.loki.server.grpc_listen_port | default 9095 }}
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
port: {{ .Values.loki.server.grpc_listen_port | default 9095 }}
port: {{ .Values.loki.server.grpc_listen_port }}

targetPort: grpc
protocol: TCP
selector:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ spec:
clusterIP: None
ports:
- name: http-metrics
port: 3100
port: {{ .Values.loki.server.http_listen_port | default 3100 }}
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
port: {{ .Values.loki.server.http_listen_port | default 3100 }}
port: {{ .Values.loki.server.http_listen_port }}

targetPort: http-metrics
protocol: TCP
- name: grpc
port: 9095
port: {{ .Values.loki.server.grpc_listen_port | default 9095 }}
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
port: {{ .Values.loki.server.grpc_listen_port | default 9095 }}
port: {{ .Values.loki.server.grpc_listen_port }}

targetPort: grpc
protocol: TCP
selector:
Expand Down
Loading