Skip to content

Commit 3d4790f

Browse files
testing precommit
1 parent 7a9b64b commit 3d4790f

8 files changed

+20
-18
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ spec:
160160
description: Sets the number of unsuccessful attempts to communicate
161161
with the server that should happen in the duration set by
162162
the failTimeout parameter to consider the server unavailable.
163-
The default 1.
163+
The default is 1.
164164
type: string
165165
healthCheck:
166166
description: 'The health check configuration for the Upstream.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -842,7 +842,7 @@ spec:
842842
backup:
843843
description: 'The name of the backup service of type ExternalName.
844844
This will be used when the primary servers are unavailable.
845-
Note: The parameter cannot be used along with the random ,
845+
Note: The parameter cannot be used along with the random,
846846
hash or ip_hash load balancing methods.'
847847
type: string
848848
backupPort:
@@ -1139,7 +1139,7 @@ spec:
11391139
been recovered or became available or when the server becomes
11401140
available after a period of time it was considered unavailable.
11411141
By default, the slow start is disabled. Note: The parameter
1142-
cannot be used along with the random , hash or ip_hash load
1142+
cannot be used along with the random, hash or ip_hash load
11431143
balancing methods and will be ignored.'
11441144
type: string
11451145
subselector:

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1004,7 +1004,7 @@ spec:
10041004
type: string
10051005
code:
10061006
description: 'The status code of a redirect. The allowed values
1007-
are: 301 , 302 , 307 , 308. The default is 301.'
1007+
are: 301, 302, 307 or 308. The default is 301.'
10081008
type: integer
10091009
enable:
10101010
description: Enables a TLS redirect for a VirtualServer. The
@@ -1031,7 +1031,7 @@ spec:
10311031
backup:
10321032
description: 'The name of the backup service of type ExternalName.
10331033
This will be used when the primary servers are unavailable.
1034-
Note: The parameter cannot be used along with the random ,
1034+
Note: The parameter cannot be used along with the random,
10351035
hash or ip_hash load balancing methods.'
10361036
type: string
10371037
backupPort:
@@ -1328,7 +1328,7 @@ spec:
13281328
been recovered or became available or when the server becomes
13291329
available after a period of time it was considered unavailable.
13301330
By default, the slow start is disabled. Note: The parameter
1331-
cannot be used along with the random , hash or ip_hash load
1331+
cannot be used along with the random, hash or ip_hash load
13321332
balancing methods and will be ignored.'
13331333
type: string
13341334
subselector:

deploy/crds.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -814,7 +814,7 @@ spec:
814814
description: Sets the number of unsuccessful attempts to communicate
815815
with the server that should happen in the duration set by
816816
the failTimeout parameter to consider the server unavailable.
817-
The default 1.
817+
The default is 1.
818818
type: string
819819
healthCheck:
820820
description: 'The health check configuration for the Upstream.
@@ -1775,7 +1775,7 @@ spec:
17751775
backup:
17761776
description: 'The name of the backup service of type ExternalName.
17771777
This will be used when the primary servers are unavailable.
1778-
Note: The parameter cannot be used along with the random ,
1778+
Note: The parameter cannot be used along with the random,
17791779
hash or ip_hash load balancing methods.'
17801780
type: string
17811781
backupPort:
@@ -2072,7 +2072,7 @@ spec:
20722072
been recovered or became available or when the server becomes
20732073
available after a period of time it was considered unavailable.
20742074
By default, the slow start is disabled. Note: The parameter
2075-
cannot be used along with the random , hash or ip_hash load
2075+
cannot be used along with the random, hash or ip_hash load
20762076
balancing methods and will be ignored.'
20772077
type: string
20782078
subselector:
@@ -3161,7 +3161,7 @@ spec:
31613161
type: string
31623162
code:
31633163
description: 'The status code of a redirect. The allowed values
3164-
are: 301 , 302 , 307 , 308. The default is 301.'
3164+
are: 301, 302, 307 or 308. The default is 301.'
31653165
type: integer
31663166
enable:
31673167
description: Enables a TLS redirect for a VirtualServer. The
@@ -3188,7 +3188,7 @@ spec:
31883188
backup:
31893189
description: 'The name of the backup service of type ExternalName.
31903190
This will be used when the primary servers are unavailable.
3191-
Note: The parameter cannot be used along with the random ,
3191+
Note: The parameter cannot be used along with the random,
31923192
hash or ip_hash load balancing methods.'
31933193
type: string
31943194
backupPort:
@@ -3485,7 +3485,7 @@ spec:
34853485
been recovered or became available or when the server becomes
34863486
available after a period of time it was considered unavailable.
34873487
By default, the slow start is disabled. Note: The parameter
3488-
cannot be used along with the random , hash or ip_hash load
3488+
cannot be used along with the random, hash or ip_hash load
34893489
balancing methods and will be ignored.'
34903490
type: string
34913491
subselector:

docs/crd/k8s.nginx.org_policies.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ The `.spec` object supports the following fields:
4747
| `jwt.keyCache` | `string` | Enables in-memory caching of JWKS (JSON Web Key Sets) that are obtained from the jwksURI and sets a valid time for expiration. |
4848
| `jwt.realm` | `string` | The realm of the JWT. |
4949
| `jwt.secret` | `string` | The name of the Kubernetes secret that stores the Htpasswd configuration. It must be in the same namespace as the Policy resource. The secret must be of the type nginx.org/htpasswd, and the config must be stored in the secret under the key htpasswd, otherwise the secret will be rejected as invalid. |
50+
| `jwt.sniEnabled` | `boolean` | Enables SNI (Server Name Indication) for the JWT policy. This is useful when the remote server requires SNI to serve the correct certificate. |
51+
| `jwt.sniName` | `string` | The SNI name to use when connecting to the remote server. If not set, the hostname from the ``jwksURI`` will be used. |
5052
| `jwt.token` | `string` | The token specifies a variable that contains the JSON Web Token. By default the JWT is passed in the Authorization header as a Bearer Token. JWT may be also passed as a cookie or a part of a query string, for example: $cookie_auth_token. Accepted variables are $http_, $arg_, $cookie_. |
5153
| `oidc` | `object` | The OpenID Connect policy configures NGINX to authenticate client requests by validating a JWT token against an OAuth2/OIDC token provider, such as Auth0 or Keycloak. |
5254
| `oidc.accessTokenEnable` | `boolean` | Option of whether Bearer token is used to authorize NGINX to access protected backend. |

docs/crd/k8s.nginx.org_transportservers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ The `.spec` object supports the following fields:
3838
| `upstreams` | `array` | A list of upstreams. |
3939
| `upstreams[].backup` | `string` | The name of the backup service of type ExternalName. This will be used when the primary servers are unavailable. Note: The parameter cannot be used along with the random, hash or ip_hash load balancing methods. |
4040
| `upstreams[].backupPort` | `integer` | The port of the backup service. The backup port is required if the backup service name is provided. The port must fall into the range 1..65535. |
41-
| `upstreams[].failTimeout` | `string` | Sets the number of unsuccessful attempts to communicate with the server that should happen in the duration set by the failTimeout parameter to consider the server unavailable. The default 1. |
41+
| `upstreams[].failTimeout` | `string` | Sets the number of unsuccessful attempts to communicate with the server that should happen in the duration set by the failTimeout parameter to consider the server unavailable. The default is 1. |
4242
| `upstreams[].healthCheck` | `object` | The health check configuration for the Upstream. Note: this feature is supported only in NGINX Plus. |
4343
| `upstreams[].healthCheck.enable` | `boolean` | Enables a health check for an upstream server. The default is false. |
4444
| `upstreams[].healthCheck.fails` | `integer` | The number of consecutive failed health checks of a particular upstream server after which this server will be considered unhealthy. The default is 1. |

docs/crd/k8s.nginx.org_virtualserverroutes.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ The `.spec` object supports the following fields:
161161
| `subroutes[].splits[].action.return.type` | `string` | The MIME type of the response. The default is text/plain. |
162162
| `subroutes[].splits[].weight` | `integer` | The weight of an action. Must fall into the range 0..100. The sum of the weights of all splits must be equal to 100. |
163163
| `upstreams` | `array` | A list of upstreams. |
164-
| `upstreams[].backup` | `string` | The name of the backup service of type ExternalName. This will be used when the primary servers are unavailable. Note: The parameter cannot be used along with the random , hash or ip_hash load balancing methods. |
164+
| `upstreams[].backup` | `string` | The name of the backup service of type ExternalName. This will be used when the primary servers are unavailable. Note: The parameter cannot be used along with the random, hash or ip_hash load balancing methods. |
165165
| `upstreams[].backupPort` | `integer` | The port of the backup service. The backup port is required if the backup service name is provided. The port must fall into the range 1..65535. |
166166
| `upstreams[].buffer-size` | `string` | Sets the size of the buffer used for reading the first part of a response received from the upstream server. The default is set in the proxy-buffer-size ConfigMap key. |
167167
| `upstreams[].buffering` | `boolean` | Enables buffering of responses from the upstream server. The default is set in the proxy-buffering ConfigMap key. |
@@ -218,7 +218,7 @@ The `.spec` object supports the following fields:
218218
| `upstreams[].sessionCookie.path` | `string` | The path for which the cookie is set. |
219219
| `upstreams[].sessionCookie.samesite` | `string` | Adds the SameSite attribute to the cookie. The allowed values are: strict, lax, none |
220220
| `upstreams[].sessionCookie.secure` | `boolean` | Adds the Secure attribute to the cookie. |
221-
| `upstreams[].slow-start` | `string` | The slow start allows an upstream server to gradually recover its weight from 0 to its nominal value after it has been recovered or became available or when the server becomes available after a period of time it was considered unavailable. By default, the slow start is disabled. Note: The parameter cannot be used along with the random , hash or ip_hash load balancing methods and will be ignored. |
221+
| `upstreams[].slow-start` | `string` | The slow start allows an upstream server to gradually recover its weight from 0 to its nominal value after it has been recovered or became available or when the server becomes available after a period of time it was considered unavailable. By default, the slow start is disabled. Note: The parameter cannot be used along with the random, hash or ip_hash load balancing methods and will be ignored. |
222222
| `upstreams[].subselector` | `object` | Selects the pods within the service using label keys and values. By default, all pods of the service are selected. Note: the specified labels are expected to be present in the pods when they are created. If the pod labels are updated, NGINX Ingress Controller will not see that change until the number of the pods is changed. |
223223
| `upstreams[].tls` | `object` | The TLS configuration for the Upstream. |
224224
| `upstreams[].tls.enable` | `boolean` | Enables HTTPS for requests to upstream servers. The default is False , meaning that HTTP will be used. Note: by default, NGINX will not verify the upstream server certificate. To enable the verification, configure an EgressMTLS Policy. |

docs/crd/k8s.nginx.org_virtualservers.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,11 +192,11 @@ The `.spec` object supports the following fields:
192192
| `tls.cert-manager.usages` | `string` | This field allows you to configure spec.usages field for the Certificate to be generated. Pass a string with comma-separated values i.e. key agreement,digital signature, server auth. An exhaustive list of supported key usages can be found in the the cert-manager api documentation. |
193193
| `tls.redirect` | `object` | The redirect configuration of the TLS for a VirtualServer. |
194194
| `tls.redirect.basedOn` | `string` | The attribute of a request that NGINX will evaluate to send a redirect. The allowed values are scheme (the scheme of the request) or x-forwarded-proto (the X-Forwarded-Proto header of the request). The default is scheme. |
195-
| `tls.redirect.code` | `integer` | The status code of a redirect. The allowed values are: 301 , 302 , 307 , 308. The default is 301. |
195+
| `tls.redirect.code` | `integer` | The status code of a redirect. The allowed values are: 301, 302, 307 or 308. The default is 301. |
196196
| `tls.redirect.enable` | `boolean` | Enables a TLS redirect for a VirtualServer. The default is False. |
197197
| `tls.secret` | `string` | The name of a secret with a TLS certificate and key. The secret must belong to the same namespace as the VirtualServer. The secret must be of the type kubernetes.io/tls and contain keys named tls.crt and tls.key that contain the certificate and private key as described here. If the secret doesn’t exist or is invalid, NGINX will break any attempt to establish a TLS connection to the host of the VirtualServer. If the secret is not specified but wildcard TLS secret is configured, NGINX will use the wildcard secret for TLS termination. |
198198
| `upstreams` | `array` | A list of upstreams. |
199-
| `upstreams[].backup` | `string` | The name of the backup service of type ExternalName. This will be used when the primary servers are unavailable. Note: The parameter cannot be used along with the random , hash or ip_hash load balancing methods. |
199+
| `upstreams[].backup` | `string` | The name of the backup service of type ExternalName. This will be used when the primary servers are unavailable. Note: The parameter cannot be used along with the random, hash or ip_hash load balancing methods. |
200200
| `upstreams[].backupPort` | `integer` | The port of the backup service. The backup port is required if the backup service name is provided. The port must fall into the range 1..65535. |
201201
| `upstreams[].buffer-size` | `string` | Sets the size of the buffer used for reading the first part of a response received from the upstream server. The default is set in the proxy-buffer-size ConfigMap key. |
202202
| `upstreams[].buffering` | `boolean` | Enables buffering of responses from the upstream server. The default is set in the proxy-buffering ConfigMap key. |
@@ -253,7 +253,7 @@ The `.spec` object supports the following fields:
253253
| `upstreams[].sessionCookie.path` | `string` | The path for which the cookie is set. |
254254
| `upstreams[].sessionCookie.samesite` | `string` | Adds the SameSite attribute to the cookie. The allowed values are: strict, lax, none |
255255
| `upstreams[].sessionCookie.secure` | `boolean` | Adds the Secure attribute to the cookie. |
256-
| `upstreams[].slow-start` | `string` | The slow start allows an upstream server to gradually recover its weight from 0 to its nominal value after it has been recovered or became available or when the server becomes available after a period of time it was considered unavailable. By default, the slow start is disabled. Note: The parameter cannot be used along with the random , hash or ip_hash load balancing methods and will be ignored. |
256+
| `upstreams[].slow-start` | `string` | The slow start allows an upstream server to gradually recover its weight from 0 to its nominal value after it has been recovered or became available or when the server becomes available after a period of time it was considered unavailable. By default, the slow start is disabled. Note: The parameter cannot be used along with the random, hash or ip_hash load balancing methods and will be ignored. |
257257
| `upstreams[].subselector` | `object` | Selects the pods within the service using label keys and values. By default, all pods of the service are selected. Note: the specified labels are expected to be present in the pods when they are created. If the pod labels are updated, NGINX Ingress Controller will not see that change until the number of the pods is changed. |
258258
| `upstreams[].tls` | `object` | The TLS configuration for the Upstream. |
259259
| `upstreams[].tls.enable` | `boolean` | Enables HTTPS for requests to upstream servers. The default is False , meaning that HTTP will be used. Note: by default, NGINX will not verify the upstream server certificate. To enable the verification, configure an EgressMTLS Policy. |

0 commit comments

Comments
 (0)