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

Helm - Templatable host for gateway ingress/route #7218

Merged
merged 14 commits into from
Feb 8, 2024
Merged

Helm - Templatable host for gateway ingress/route #7218

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
8673d68
feat: added host templating for gateway ingress
Itaykal Jan 25, 2024
ca828f1
feat: added host templating for gateway route
Itaykal Jan 25, 2024
cf956fb
fix: missing ctx ref
Itaykal Jan 25, 2024
4d7001e
Revert "fix: missing ctx ref"
Itaykal Jan 25, 2024
8adb2b7
fix: missing ctx ref
Itaykal Jan 25, 2024
be491b3
ci: ran make build-helm-tests
Itaykal Jan 25, 2024
4bf6d81
updated CHANGELOG.md
Itaykal Jan 25, 2024
7ad7d77
fix: re-ordered changelog
Itaykal Feb 6, 2024
62d321b
feat: added templating to global ingress
Itaykal Feb 6, 2024
922c344
fix: added templating to host rules
Itaykal Feb 6, 2024
a37197d
docs: values.yaml examples
Itaykal Feb 6, 2024
9216f2a
test: rebuild tests according to examples
Itaykal Feb 6, 2024
50a9e25
Merge branch 'main' into feat/host-templating-helm
Itaykal Feb 6, 2024
968cc16
Merge branch 'main' into feat/host-templating-helm
dimitarvdimitrov Feb 8, 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
1 change: 1 addition & 0 deletions operations/helm/charts/mimir-distributed/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ Entries should include a reference to the Pull Request that introduced the chang
* [ENHANCEMENT] Rollout-operator: upgraded to v0.10.1. #7125
* [ENHANCEMENT] Query-frontend: configured `-shutdown-delay`, `-server.grpc.keepalive.max-connection-age` and termination grace period to reduce the likelihood of queries hitting terminated query-frontends. #7129
* [BUGFIX] Metamonitoring: update dashboards to drop unsupported `step` parameter in targets. #7157
* [ENHANCEMENT] Gateway: ingress/route host is templateable. #7198
Copy link
Contributor

Choose a reason for hiding this comment

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

can you order this after the other ENHANCEMENTS? Can you also have the PR number instead of the issue number - it makes tracking down the actual change faster.


## 5.2.1

Expand Down
4 changes: 2 additions & 2 deletions operations/helm/charts/mimir-distributed/templates/gateway/gateway-ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
{{- range . }}
- hosts:
{{- range .hosts }}
- {{ . | quote }}
- {{ tpl . $ | quote }}
{{- end }}
{{- with .secretName }}
secretName: {{ . }}
Expand All @@ -28,7 +28,7 @@ spec:
{{- end }}
rules:
{{- range .Values.gateway.ingress.hosts }}
- host: {{ .host | quote }}
- host: {{ tpl .host $ | quote }}
http:
paths:
{{- range .paths }}
Expand Down
2 changes: 1 addition & 1 deletion operations/helm/charts/mimir-distributed/templates/gateway/gateway-route.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ metadata:
{{- end }}
namespace: {{ .Release.Namespace | quote }}
spec:
host: {{ .Values.gateway.route.host }}
host: {{ tpl .Values.gateway.route.host $ | quote }}
to:
kind: Service
name: {{ include "mimir.gateway.service.name" . }}
Expand Down
2 changes: 1 addition & 1 deletion ...ateway-enterprise-values-generated/mimir-distributed/templates/gateway/gateway-route.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ metadata:
app.kubernetes.io/managed-by: Helm
namespace: "citestns"
spec:
host: mimir.example.com
host: "mimir.example.com"
to:
kind: Service
name: gateway-enterprise-values-mimir-gateway
Expand Down
2 changes: 1 addition & 1 deletion ...sts/gateway-nginx-values-generated/mimir-distributed/templates/gateway/gateway-route.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ metadata:
app.kubernetes.io/managed-by: Helm
namespace: "citestns"
spec:
host: mimir.example.com
host: "mimir.example.com"
to:
kind: Service
name: gateway-nginx-values-mimir-gateway
Expand Down
Loading