Skip to content

Commit 7061c2d

Browse files
committed
fix: fix broken link
Merge pull request #1949 from nginxinc/DOCOPS-238 fix: fix broken link DOCOPS-238 fix: reword 'here' link to provide more context Merge pull request #1954 from nginxinc/DOCOPS-238b Docops 238b - reword link fix: link examples to git DOCOPS-228 fix: point to the release branch fix: revert change to non-example link fix: revert tree to blob as required fix: tree and blob urls Merge pull request #1959 from nginxinc/DOCS-228 fix: DOCOPS-228 fix links to examples
1 parent e77fef2 commit 7061c2d

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

docs/content/configuration/transportserver-resource.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ toc: true
99

1010
The TransportServer resource allows you to configure TCP, UDP, and TLS Passthrough load balancing. The resource is implemented as a [Custom Resource](https://kubernetes.io/docs/concepts/extend-kubernetes/api-extension/custom-resources/).
1111

12-
This document is the reference documentation for the TransportServer resource. To see additional examples of using the resource for specific use cases, go to the [examples-of-custom-resources](https://github.com/nginxinc/kubernetes-ingress/blob/v1.12.1/examples-of-custom-resources) folder in our GitHub repo.
12+
This document is the reference documentation for the TransportServer resource. To see additional examples of using the resource for specific use cases, go to the [examples-of-custom-resources](https://github.com/nginxinc/kubernetes-ingress/tree/v1.12.1/examples-of-custom-resources) folder in our GitHub repo.
1313

1414
> **Feature Status**: The TransportServer resource is available as a preview feature: it is suitable for experimenting and testing; however, it must be used with caution in production environments. Additionally, while the feature is in preview, we might introduce some backward-incompatible changes to the resource specification in the next releases.
1515

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ toc: true
1111

1212
The VirtualServer and VirtualServerRoute resources are new load balancing configuration, introduced in release 1.5 as an alternative to the Ingress resource. The resources enable use cases not supported with the Ingress resource, such as traffic splitting and advanced content-based routing. The resources are implemented as [Custom Resources](https://kubernetes.io/docs/concepts/extend-kubernetes/api-extension/custom-resources/).
1313

14-
This document is the reference documentation for the resources. To see additional examples of using the resources for specific use cases, go to the [examples-of-custom-resources](https://github.com/nginxinc/kubernetes-ingress/blob/v1.12.1/examples-of-custom-resources) folder in our GitHub repo.
14+
This document is the reference documentation for the resources. To see additional examples of using the resources for specific use cases, go to the [examples-of-custom-resources](https://github.com/nginxinc/kubernetes-ingress/tree/v1.12.1/examples-of-custom-resources) folder in our GitHub repo.
1515

1616
## VirtualServer Specification
1717

docs/content/intro/nginx-ingress-controllers.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ If you are unsure about which implementation you are using, check the container
1818

1919
## The Key Differences
2020

21-
The table below summarizes the key difference between nginxinc/kubernetes-ingress and kubernetes/ingress-nginx Ingress controllers. Note that the table has two columns for the nginxinc/kubernetes-ingress Ingress controller, as it can be used both with NGINX and NGINX Plus. For more information about nginxinc/kubernetes-ingress with NGINX Plus, read [here](nginx-plus.md).
21+
The table below summarizes the key difference between nginxinc/kubernetes-ingress and kubernetes/ingress-nginx Ingress controllers. Note that the table has two columns for the nginxinc/kubernetes-ingress Ingress controller, as it can be used both with NGINX and NGINX Plus. For more information about nginxinc/kubernetes-ingress with NGINX Plus, read the [NGINX Ingress Controller with NGINX Plus](/nginx-ingress-controller/intro/nginx-plus) documentation.
2222

2323
{{% table %}}
2424
| Aspect or Feature | kubernetes/ingress-nginx | nginxinc/kubernetes-ingress with NGINX | nginxinc/kubernetes-ingress with NGINX Plus |
@@ -28,11 +28,11 @@ The table below summarizes the key difference between nginxinc/kubernetes-ingres
2828
| NGINX version | [Custom](https://github.com/kubernetes/ingress-nginx/tree/master/images/nginx) NGINX build that includes several third-party modules | NGINX official mainline [build](https://github.com/nginxinc/docker-nginx) | NGINX Plus |
2929
| Commercial support | N/A | N/A | Included |
3030
| **Load balancing configuration via the Ingress resource** |
31-
| Merging Ingress rules with the same host | Supported | Supported via [Mergeable Ingresses](../examples/mergeable-ingress-types) | Supported via [Mergeable Ingresses](../examples/mergeable-ingress-types) |
31+
| Merging Ingress rules with the same host | Supported | Supported via [Mergeable Ingresses](https://github.com/nginxinc/kubernetes-ingress/tree/v1.12.1/examples/mergeable-ingress-types) | Supported via [Mergeable Ingresses](https://github.com/nginxinc/kubernetes-ingress/tree/v1.12.1/examples/mergeable-ingress-types) |
3232
| HTTP load balancing extensions - Annotations | See the [supported annotations](https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/annotations/) | See the [supported annotations](https://docs.nginx.com/nginx-ingress-controller/configuration/ingress-resources/advanced-configuration-with-annotations/) | See the [supported annotations](https://docs.nginx.com/nginx-ingress-controller/configuration/ingress-resources/advanced-configuration-with-annotations/)|
3333
| HTTP load balancing extensions -- ConfigMap | See the [supported ConfigMap keys](https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/configmap/) | See the [supported ConfigMap keys](https://docs.nginx.com/nginx-ingress-controller/configuration/global-configuration/configmap-resource/) | See the [supported ConfigMap keys](https://docs.nginx.com/nginx-ingress-controller/configuration/global-configuration/configmap-resource/) |
3434
| TCP/UDP | Supported via a ConfigMap | Supported via custom resources | Supported via custom resources |
35-
| Websocket | Supported | Supported via an [annotation](../examples/websocket) | Supported via an [annotation](../examples/websocket) |
35+
| Websocket | Supported | Supported via an [annotation](https://github.com/nginxinc/kubernetes-ingress/tree/v1.12.1/examples/websocket) | Supported via an [annotation](https://github.com/nginxinc/kubernetes-ingress/tree/v1.12.1/examples/websocket) |
3636
| TCP SSL Passthrough | Supported via a ConfigMap | Supported via custom resources | Supported via custom resources |
3737
| JWT validation | Not supported | Not supported | Supported |
3838
| Session persistence | Supported via a third-party module | Not supported | Supported |

docs/content/intro/nginx-plus.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ Below are the key characteristics that NGINX Plus brings on top of NGINX into th
1717

1818
* *Real-time metrics* A number metrics about how NGINX Plus and applications are performing are available through the API or a [built-in dashboard](https://docs.nginx.com/nginx-ingress-controller/logging-and-monitoring/status-page/). Optionally, the metrics can be exported to [Prometheus](https://docs.nginx.com/nginx-ingress-controller/logging-and-monitoring/prometheus/).
1919
* *Additional load balancing methods*. The following additional methods are available: `least_time` and `random two least_time` and their derivatives. See the [documentation](https://nginx.org/en/docs/http/ngx_http_upstream_module.html) for the complete list of load balancing methods.
20-
* *Session persistence* The *sticky cookie* method is available. See the [Session Persistence](../examples/session-persistence) example.
21-
* *Active health checks*. See the [Support for Active Health Checks](../examples/health-checks) example.
22-
* *JWT validation*. See the [Support for JSON Web Tokens (JWTs)](../examples/jwt) example.
20+
* *Session persistence* The *sticky cookie* method is available. See the [Session Persistence](https://github.com/nginxinc/kubernetes-ingress/tree/v1.12.1/examples/session-persistence) example.
21+
* *Active health checks*. See the [Support for Active Health Checks](https://github.com/nginxinc/kubernetes-ingress/tree/v1.12.1/examples/health-checks) example.
22+
* *JWT validation*. See the [Support for JSON Web Tokens (JWTs)](https://github.com/nginxinc/kubernetes-ingress/tree/v1.12.1/examples/jwt) example.
2323

2424
See [ConfigMap](https://docs.nginx.com/nginx-ingress-controller/configuration/global-configuration/configmap-resource/) and [Annotations](https://docs.nginx.com/nginx-ingress-controller/configuration/ingress-resources/advanced-configuration-with-annotations/) doc for the complete list of available NGINX Plus features. Note that such features are configured through annotations that start with `nginx.com`, for example, `nginx.com/health-checks`.
2525

0 commit comments

Comments
 (0)