Move custom-resources with other examples

.github/release-drafter.yml

@@ -89,6 +89,6 @@ template: |
   ## Resources
 
   - Documentation -- https://docs.nginx.com/nginx-ingress-controller/
-  - Configuration examples -- https://github.com/nginxinc/kubernetes-ingress/tree/v$RESOLVED_VERSION/examples and https://github.com/nginxinc/kubernetes-ingress/tree/v$RESOLVED_VERSION/examples-of-custom-resources
+  - Configuration examples -- https://github.com/nginxinc/kubernetes-ingress/tree/v$RESOLVED_VERSION/examples
   - Helm Chart -- https://github.com/nginxinc/kubernetes-ingress/tree/v$RESOLVED_VERSION/deployments/helm-chart
   - Operator -- https://github.com/nginxinc/nginx-ingress-operator/

.github/workflows/ci.yml

@@ -7,7 +7,6 @@ on:
     paths-ignore:
       - 'docs/**'
       - 'examples/**'
-      - 'examples-of-custom-resources/**'
       - '**.md'
     tags:
       - 'v[0-9]+.[0-9]+.[0-9]+'
@@ -17,7 +16,6 @@ on:
     paths-ignore:
       - 'docs/**'
       - 'examples/**'
-      - 'examples-of-custom-resources/**'
       - '**.md'
     types:
       - opened

.github/workflows/fossa.yml

@@ -7,7 +7,6 @@ on:
     paths-ignore:
       - 'docs/**'
       - 'examples/**'
-      - 'examples-of-custom-resources/**'
       - '**.md'
 
 jobs:

.github/workflows/lint.yml

@@ -7,7 +7,6 @@ on:
     paths-ignore:
       - 'docs/**'
       - 'examples/**'
-      - 'examples-of-custom-resources/**'
       - '**.md'
     types:
       - opened

README.md

@@ -44,7 +44,7 @@ Read [this doc](https://docs.nginx.com/nginx-ingress-controller/intro/nginx-plus
 1. Install the NGINX Ingress controller using the Kubernetes [manifests](https://docs.nginx.com/nginx-ingress-controller/installation/installation-with-manifests/) or the [helm chart](https://docs.nginx.com/nginx-ingress-controller/installation/installation-with-helm/).
 1. Configure load balancing for a simple web application:
     * Use the Ingress resource. See the [Cafe example](examples/complete-example).
-    * Or the VirtualServer resource. See the [Basic configuration](examples-of-custom-resources/basic-configuration) example.
+    * Or the VirtualServer resource. See the [Basic configuration](examples/custom-resources/basic-configuration) example.
 1. See additional configuration [examples](examples).
 1. Learn more about all available configuration and customization in the [docs](https://docs.nginx.com/nginx-ingress-controller/).
 

docs/content/configuration/configuration-examples.md

@@ -1,7 +1,7 @@
 ---
 title: Configuration Examples
 
-description: 
+description:
 weight: 2000
 doctypes: [""]
 toc: true
@@ -10,4 +10,4 @@ toc: true
 
 Our [GitHub repo](https://github.com/nginxinc/kubernetes-ingress) includes a number of configuration examples:
 * [*Examples*](https://github.com/nginxinc/kubernetes-ingress/tree/v2.0.3/examples) show how to use advanced NGINX features in Ingress resources with annotations.
-* [*Examples of Custom Resources*](https://github.com/nginxinc/kubernetes-ingress/tree/v2.0.3/examples-of-custom-resources) show how to use VirtualServer and VirtualServerResources for a few use cases.
+* [*Examples of Custom Resources*](https://github.com/nginxinc/kubernetes-ingress/tree/v2.0.3/examples/custom-resources) show how to use VirtualServer and VirtualServerResources for a few use cases.

docs/content/configuration/handling-host-and-listener-collisions.md

@@ -79,7 +79,7 @@ Similarly, if `cafe-ingress` was created first, it will win `cafe.example.com` a
 
 It is possible to merge configuration for multiple Ingress resources for the same host. One common use case for this approach is distributing resources across multiple namespaces. See the [Cross-namespace Configuration](/nginx-ingress-controller/configuration/ingress-resources/cross-namespace-configuration/) doc for more information.
 
-It is *not* possible to merge the configurations for multiple VirtualServer resources for the same host. However, you can split the VirtualServers into multiple VirtualServerRoute resources, which a single VirtualServer can then reference. See the [corresponding example](https://github.com/nginxinc/kubernetes-ingress/tree/v2.0.3/examples-of-custom-resources/cross-namespace-configuration) on GitHub.
+It is *not* possible to merge the configurations for multiple VirtualServer resources for the same host. However, you can split the VirtualServers into multiple VirtualServerRoute resources, which a single VirtualServer can then reference. See the [corresponding example](https://github.com/nginxinc/kubernetes-ingress/tree/v2.0.3/examples/custom-resources/cross-namespace-configuration) on GitHub.
 
 It is *not* possible to merge configuration for multiple TransportServer resources.
 

docs/content/configuration/ingress-resources/cross-namespace-configuration.md

@@ -1,7 +1,7 @@
 ---
 title: Cross-namespace Configuration
 
-description: 
+description:
 weight: 2000
 doctypes: [""]
 toc: true
@@ -10,4 +10,4 @@ toc: true
 
 You can spread the Ingress configuration for a common host across multiple Ingress resources using Mergeable Ingress resources. Such resources can belong to the *same* or *different* namespaces. This enables easier management when using a large number of paths. See the [Mergeable Ingress Resources](https://github.com/nginxinc/kubernetes-ingress/tree/v2.0.3/examples/mergeable-ingress-types) example on our GitHub.
 
-As an alternative to Mergeable Ingress resources, you can use [VirtualServer and VirtualServerRoute resources](/nginx-ingress-controller/configuration/virtualserver-and-virtualserverroute-resources/) for cross-namespace configuration. See the [Cross-Namespace Configuration](https://github.com/nginxinc/kubernetes-ingress/tree/v2.0.3/examples-of-custom-resources/cross-namespace-configuration) example on our GitHub.
+As an alternative to Mergeable Ingress resources, you can use [VirtualServer and VirtualServerRoute resources](/nginx-ingress-controller/configuration/virtualserver-and-virtualserverroute-resources/) for cross-namespace configuration. See the [Cross-Namespace Configuration](https://github.com/nginxinc/kubernetes-ingress/tree/v2.0.3/examples/custom-resources/cross-namespace-configuration) example on our GitHub.