Skip to content

Commit b1f6f96

Browse files
jnoordsijjnoordsij
authoredApr 22, 2024··
style: 🎨 consistent capitalization on --entryPoints CLI flag
·
v34.4.1crds_v1.0.0
1 parent 579984c commit b1f6f96

6 files changed

+66
-67
lines changed
 

‎traefik/templates/_podtemplate.tpl

+17-17
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,9 @@
157157
{{- end }}
158158
{{- range $name, $config := .Values.ports }}
159159
{{- if $config }}
160-
- "--entrypoints.{{$name}}.address={{ $config.hostIP }}:{{ $config.port }}/{{ default "tcp" $config.protocol | lower }}"
160+
- "--entryPoints.{{$name}}.address={{ $config.hostIP }}:{{ $config.port }}/{{ default "tcp" $config.protocol | lower }}"
161161
{{- with $config.asDefault }}
162-
- "--entrypoints.{{$name}}.asDefault={{ . }}"
162+
- "--entryPoints.{{$name}}.asDefault={{ . }}"
163163
{{- end }}
164164
{{- end }}
165165
{{- end }}
@@ -499,58 +499,58 @@
499499
{{- fail "ERROR: Syntax of `ports.web.redirectTo` has changed to `ports.web.redirectTo.port`. Details in PR #934." }}
500500
{{- end }}
501501
{{- $toPort := index $.Values.ports $config.redirectTo.port }}
502-
- "--entrypoints.{{ $entrypoint }}.http.redirections.entryPoint.to=:{{ $toPort.exposedPort }}"
503-
- "--entrypoints.{{ $entrypoint }}.http.redirections.entryPoint.scheme=https"
502+
- "--entryPoints.{{ $entrypoint }}.http.redirections.entryPoint.to=:{{ $toPort.exposedPort }}"
503+
- "--entryPoints.{{ $entrypoint }}.http.redirections.entryPoint.scheme=https"
504504
{{- if $config.redirectTo.priority }}
505-
- "--entrypoints.{{ $entrypoint }}.http.redirections.entryPoint.priority={{ $config.redirectTo.priority }}"
505+
- "--entryPoints.{{ $entrypoint }}.http.redirections.entryPoint.priority={{ $config.redirectTo.priority }}"
506506
{{- end }}
507507
{{- end }}
508508
{{- if $config.middlewares }}
509-
- "--entrypoints.{{ $entrypoint }}.http.middlewares={{ join "," $config.middlewares }}"
509+
- "--entryPoints.{{ $entrypoint }}.http.middlewares={{ join "," $config.middlewares }}"
510510
{{- end }}
511511
{{- if $config.tls }}
512512
{{- if $config.tls.enabled }}
513-
- "--entrypoints.{{ $entrypoint }}.http.tls=true"
513+
- "--entryPoints.{{ $entrypoint }}.http.tls=true"
514514
{{- if $config.tls.options }}
515-
- "--entrypoints.{{ $entrypoint }}.http.tls.options={{ $config.tls.options }}"
515+
- "--entryPoints.{{ $entrypoint }}.http.tls.options={{ $config.tls.options }}"
516516
{{- end }}
517517
{{- if $config.tls.certResolver }}
518-
- "--entrypoints.{{ $entrypoint }}.http.tls.certResolver={{ $config.tls.certResolver }}"
518+
- "--entryPoints.{{ $entrypoint }}.http.tls.certResolver={{ $config.tls.certResolver }}"
519519
{{- end }}
520520
{{- if $config.tls.domains }}
521521
{{- range $index, $domain := $config.tls.domains }}
522522
{{- if $domain.main }}
523-
- "--entrypoints.{{ $entrypoint }}.http.tls.domains[{{ $index }}].main={{ $domain.main }}"
523+
- "--entryPoints.{{ $entrypoint }}.http.tls.domains[{{ $index }}].main={{ $domain.main }}"
524524
{{- end }}
525525
{{- if $domain.sans }}
526-
- "--entrypoints.{{ $entrypoint }}.http.tls.domains[{{ $index }}].sans={{ join "," $domain.sans }}"
526+
- "--entryPoints.{{ $entrypoint }}.http.tls.domains[{{ $index }}].sans={{ join "," $domain.sans }}"
527527
{{- end }}
528528
{{- end }}
529529
{{- end }}
530530
{{- if $config.http3 }}
531531
{{- if $config.http3.enabled }}
532-
- "--entrypoints.{{ $entrypoint }}.http3"
532+
- "--entryPoints.{{ $entrypoint }}.http3"
533533
{{- if $config.http3.advertisedPort }}
534-
- "--entrypoints.{{ $entrypoint }}.http3.advertisedPort={{ $config.http3.advertisedPort }}"
534+
- "--entryPoints.{{ $entrypoint }}.http3.advertisedPort={{ $config.http3.advertisedPort }}"
535535
{{- end }}
536536
{{- end }}
537537
{{- end }}
538538
{{- end }}
539539
{{- end }}
540540
{{- if $config.forwardedHeaders }}
541541
{{- if $config.forwardedHeaders.trustedIPs }}
542-
- "--entrypoints.{{ $entrypoint }}.forwardedHeaders.trustedIPs={{ join "," $config.forwardedHeaders.trustedIPs }}"
542+
- "--entryPoints.{{ $entrypoint }}.forwardedHeaders.trustedIPs={{ join "," $config.forwardedHeaders.trustedIPs }}"
543543
{{- end }}
544544
{{- if $config.forwardedHeaders.insecure }}
545-
- "--entrypoints.{{ $entrypoint }}.forwardedHeaders.insecure"
545+
- "--entryPoints.{{ $entrypoint }}.forwardedHeaders.insecure"
546546
{{- end }}
547547
{{- end }}
548548
{{- if $config.proxyProtocol }}
549549
{{- if $config.proxyProtocol.trustedIPs }}
550-
- "--entrypoints.{{ $entrypoint }}.proxyProtocol.trustedIPs={{ join "," $config.proxyProtocol.trustedIPs }}"
550+
- "--entryPoints.{{ $entrypoint }}.proxyProtocol.trustedIPs={{ join "," $config.proxyProtocol.trustedIPs }}"
551551
{{- end }}
552552
{{- if $config.proxyProtocol.insecure }}
553-
- "--entrypoints.{{ $entrypoint }}.proxyProtocol.insecure"
553+
- "--entryPoints.{{ $entrypoint }}.proxyProtocol.insecure"
554554
{{- end }}
555555
{{- end }}
556556
{{- end }}

‎traefik/tests/deployment-config_test.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -193,10 +193,10 @@ tests:
193193
asserts:
194194
- contains:
195195
path: spec.template.spec.containers[0].args
196-
content: "--entrypoints.web.http.redirections.entryPoint.to=:443"
196+
content: "--entryPoints.web.http.redirections.entryPoint.to=:443"
197197
- contains:
198198
path: spec.template.spec.containers[0].args
199-
content: "--entrypoints.web.http.redirections.entryPoint.scheme=https"
199+
content: "--entryPoints.web.http.redirections.entryPoint.scheme=https"
200200
- it: should have http redirections enabled, when enabled with redirectTo and priority
201201
set:
202202
ports:
@@ -209,4 +209,4 @@ tests:
209209
asserts:
210210
- contains:
211211
path: spec.template.spec.containers[0].args
212-
content: "--entrypoints.web.http.redirections.entryPoint.priority=10"
212+
content: "--entryPoints.web.http.redirections.entryPoint.priority=10"

‎traefik/tests/metrics-config_test.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ tests:
1212
value:
1313
- --global.checknewversion
1414
- --global.sendanonymoususage
15-
- --entrypoints.metrics.address=:9100/tcp
16-
- --entrypoints.traefik.address=:9000/tcp
17-
- --entrypoints.web.address=:8000/tcp
18-
- --entrypoints.websecure.address=:8443/tcp
15+
- --entryPoints.metrics.address=:9100/tcp
16+
- --entryPoints.traefik.address=:9000/tcp
17+
- --entryPoints.web.address=:8000/tcp
18+
- --entryPoints.websecure.address=:8443/tcp
1919
- --api.dashboard=true
2020
- --ping=true
2121
- --metrics.prometheus=true
2222
- --metrics.prometheus.entrypoint=metrics
2323
- --providers.kubernetescrd
2424
- --providers.kubernetesingress
25-
- --entrypoints.websecure.http.tls=true
25+
- --entryPoints.websecure.http.tls=true
2626
- --log.level=INFO
2727

2828
- it: "should support to set prometheus: null"

‎traefik/tests/pod-config_test.yaml

+9-9
Original file line numberDiff line numberDiff line change
@@ -366,10 +366,10 @@ tests:
366366
asserts:
367367
- contains:
368368
path: spec.template.spec.containers[0].args
369-
content: "--entrypoints.websecure.http3"
369+
content: "--entryPoints.websecure.http3"
370370
- contains:
371371
path: spec.template.spec.containers[0].args
372-
content: "--entrypoints.websecure.http3.advertisedPort=443"
372+
content: "--entryPoints.websecure.http3.advertisedPort=443"
373373
- it: should be possible to enable http3 enabled without a custom advertisedPort
374374
set:
375375
ports:
@@ -379,19 +379,19 @@ tests:
379379
asserts:
380380
- contains:
381381
path: spec.template.spec.containers[0].args
382-
content: "--entrypoints.websecure.http3"
382+
content: "--entryPoints.websecure.http3"
383383
- notContains:
384384
path: spec.template.spec.containers[0].args
385-
content: "--entrypoints.websecure.http3.advertisedPort=443"
385+
content: "--entryPoints.websecure.http3.advertisedPort=443"
386386

387387
- it: should not have http3 config flag by default
388388
asserts:
389389
- notContains:
390390
path: spec.template.spec.containers[0].args
391-
content: "--entrypoints.websecure.http3"
391+
content: "--entryPoints.websecure.http3"
392392
- notContains:
393393
path: spec.template.spec.containers[0].args
394-
content: "--entrypoints.websecure.http3.advertisedPort=8443"
394+
content: "--entryPoints.websecure.http3.advertisedPort=8443"
395395
- it: should join entrypoints middleware when there are multiples
396396
set:
397397
ports:
@@ -402,7 +402,7 @@ tests:
402402
asserts:
403403
- contains:
404404
path: spec.template.spec.containers[0].args
405-
content: "--entrypoints.websecure.http.middlewares=auth@file,strip@kubernetes-crd"
405+
content: "--entryPoints.websecure.http.middlewares=auth@file,strip@kubernetes-crd"
406406
- it: should apply middleware on entrypoint
407407
set:
408408
ports:
@@ -412,7 +412,7 @@ tests:
412412
asserts:
413413
- contains:
414414
path: spec.template.spec.containers[0].args
415-
content: "--entrypoints.web.http.middlewares=auth@file"
415+
content: "--entryPoints.web.http.middlewares=auth@file"
416416
- it: should not complain when there are no middlewares on entrypoint
417417
set:
418418
ports:
@@ -421,7 +421,7 @@ tests:
421421
asserts:
422422
- notContains:
423423
path: spec.template.spec.containers[0].args
424-
content: "--entrypoints.web.http.middlewares="
424+
content: "--entryPoints.web.http.middlewares="
425425
- it: should fail when user want to use hostnetwork with hostport != containerport
426426
set:
427427
hostNetwork: true

‎traefik/tests/ports-config_test.yaml

+15-16
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ tests:
2222
template: service.yaml
2323
- contains:
2424
path: spec.template.spec.containers[0].args
25-
content: "--entrypoints.web.address=:8000/tcp"
25+
content: "--entryPoints.web.address=:8000/tcp"
2626
template: deployment.yaml
2727
- it: should have port 8443 of pod published to 443 of service by default, and defined as entrypoint "websecure"
2828
asserts:
@@ -43,7 +43,7 @@ tests:
4343
template: service.yaml
4444
- contains:
4545
path: spec.template.spec.containers[0].args
46-
content: "--entrypoints.websecure.address=:8443/tcp"
46+
content: "--entryPoints.websecure.address=:8443/tcp"
4747
template: deployment.yaml
4848
- it: should have port 9000 of pod exposed for probes but NOT published to the service by default
4949
asserts:
@@ -63,7 +63,7 @@ tests:
6363
template: service.yaml
6464
- contains:
6565
path: spec.template.spec.containers[0].args
66-
content: "--entrypoints.traefik.address=:9000/tcp"
66+
content: "--entryPoints.traefik.address=:9000/tcp"
6767
template: deployment.yaml
6868
- it: should have a custom port when specified via values
6969
set:
@@ -90,7 +90,7 @@ tests:
9090
template: service.yaml
9191
- contains:
9292
path: spec.template.spec.containers[0].args
93-
content: "--entrypoints.ssh.address=:22/tcp"
93+
content: "--entryPoints.ssh.address=:22/tcp"
9494
template: deployment.yaml
9595
- it: should have a hostPort when specified via values
9696
set:
@@ -119,7 +119,7 @@ tests:
119119
template: service.yaml
120120
- contains:
121121
path: spec.template.spec.containers[0].args
122-
content: "--entrypoints.ssh.address=:22/tcp"
122+
content: "--entryPoints.ssh.address=:22/tcp"
123123
template: deployment.yaml
124124
- it: should have a UDP custom port when specified via values
125125
set:
@@ -148,7 +148,7 @@ tests:
148148
documentIndex: 0
149149
- contains:
150150
path: spec.template.spec.containers[0].args
151-
content: "--entrypoints.udp.address=:51/udp"
151+
content: "--entryPoints.udp.address=:51/udp"
152152
template: deployment.yaml
153153

154154
- it: should set entrypoint to default when configured
@@ -162,13 +162,13 @@ tests:
162162
asserts:
163163
- contains:
164164
path: spec.template.spec.containers[0].args
165-
content: "--entrypoints.web.asDefault=true"
165+
content: "--entryPoints.web.asDefault=true"
166166
- notContains:
167167
path: spec.template.spec.containers[0].args
168-
content: "--entrypoints.websecure.asDefault=false"
168+
content: "--entryPoints.websecure.asDefault=false"
169169
- notContains:
170170
path: spec.template.spec.containers[0].args
171-
content: "--entrypoints.websecure.asDefault=true"
171+
content: "--entryPoints.websecure.asDefault=true"
172172

173173
- it: should set entrypoint host when hostIP is configured
174174
template: deployment.yaml
@@ -179,13 +179,13 @@ tests:
179179
asserts:
180180
- contains:
181181
path: spec.template.spec.containers[0].args
182-
content: "--entrypoints.web.address=127.0.0.1:8000/tcp"
182+
content: "--entryPoints.web.address=127.0.0.1:8000/tcp"
183183
- contains:
184184
path: spec.template.spec.containers[0].args
185-
content: "--entrypoints.websecure.address=:8443/tcp"
185+
content: "--entryPoints.websecure.address=:8443/tcp"
186186
- contains:
187187
path: spec.template.spec.containers[0].args
188-
content: "--entrypoints.traefik.address=:9000/tcp"
188+
content: "--entryPoints.traefik.address=:9000/tcp"
189189

190190
- it: should set probes host when hostIP is configured
191191
template: deployment.yaml
@@ -196,7 +196,7 @@ tests:
196196
asserts:
197197
- contains:
198198
path: spec.template.spec.containers[0].args
199-
content: "--entrypoints.traefik.address=localhost:9000/tcp"
199+
content: "--entryPoints.traefik.address=localhost:9000/tcp"
200200
- equal:
201201
path: spec.template.spec.containers[0].livenessProbe.httpGet.host
202202
value: localhost
@@ -230,7 +230,7 @@ tests:
230230
template: service.yaml
231231
- contains:
232232
path: spec.template.spec.containers[0].args
233-
content: "--entrypoints.ssh.address=:2222/tcp"
233+
content: "--entryPoints.ssh.address=:2222/tcp"
234234
template: deployment.yaml
235235
- it: should be possible to use same custom containerPort and keep default exposedPort
236236
set:
@@ -258,7 +258,7 @@ tests:
258258
template: service.yaml
259259
- contains:
260260
path: spec.template.spec.containers[0].args
261-
content: "--entrypoints.web.address=:666/tcp"
261+
content: "--entryPoints.web.address=:666/tcp"
262262
template: deployment.yaml
263263
- it: should be possible to disable traefik & metrics port
264264
set:
@@ -357,4 +357,3 @@ tests:
357357
asserts:
358358
- failedTemplate:
359359
errorMessage: "ERROR: Cannot create ssh port on Service without .port or .exposedPort"
360-

‎traefik/tests/traefik-config_test.yaml

+17-17
Original file line numberDiff line numberDiff line change
@@ -236,19 +236,19 @@ tests:
236236
asserts:
237237
- contains:
238238
path: spec.template.spec.containers[0].args
239-
content: "--entrypoints.websecure.http.tls=true"
239+
content: "--entryPoints.websecure.http.tls=true"
240240
- contains:
241241
path: spec.template.spec.containers[0].args
242-
content: "--entrypoints.websecure.http.tls.options=foo"
242+
content: "--entryPoints.websecure.http.tls.options=foo"
243243
- contains:
244244
path: spec.template.spec.containers[0].args
245-
content: "--entrypoints.websecure.http.tls.certResolver=certResolverFoo"
245+
content: "--entryPoints.websecure.http.tls.certResolver=certResolverFoo"
246246
- contains:
247247
path: spec.template.spec.containers[0].args
248-
content: "--entrypoints.websecure.http.tls.domains[0].main=sub.domain.tld"
248+
content: "--entryPoints.websecure.http.tls.domains[0].main=sub.domain.tld"
249249
- contains:
250250
path: spec.template.spec.containers[0].args
251-
content: "--entrypoints.websecure.http.tls.domains[0].sans=alt1.domain.tld,alt2.domain.tld"
251+
content: "--entryPoints.websecure.http.tls.domains[0].sans=alt1.domain.tld,alt2.domain.tld"
252252

253253
- it: should have additional volumeMounts
254254
set:
@@ -322,7 +322,7 @@ tests:
322322
asserts:
323323
- contains:
324324
path: spec.template.spec.containers[0].args
325-
content: "--entrypoints.websecure.http.tls=true"
325+
content: "--entryPoints.websecure.http.tls=true"
326326
- it: should be possible to disable tls on websecure entrypoint
327327
set:
328328
ports:
@@ -332,7 +332,7 @@ tests:
332332
asserts:
333333
- notContains:
334334
path: spec.template.spec.containers[0].args
335-
content: "--entrypoints.websecure.http.tls=true"
335+
content: "--entryPoints.websecure.http.tls=true"
336336
- it: should allow to set namespace on providers by default, without rbac.namespaced
337337
set:
338338
rbac:
@@ -383,28 +383,28 @@ tests:
383383
asserts:
384384
- contains:
385385
path: spec.template.spec.containers[0].args
386-
content: "--entrypoints.websecure.forwardedHeaders.trustedIPs=127.0.0.1/32,192.168.1.7"
386+
content: "--entryPoints.websecure.forwardedHeaders.trustedIPs=127.0.0.1/32,192.168.1.7"
387387
- contains:
388388
path: spec.template.spec.containers[0].args
389-
content: "--entrypoints.websecure.proxyProtocol.trustedIPs=127.0.0.1/32,192.168.1.8"
389+
content: "--entryPoints.websecure.proxyProtocol.trustedIPs=127.0.0.1/32,192.168.1.8"
390390
- notContains:
391391
path: spec.template.spec.containers[0].args
392-
content: "--entrypoints.websecure.forwardedHeaders.insecure"
392+
content: "--entryPoints.websecure.forwardedHeaders.insecure"
393393
- notContains:
394394
path: spec.template.spec.containers[0].args
395-
content: "--entrypoints.websecure.proxyProtocol.insecure"
395+
content: "--entryPoints.websecure.proxyProtocol.insecure"
396396
- contains:
397397
path: spec.template.spec.containers[0].args
398-
content: "--entrypoints.web.forwardedHeaders.trustedIPs=127.0.0.1/32,192.168.1.9"
398+
content: "--entryPoints.web.forwardedHeaders.trustedIPs=127.0.0.1/32,192.168.1.9"
399399
- contains:
400400
path: spec.template.spec.containers[0].args
401-
content: "--entrypoints.web.proxyProtocol.trustedIPs=127.0.0.1/32,192.168.1.10"
401+
content: "--entryPoints.web.proxyProtocol.trustedIPs=127.0.0.1/32,192.168.1.10"
402402
- notContains:
403403
path: spec.template.spec.containers[0].args
404-
content: "--entrypoints.web.forwardedHeaders.insecure"
404+
content: "--entryPoints.web.forwardedHeaders.insecure"
405405
- notContains:
406406
path: spec.template.spec.containers[0].args
407-
content: "--entrypoints.web.proxyProtocol.insecure"
407+
content: "--entryPoints.web.proxyProtocol.insecure"
408408
- it: should have forwardedHeaders and proxyProtocol insecure configuration args when specified in values.yaml for port
409409
set:
410410
ports:
@@ -418,10 +418,10 @@ tests:
418418
asserts:
419419
- contains:
420420
path: spec.template.spec.containers[0].args
421-
content: "--entrypoints.websecure.forwardedHeaders.insecure"
421+
content: "--entryPoints.websecure.forwardedHeaders.insecure"
422422
- contains:
423423
path: spec.template.spec.containers[0].args
424-
content: "--entrypoints.websecure.proxyProtocol.insecure"
424+
content: "--entryPoints.websecure.proxyProtocol.insecure"
425425
- it: should be possible to configure access logs
426426
set:
427427
logs:

0 commit comments

Comments
 (0)
Please sign in to comment.