Skip to content

Commit 395e346

Browse files
committed
fix: middleware configuration from helm
1 parent 6608adf commit 395e346

File tree

5 files changed

+26
-4
lines changed

5 files changed

+26
-4
lines changed

k8s/welearn-api/templates/ingress.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ metadata:
1111
{{- $middlewares = append $middlewares (tpl .Values.sablier.traefikMiddleware .) }}
1212
{{- end }}
1313

14+
{{- if .Values.rateLimiting.enabled }}
15+
{{- $middlewares = append $middlewares (tpl .Values.rateLimiting.middlewareName .) }}
16+
{{- end }}
17+
1418
{{- if $middlewares }}
1519
traefik.ingress.kubernetes.io/router.middlewares: {{ join "," $middlewares }}
1620
{{- end }}
Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1+
{{- with .Values.rateLimiting }}
2+
{{- if .enabled }}
13
---
24
apiVersion: traefik.io/v1alpha1
35
kind: Middleware
46
metadata:
5-
name: ratelimit
7+
name: {{ tpl .middlewareName $ }}
68
spec:
79
rateLimit:
8-
average: 1
9-
period: 10s
10-
burst: 1
10+
average: {{ .average }}
11+
period: {{ .period }}
12+
burst: {{ .burst }}
13+
{{- end }}
14+
{{- end }}

k8s/welearn-api/values.dev.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,6 @@ config:
88
allowedHostsRegexes:
99
mainUrl: |-
1010
https:\/\/welearn\.k8s\.lp-i\.dev
11+
12+
rateLimiting:
13+
enabled: true

k8s/welearn-api/values.prod.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,6 @@ allowedHostsRegexes:
1010
https://[a-zA-Z0-9-]*\.alpha-welearn\.lp-i\.org
1111
mainUrl: |-
1212
https:\/\/welearn-demo\.learningplanetinstitute\.org
13+
14+
rateLimiting:
15+
enabled: true

k8s/welearn-api/values.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ replicaCount: 1
1616

1717
ingress:
1818
path: /
19+
middlewares: []
1920

2021
sablier:
2122
enabled: false
@@ -52,3 +53,10 @@ runOnGpu: false # Schedule on the GPU node pool to lower its cost
5253
allowedHostsRegexes:
5354
localhost: |-
5455
http:\/\/localhost:5173
56+
57+
rateLimiting:
58+
enabled: false
59+
middlewareName: "{{ $.Values.fullName }}-ratelimit"
60+
average: 50
61+
period: 10s
62+
burst: 10

0 commit comments

Comments
 (0)