Skip to content

Commit 2266e2d

Browse files
haywoodshhaywoodsh
committed
Make http-redirect-code configmap not affect VS/VSR CRD defaults
1 parent bb5a778 commit 2266e2d

File tree

8 files changed

+49
-100
lines changed

8 files changed

+49
-100
lines changed

‎config/crd/bases/k8s.nginx.org_virtualserverroutes.yaml‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -178,9 +178,7 @@ spec:
178178
properties:
179179
code:
180180
description: 'The status code of a redirect. The allowed
181-
values are: 301, 302, 307 or 308. The default follows
182-
the ConfigMap http-redirect-code setting, which defaults
183-
to 301.'
181+
values are: 301, 302, 307 or 308. The default is 301.'
184182
type: integer
185183
url:
186184
description: 'The URL to redirect the request to. Supported
@@ -245,9 +243,8 @@ spec:
245243
properties:
246244
code:
247245
description: 'The status code of a redirect. The allowed
248-
values are: 301, 302, 307 or 308. The default follows
249-
the ConfigMap http-redirect-code setting, which
250-
defaults to 301.'
246+
values are: 301, 302, 307 or 308. The default is
247+
301.'
251248
type: integer
252249
url:
253250
description: 'The URL to redirect the request to.
@@ -403,8 +400,7 @@ spec:
403400
code:
404401
description: 'The status code of a redirect. The
405402
allowed values are: 301, 302, 307 or 308. The
406-
default follows the ConfigMap http-redirect-code
407-
setting, which defaults to 301.'
403+
default is 301.'
408404
type: integer
409405
url:
410406
description: 'The URL to redirect the request
@@ -589,9 +585,7 @@ spec:
589585
code:
590586
description: 'The status code of a redirect.
591587
The allowed values are: 301, 302, 307
592-
or 308. The default follows the ConfigMap
593-
http-redirect-code setting, which defaults
594-
to 301.'
588+
or 308. The default is 301.'
595589
type: integer
596590
url:
597591
description: 'The URL to redirect the request
@@ -789,8 +783,7 @@ spec:
789783
code:
790784
description: 'The status code of a redirect. The
791785
allowed values are: 301, 302, 307 or 308. The
792-
default follows the ConfigMap http-redirect-code
793-
setting, which defaults to 301.'
786+
default is 301.'
794787
type: integer
795788
url:
796789
description: 'The URL to redirect the request

‎config/crd/bases/k8s.nginx.org_virtualservers.yaml‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -265,9 +265,7 @@ spec:
265265
properties:
266266
code:
267267
description: 'The status code of a redirect. The allowed
268-
values are: 301, 302, 307 or 308. The default follows
269-
the ConfigMap http-redirect-code setting, which defaults
270-
to 301.'
268+
values are: 301, 302, 307 or 308. The default is 301.'
271269
type: integer
272270
url:
273271
description: 'The URL to redirect the request to. Supported
@@ -332,9 +330,8 @@ spec:
332330
properties:
333331
code:
334332
description: 'The status code of a redirect. The allowed
335-
values are: 301, 302, 307 or 308. The default follows
336-
the ConfigMap http-redirect-code setting, which
337-
defaults to 301.'
333+
values are: 301, 302, 307 or 308. The default is
334+
301.'
338335
type: integer
339336
url:
340337
description: 'The URL to redirect the request to.
@@ -490,8 +487,7 @@ spec:
490487
code:
491488
description: 'The status code of a redirect. The
492489
allowed values are: 301, 302, 307 or 308. The
493-
default follows the ConfigMap http-redirect-code
494-
setting, which defaults to 301.'
490+
default is 301.'
495491
type: integer
496492
url:
497493
description: 'The URL to redirect the request
@@ -676,9 +672,7 @@ spec:
676672
code:
677673
description: 'The status code of a redirect.
678674
The allowed values are: 301, 302, 307
679-
or 308. The default follows the ConfigMap
680-
http-redirect-code setting, which defaults
681-
to 301.'
675+
or 308. The default is 301.'
682676
type: integer
683677
url:
684678
description: 'The URL to redirect the request
@@ -876,8 +870,7 @@ spec:
876870
code:
877871
description: 'The status code of a redirect. The
878872
allowed values are: 301, 302, 307 or 308. The
879-
default follows the ConfigMap http-redirect-code
880-
setting, which defaults to 301.'
873+
default is 301.'
881874
type: integer
882875
url:
883876
description: 'The URL to redirect the request

‎deploy/crds.yaml‎

Lines changed: 12 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1368,9 +1368,7 @@ spec:
13681368
properties:
13691369
code:
13701370
description: 'The status code of a redirect. The allowed
1371-
values are: 301, 302, 307 or 308. The default follows
1372-
the ConfigMap http-redirect-code setting, which defaults
1373-
to 301.'
1371+
values are: 301, 302, 307 or 308. The default is 301.'
13741372
type: integer
13751373
url:
13761374
description: 'The URL to redirect the request to. Supported
@@ -1435,9 +1433,8 @@ spec:
14351433
properties:
14361434
code:
14371435
description: 'The status code of a redirect. The allowed
1438-
values are: 301, 302, 307 or 308. The default follows
1439-
the ConfigMap http-redirect-code setting, which
1440-
defaults to 301.'
1436+
values are: 301, 302, 307 or 308. The default is
1437+
301.'
14411438
type: integer
14421439
url:
14431440
description: 'The URL to redirect the request to.
@@ -1593,8 +1590,7 @@ spec:
15931590
code:
15941591
description: 'The status code of a redirect. The
15951592
allowed values are: 301, 302, 307 or 308. The
1596-
default follows the ConfigMap http-redirect-code
1597-
setting, which defaults to 301.'
1593+
default is 301.'
15981594
type: integer
15991595
url:
16001596
description: 'The URL to redirect the request
@@ -1779,9 +1775,7 @@ spec:
17791775
code:
17801776
description: 'The status code of a redirect.
17811777
The allowed values are: 301, 302, 307
1782-
or 308. The default follows the ConfigMap
1783-
http-redirect-code setting, which defaults
1784-
to 301.'
1778+
or 308. The default is 301.'
17851779
type: integer
17861780
url:
17871781
description: 'The URL to redirect the request
@@ -1979,8 +1973,7 @@ spec:
19791973
code:
19801974
description: 'The status code of a redirect. The
19811975
allowed values are: 301, 302, 307 or 308. The
1982-
default follows the ConfigMap http-redirect-code
1983-
setting, which defaults to 301.'
1976+
default is 301.'
19841977
type: integer
19851978
url:
19861979
description: 'The URL to redirect the request
@@ -2699,9 +2692,7 @@ spec:
26992692
properties:
27002693
code:
27012694
description: 'The status code of a redirect. The allowed
2702-
values are: 301, 302, 307 or 308. The default follows
2703-
the ConfigMap http-redirect-code setting, which defaults
2704-
to 301.'
2695+
values are: 301, 302, 307 or 308. The default is 301.'
27052696
type: integer
27062697
url:
27072698
description: 'The URL to redirect the request to. Supported
@@ -2766,9 +2757,8 @@ spec:
27662757
properties:
27672758
code:
27682759
description: 'The status code of a redirect. The allowed
2769-
values are: 301, 302, 307 or 308. The default follows
2770-
the ConfigMap http-redirect-code setting, which
2771-
defaults to 301.'
2760+
values are: 301, 302, 307 or 308. The default is
2761+
301.'
27722762
type: integer
27732763
url:
27742764
description: 'The URL to redirect the request to.
@@ -2924,8 +2914,7 @@ spec:
29242914
code:
29252915
description: 'The status code of a redirect. The
29262916
allowed values are: 301, 302, 307 or 308. The
2927-
default follows the ConfigMap http-redirect-code
2928-
setting, which defaults to 301.'
2917+
default is 301.'
29292918
type: integer
29302919
url:
29312920
description: 'The URL to redirect the request
@@ -3110,9 +3099,7 @@ spec:
31103099
code:
31113100
description: 'The status code of a redirect.
31123101
The allowed values are: 301, 302, 307
3113-
or 308. The default follows the ConfigMap
3114-
http-redirect-code setting, which defaults
3115-
to 301.'
3102+
or 308. The default is 301.'
31163103
type: integer
31173104
url:
31183105
description: 'The URL to redirect the request
@@ -3310,8 +3297,7 @@ spec:
33103297
code:
33113298
description: 'The status code of a redirect. The
33123299
allowed values are: 301, 302, 307 or 308. The
3313-
default follows the ConfigMap http-redirect-code
3314-
setting, which defaults to 301.'
3300+
default is 301.'
33153301
type: integer
33163302
url:
33173303
description: 'The URL to redirect the request

0 commit comments

Comments
 (0)