Skip to content

Commit ba1d00e

Browse files
fixing failing tests
1 parent 43f4545 commit ba1d00e

8 files changed

+99
-103
lines changed

config/crd/bases/k8s.nginx.org_policies.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -431,8 +431,8 @@ spec:
431431
type: boolean
432432
logDest:
433433
description: The log destination for the security log. Only
434-
accepted variables are syslog:server=<ip-address &#124;
435-
localhost; fqdn>:<port>, stderr, <absolute path to file>.
434+
accepted variables are syslog:server=<ip-address>; localhost;
435+
fqdn>:<port>, stderr, <absolute path to file>.
436436
type: string
437437
type: object
438438
securityLogs:
@@ -452,8 +452,8 @@ spec:
452452
type: boolean
453453
logDest:
454454
description: The log destination for the security log. Only
455-
accepted variables are syslog:server=<ip-address &#124;
456-
localhost; fqdn>:<port>, stderr, <absolute path to file>.
455+
accepted variables are syslog:server=<ip-address>; localhost;
456+
fqdn>:<port>, stderr, <absolute path to file>.
457457
type: string
458458
type: object
459459
type: array

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

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -178,13 +178,12 @@ spec:
178178
properties:
179179
code:
180180
description: 'The status code of a redirect. The allowed
181-
values are: 301 , 302 , 307 , 308. The default is
182-
301.'
181+
values are: 301, 302, 307 or 308. The default is 301.'
183182
type: integer
184183
url:
185184
description: 'The URL to redirect the request to. Supported
186-
NGINX variables: $scheme , $http_x_forwarded_proto
187-
, $request_uri , $host. Variables must be enclosed
185+
NGINX variables: $scheme, $http_x_forwarded_proto,
186+
$request_uri or $host. Variables must be enclosed
188187
in curly braces. For example: ${host}${request_uri}.'
189188
type: string
190189
type: object
@@ -244,13 +243,13 @@ spec:
244243
properties:
245244
code:
246245
description: 'The status code of a redirect. The allowed
247-
values are: 301 , 302 , 307 , 308. The default is
246+
values are: 301, 302, 307 or 308. The default is
248247
301.'
249248
type: integer
250249
url:
251250
description: 'The URL to redirect the request to.
252-
Supported NGINX variables: $scheme , $http_x_forwarded_proto
253-
, $request_uri , $host. Variables must be enclosed
251+
Supported NGINX variables: $scheme, $http_x_forwarded_proto,
252+
$request_uri or $host. Variables must be enclosed
254253
in curly braces. For example: ${host}${request_uri}.'
255254
type: string
256255
type: object
@@ -400,13 +399,13 @@ spec:
400399
properties:
401400
code:
402401
description: 'The status code of a redirect. The
403-
allowed values are: 301 , 302 , 307 , 308. The
402+
allowed values are: 301, 302, 307 or 308. The
404403
default is 301.'
405404
type: integer
406405
url:
407406
description: 'The URL to redirect the request
408-
to. Supported NGINX variables: $scheme , $http_x_forwarded_proto
409-
, $request_uri , $host. Variables must be enclosed
407+
to. Supported NGINX variables: $scheme, $http_x_forwarded_proto,
408+
$request_uri or $host. Variables must be enclosed
410409
in curly braces. For example: ${host}${request_uri}.'
411410
type: string
412411
type: object
@@ -585,14 +584,14 @@ spec:
585584
properties:
586585
code:
587586
description: 'The status code of a redirect.
588-
The allowed values are: 301 , 302 , 307
589-
, 308. The default is 301.'
587+
The allowed values are: 301, 302, 307
588+
or 308. The default is 301.'
590589
type: integer
591590
url:
592591
description: 'The URL to redirect the request
593-
to. Supported NGINX variables: $scheme
594-
, $http_x_forwarded_proto , $request_uri
595-
, $host. Variables must be enclosed in
592+
to. Supported NGINX variables: $scheme,
593+
$http_x_forwarded_proto, $request_uri
594+
or $host. Variables must be enclosed in
596595
curly braces. For example: ${host}${request_uri}.'
597596
type: string
598597
type: object
@@ -783,13 +782,13 @@ spec:
783782
properties:
784783
code:
785784
description: 'The status code of a redirect. The
786-
allowed values are: 301 , 302 , 307 , 308. The
785+
allowed values are: 301, 302, 307 or 308. The
787786
default is 301.'
788787
type: integer
789788
url:
790789
description: 'The URL to redirect the request
791-
to. Supported NGINX variables: $scheme , $http_x_forwarded_proto
792-
, $request_uri , $host. Variables must be enclosed
790+
to. Supported NGINX variables: $scheme, $http_x_forwarded_proto,
791+
$request_uri or $host. Variables must be enclosed
793792
in curly braces. For example: ${host}${request_uri}.'
794793
type: string
795794
type: object

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

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -265,13 +265,12 @@ spec:
265265
properties:
266266
code:
267267
description: 'The status code of a redirect. The allowed
268-
values are: 301 , 302 , 307 , 308. The default is
269-
301.'
268+
values are: 301, 302, 307 or 308. The default is 301.'
270269
type: integer
271270
url:
272271
description: 'The URL to redirect the request to. Supported
273-
NGINX variables: $scheme , $http_x_forwarded_proto
274-
, $request_uri , $host. Variables must be enclosed
272+
NGINX variables: $scheme, $http_x_forwarded_proto,
273+
$request_uri or $host. Variables must be enclosed
275274
in curly braces. For example: ${host}${request_uri}.'
276275
type: string
277276
type: object
@@ -331,13 +330,13 @@ spec:
331330
properties:
332331
code:
333332
description: 'The status code of a redirect. The allowed
334-
values are: 301 , 302 , 307 , 308. The default is
333+
values are: 301, 302, 307 or 308. The default is
335334
301.'
336335
type: integer
337336
url:
338337
description: 'The URL to redirect the request to.
339-
Supported NGINX variables: $scheme , $http_x_forwarded_proto
340-
, $request_uri , $host. Variables must be enclosed
338+
Supported NGINX variables: $scheme, $http_x_forwarded_proto,
339+
$request_uri or $host. Variables must be enclosed
341340
in curly braces. For example: ${host}${request_uri}.'
342341
type: string
343342
type: object
@@ -487,13 +486,13 @@ spec:
487486
properties:
488487
code:
489488
description: 'The status code of a redirect. The
490-
allowed values are: 301 , 302 , 307 , 308. The
489+
allowed values are: 301, 302, 307 or 308. The
491490
default is 301.'
492491
type: integer
493492
url:
494493
description: 'The URL to redirect the request
495-
to. Supported NGINX variables: $scheme , $http_x_forwarded_proto
496-
, $request_uri , $host. Variables must be enclosed
494+
to. Supported NGINX variables: $scheme, $http_x_forwarded_proto,
495+
$request_uri or $host. Variables must be enclosed
497496
in curly braces. For example: ${host}${request_uri}.'
498497
type: string
499498
type: object
@@ -672,14 +671,14 @@ spec:
672671
properties:
673672
code:
674673
description: 'The status code of a redirect.
675-
The allowed values are: 301 , 302 , 307
676-
, 308. The default is 301.'
674+
The allowed values are: 301, 302, 307
675+
or 308. The default is 301.'
677676
type: integer
678677
url:
679678
description: 'The URL to redirect the request
680-
to. Supported NGINX variables: $scheme
681-
, $http_x_forwarded_proto , $request_uri
682-
, $host. Variables must be enclosed in
679+
to. Supported NGINX variables: $scheme,
680+
$http_x_forwarded_proto, $request_uri
681+
or $host. Variables must be enclosed in
683682
curly braces. For example: ${host}${request_uri}.'
684683
type: string
685684
type: object
@@ -870,13 +869,13 @@ spec:
870869
properties:
871870
code:
872871
description: 'The status code of a redirect. The
873-
allowed values are: 301 , 302 , 307 , 308. The
872+
allowed values are: 301, 302, 307 or 308. The
874873
default is 301.'
875874
type: integer
876875
url:
877876
description: 'The URL to redirect the request
878-
to. Supported NGINX variables: $scheme , $http_x_forwarded_proto
879-
, $request_uri , $host. Variables must be enclosed
877+
to. Supported NGINX variables: $scheme, $http_x_forwarded_proto,
878+
$request_uri or $host. Variables must be enclosed
880879
in curly braces. For example: ${host}${request_uri}.'
881880
type: string
882881
type: object

0 commit comments

Comments
 (0)