Skip to content

[tempo-distributed] Add Labels on Gateway Ingress. #2913

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

Merged
merged 37 commits into from
Jun 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
82d25d0
Setting Custom Labels on Gateway Ingress is allowed now
Sheikh-Abubaker Jan 16, 2024
2dd07f1
Updated README.md
Sheikh-Abubaker Jan 16, 2024
06acb81
Updated README.md
Sheikh-Abubaker Jan 16, 2024
03d3de1
Updated README.md
Sheikh-Abubaker Jan 16, 2024
0247d81
Updated README.md
Sheikh-Abubaker Jan 16, 2024
db0e734
Updated values.yaml
Sheikh-Abubaker Jan 17, 2024
64a4bb8
Updated README.md
Sheikh-Abubaker Jan 17, 2024
593ca8d
Merge branch 'main' of https://github.com/Sheikh-Abubaker/helm-charts…
Sheikh-Abubaker Jan 17, 2024
1517a58
Updated branch
Sheikh-Abubaker Jan 17, 2024
e6abcbe
Resolved Conflicts
Sheikh-Abubaker Jan 19, 2024
78938b4
Updated values.yaml
Sheikh-Abubaker Jan 19, 2024
22d1e35
Updated README.md
Sheikh-Abubaker Jan 19, 2024
9a3a96f
Merge branch 'main' of https://github.com/Sheikh-Abubaker/helm-charts…
Sheikh-Abubaker Jan 20, 2024
9e750ed
Merge branch 'main' of https://github.com/Sheikh-Abubaker/helm-charts…
Sheikh-Abubaker Jan 24, 2024
0acf47d
Bumped Version
Sheikh-Abubaker Jan 24, 2024
1341d19
Merge branch 'main' of https://github.com/Sheikh-Abubaker/helm-charts…
Sheikh-Abubaker Feb 4, 2024
024f480
Bumped Version
Sheikh-Abubaker Feb 4, 2024
d8938e5
Merge branch 'main' of https://github.com/Sheikh-Abubaker/helm-charts…
Sheikh-Abubaker Feb 7, 2024
f5d75b9
Bumped version
Sheikh-Abubaker Feb 7, 2024
568b29a
Merge branch 'main' of https://github.com/Sheikh-Abubaker/helm-charts…
Sheikh-Abubaker Feb 17, 2024
df5da8e
Bumped Version
Sheikh-Abubaker Feb 17, 2024
c328d90
Merge branch 'main' of https://github.com/Sheikh-Abubaker/helm-charts…
Sheikh-Abubaker Feb 22, 2024
511388e
Merge branch 'main' of https://github.com/Sheikh-Abubaker/helm-charts…
Sheikh-Abubaker Feb 27, 2024
36ee667
Merge branch 'main' of https://github.com/Sheikh-Abubaker/helm-charts…
Sheikh-Abubaker Mar 14, 2024
4d5a1c0
Bumped Version
Sheikh-Abubaker Mar 14, 2024
c8ee1ad
Merge branch 'main' of https://github.com/Sheikh-Abubaker/helm-charts…
Sheikh-Abubaker Mar 14, 2024
06f6006
Resolve Conflicts
Sheikh-Abubaker Apr 5, 2024
5c1d3f7
Merge branch 'main' of https://github.com/Sheikh-Abubaker/helm-charts…
Sheikh-Abubaker Apr 19, 2024
6a3b40a
Bumped chart version
Sheikh-Abubaker Apr 19, 2024
0bae8d3
Resolve Conflicts
Sheikh-Abubaker May 5, 2024
711c67b
Resolve Merge Conflict
Sheikh-Abubaker Jun 3, 2024
f569f24
Merge branch 'main' of https://github.com/Sheikh-Abubaker/helm-charts…
Sheikh-Abubaker Jun 4, 2024
9920a97
Trigger DCO
Sheikh-Abubaker Jun 4, 2024
fbdae0b
Trigger DCO
Sheikh-Abubaker Jun 4, 2024
8f35975
Trigger DCO
Sheikh-Abubaker Jun 4, 2024
7452a48
Trigger DCO
Sheikh-Abubaker Jun 6, 2024
54ec59a
Merge branch 'main' into external_dns_pr
zalegrala Jun 7, 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
2 changes: 1 addition & 1 deletion charts/tempo-distributed/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: tempo-distributed
description: Grafana Tempo in MicroService mode
type: application
version: 1.10.0
version: 1.11.0
appVersion: 2.5.0
engine: gotpl
home: https://grafana.com/docs/tempo/latest/
Expand Down
3 changes: 2 additions & 1 deletion charts/tempo-distributed/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# tempo-distributed

![Version: 1.10.0](https://img.shields.io/badge/Version-1.10.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square)
![Version: 1.11.0](https://img.shields.io/badge/Version-1.11.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square)

Grafana Tempo in MicroService mode

Expand Down Expand Up @@ -440,6 +440,7 @@ The memcached default args are removed and should be provided manually. The sett
| gateway.ingress.annotations | object | `{}` | Annotations for the gateway ingress |
| gateway.ingress.enabled | bool | `false` | Specifies whether an ingress for the gateway should be created |
| gateway.ingress.hosts | list | `[{"host":"gateway.tempo.example.com","paths":[{"path":"/"}]}]` | Hosts configuration for the gateway ingress |
| gateway.ingress.labels | object | `{}` | Labels for the gateway ingress |
| gateway.ingress.tls | list | `[{"hosts":["gateway.tempo.example.com"],"secretName":"tempo-gateway-tls"}]` | TLS configuration for the gateway ingress |
| gateway.nginxConfig.file | string | See values.yaml | Config file contents for Nginx. Passed through the `tpl` function to allow templating |
| gateway.nginxConfig.httpSnippet | string | `""` | Allows appending custom configuration to the http block |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ metadata:
namespace: {{ .Release.Namespace }}
labels:
{{- include "tempo.labels" (dict "ctx" . "component" "gateway") | nindent 4 }}
{{- with .Values.gateway.ingress.labels }}
{{- toYaml . | nindent 4}}
{{- end}}
{{- with .Values.gateway.ingress.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
Expand Down
2 changes: 2 additions & 0 deletions charts/tempo-distributed/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1708,6 +1708,8 @@ gateway:
ingress:
# -- Specifies whether an ingress for the gateway should be created
enabled: false
# -- Labels for the gateway ingress
labels: {}
# -- Ingress Class Name. MAY be required for Kubernetes versions >= 1.18
# ingressClassName: nginx
# -- Annotations for the gateway ingress
Expand Down
Loading