Skip to content

Commit 13f5798

Browse files
committed
Undo empty line fixes
1 parent 6ad0aeb commit 13f5798

File tree

3 files changed

+1
-17
lines changed

3 files changed

+1
-17
lines changed

content/includes/nic/compatibility-tables/nic-nap.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ NGINX Ingress Controller supports the following versions of [F5 WAF for NGINX](h
1212

1313
| NIC Version | NAP-WAF Version | Config Manager | Enforcer |
1414
| ------------------- | --------------- | -------------- | -------- |
15-
| {{< nic-version >}} | 36+{{< appprotect-compiler-version>}} | {{< nic-waf-release-version >}} | {{< nic-waf-release-version >}} |
15+
| {{< nic-version >}} | 36+{{< appprotect-compiler-version>}} | {{< nic-waf-release-version >}} | {{< nic-waf-release-version >}} |
1616
| 5.2.1 | 35+5.527.0 | 5.9.0 | 5.9.0 |
1717
| 5.1.1 | 35+5.498 | 5.8.0 | 5.8.0 |
1818
| 5.0.0 | 34+5.342 | 5.6.0 | 5.6.0 |

content/nic/configuration/virtualserver-and-virtualserverroute-resources.md

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@ cert-manager:
126126
|``issue-temp-cert`` | When ``true``, ask cert-manager for a [temporary self-signed certificate](https://cert-manager.io/docs/usage/certificate/#temporary-certificates-while-issuing) pending the issuance of the Certificate. This allows HTTPS-only servers to use ACME HTTP01 challenges when the TLS secret does not exist yet. | ``boolean`` | No |
127127

128128
### VirtualServer.Listener
129-
130129
The listener field defines a custom HTTP and/or HTTPS listener.
131130
The respective listeners used must reference the name of a listener defined using a [GlobalConfiguration]({{< ref "/nic/configuration/global-configuration/globalconfiguration-resource.md" >}}) resource.
132131
For example:
@@ -197,7 +196,6 @@ The route defines rules for matching client requests to actions like passing a r
197196
```
198197

199198
{{< table >}}
200-
201199
|Field | Description | Type | Required |
202200
| ---| ---| ---| --- |
203201
|``path`` | The path of the route. NGINX will match it against the URI of a request. Possible values are: a prefix ( ``/`` , ``/path`` ), an exact match ( ``=/exact/match`` ), a case insensitive regular expression ( ``~*^/Bar.*\.jpg`` ) or a case sensitive regular expression ( ``~^/foo.*\.jpg`` ). In the case of a prefix (must start with ``/`` ) or an exact match (must start with ``=`` ), the path must not include any whitespace characters, ``{`` , ``}`` or ``;``. In the case of the regex matches, all double quotes ``"`` must be escaped and the match can't end in an unescaped backslash ``\``. The path must be unique among the paths of all routes of the VirtualServer. Check the [location](https://nginx.org/en/docs/http/ngx_http_core_module.html#location) directive for more information. | ``string`` | Yes |
@@ -209,7 +207,6 @@ The route defines rules for matching client requests to actions like passing a r
209207
|``route`` | The name of a VirtualServerRoute resource that defines this route. If the VirtualServerRoute belongs to a different namespace than the VirtualServer, you need to include the namespace. For example, ``tea-namespace/tea``. | ``string`` | No |
210208
|``errorPages`` | The custom responses for error codes. NGINX will use those responses instead of returning the error responses from the upstream servers or the default responses generated by NGINX. A custom response can be a redirect or a canned response. For example, a redirect to another URL if an upstream server responded with a 404 status code. | [[]errorPage](#errorpage) | No |
211209
|``location-snippets`` | Sets a custom snippet in the location context. Overrides the ``location-snippets`` ConfigMap key. | ``string`` | No |
212-
213210
{{< /table >}}
214211

215212
\* -- a route must include exactly one of the following: `action`, `splits`, or `route`.
@@ -288,7 +285,6 @@ action:
288285
```
289286

290287
{{< table >}}
291-
292288
|Field | Description | Type | Required |
293289
| ---| ---| ---| --- |
294290
|``path`` | The path of the subroute. NGINX will match it against the URI of a request. Possible values are: a prefix ( ``/`` , ``/path`` ), an exact match ( ``=/exact/match`` ), a case insensitive regular expression ( ``~*^/Bar.*\.jpg`` ) or a case sensitive regular expression ( ``~^/foo.*\.jpg`` ). In the case of a prefix, the path must start with the same path as the path of the route of the VirtualServer that references this resource. In the case of an exact or regex match, the path must be the same as the path of the route of the VirtualServer that references this resource. A matching path of the route of the VirtualServer but in different type is not accepted, e.g. a regex path (`~/match`) cannot be used with a prefix path in VirtualServer (`/match`) In the case of a prefix or an exact match, the path must not include any whitespace characters, ``{`` , ``}`` or ``;``. In the case of the regex matches, all double quotes ``"`` must be escaped and the match can't end in an unescaped backslash ``\``. The path must be unique among the paths of all subroutes of the VirtualServerRoute. | ``string`` | Yes |
@@ -299,7 +295,6 @@ action:
299295
|``matches`` | The matching rules for advanced content-based routing. Requires the default ``action`` or ``splits``. Unmatched requests will be handled by the default ``action`` or ``splits``. | [matches](#match) | No |
300296
|``errorPages`` | The custom responses for error codes. NGINX will use those responses instead of returning the error responses from the upstream servers or the default responses generated by NGINX. A custom response can be a redirect or a canned response. For example, a redirect to another URL if an upstream server responded with a 404 status code. | [[]errorPage](#errorpage) | No |
301297
|``location-snippets`` | Sets a custom snippet in the location context. Overrides the ``location-snippets`` of the VirtualServer (if set) or the ``location-snippets`` ConfigMap key. | ``string`` | No |
302-
303298
{{< /table >}}
304299

305300
\* -- a subroute must include exactly one of the following: `action` or `splits`.
@@ -335,7 +330,6 @@ tls:
335330
**Note**: The WebSocket protocol is supported without any additional configuration.
336331

337332
{{< table >}}
338-
339333
|Field | Description | Type | Required |
340334
| ---| ---| ---| --- |
341335
|``name`` | The name of the upstream. Must be a valid DNS label as defined in RFC 1035. For example, ``hello`` and ``upstream-123`` are valid. The name must be unique among all upstreams of the resource. | ``string`` | Yes |
@@ -368,7 +362,6 @@ tls:
368362
|``type`` |The type of the upstream. Supported values are ``http`` and ``grpc``. The default is ``http``. For gRPC, it is necessary to enable HTTP/2 in the [ConfigMap]({{< ref "/nic/configuration/global-configuration/configmap-resource.md#listeners" >}}) and configure TLS termination in the VirtualServer. | ``string`` | No |
369363
|``backup`` | The name of the backup service of type [ExternalName](https://kubernetes.io/docs/concepts/services-networking/service/#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. | ``string`` | No |
370364
|``backupPort`` | 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``. | ``uint16`` | No |
371-
372365
{{< /table >}}
373366

374367
### Upstream.Buffers
@@ -877,7 +870,6 @@ For example, the following command creates a VirtualServer resource defined in `
877870
```shell
878871
kubectl apply -f cafe-virtual-server.yaml
879872
```
880-
881873
```text
882874
virtualserver.k8s.nginx.org "cafe" created
883875
```
@@ -887,7 +879,6 @@ You can get the resource by running:
887879
```shell
888880
kubectl get virtualserver cafe
889881
```
890-
891882
```text
892883
NAME STATE HOST IP PORTS AGE
893884
cafe Valid cafe.example.com 12.13.23.123 [80,443] 3m
@@ -955,7 +946,6 @@ If you try to create (or update) a resource that violates the structural schema
955946
```shell
956947
kubectl apply -f cafe-virtual-server.yaml
957948
```
958-
959949
```text
960950
error: error validating "cafe-virtual-server.yaml": error validating data: ValidationError(VirtualServer.spec.upstreams[0].port): invalid type for org.nginx.k8s.v1.VirtualServer.spec.upstreams.port: got "string", expected "integer"; if you choose to ignore these errors, turn validation off with --validate=false
961951
```
@@ -965,7 +955,6 @@ If you try to create (or update) a resource that violates the structural schema
965955
```shell
966956
kubectl apply -f cafe-virtual-server.yaml --validate=false
967957
```
968-
969958
```text
970959
The VirtualServer "cafe" is invalid: []: Invalid value: map[string]interface {}{ ... }: validation failure list:
971960
spec.upstreams.port in body must be of type integer: "string"
@@ -982,7 +971,6 @@ You can check if NGINX Ingress Controller successfully applied the configuration
982971
```shell
983972
kubectl describe vs cafe
984973
```
985-
986974
```text
987975
...
988976
Events:
@@ -998,7 +986,6 @@ If you create an invalid resource, NGINX Ingress Controller will reject it and e
998986
```shell
999987
kubectl describe vs cafe
1000988
```
1001-
1002989
```text
1003990
...
1004991
Events:

content/nic/install/migrate-ingress-nginx.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -505,15 +505,12 @@ NGINX Ingress Controller has additional annotations for features using NGINX Plu
505505
The following table outlines annotation conversions for enabling TLS and gRPC protocols to backend (upstream) services.
506506

507507
{{< table >}}
508-
509508
| Ingress-NGINX Controller | NGINX Ingress Controller |
510509
| ------------------------ | ------------------------ |
511510
| [_nginx.ingress.kubernetes.io/backend-protocol_](https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/annotations/#backend-protocol): "HTTPS" | [_nginx.org/ssl-services_]({{< ref "/nic/configuration/ingress-resources/advanced-configuration-with-annotations.md#backend-services-upstreams" >}}): "ssl_service_name" |
512511
| [_nginx.ingress.kubernetes.io/backend-protocol_](https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/annotations/#backend-protocol): "GRPC" | [_nginx.org/grpc-services_]({{< ref "/nic/configuration/ingress-resources/advanced-configuration-with-annotations.md#backend-services-upstreams" >}}): "grpc_service_name" |
513512
| [_nginx.ingress.kubernetes.io/backend-protocol_](https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/annotations/#backend-protocol): "GRPCS" | [_nginx.org/ssl-services_]({{< ref "/nic/configuration/ingress-resources/advanced-configuration-with-annotations.md#backend-services-upstreams" >}}): "grpc_service_name"<br />[_nginx.org/grpc-services_]({{< ref "/nic/configuration/ingress-resources/advanced-configuration-with-annotations.md#backend-services-upstreams" >}}): "grpc_service_name" |
514-
515513
{{< /table >}}
516-
517514
{{< call-out "important" >}}
518515
GRPC services require Ingresses with TLS termination and HTTP/2 enabled (see [_http2 ConfigMap key_]({{< ref "/nic/configuration/global-configuration/configmap-resource.md#listeners" >}})).
519516
{{< /call-out >}}

0 commit comments

Comments
 (0)