From ffd01fc88ab7f83647798094d5fb5171a4380bfa Mon Sep 17 00:00:00 2001
From: Matteo Bongiovanni <40599507+MatBon01@users.noreply.github.com>
Date: Tue, 16 Sep 2025 09:50:05 +0100
Subject: [PATCH] Fix conflict in IngressRouteTCP documentation
---
.../kubernetes/crd/tcp/ingressroutetcp.md | 28 -------------------
1 file changed, 28 deletions(-)
diff --git a/docs/content/reference/routing-configuration/kubernetes/crd/tcp/ingressroutetcp.md b/docs/content/reference/routing-configuration/kubernetes/crd/tcp/ingressroutetcp.md
index 061ed1615..47d595e1e 100644
--- a/docs/content/reference/routing-configuration/kubernetes/crd/tcp/ingressroutetcp.md
+++ b/docs/content/reference/routing-configuration/kubernetes/crd/tcp/ingressroutetcp.md
@@ -57,33 +57,6 @@ spec:
## Configuration Options
-<<<<<<< HEAD
-| Field | Description | Default | Required |
-|-----------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------|----------|
-| `entryPoints` | List of entrypoints names. | | No |
-| `routes` | List of routes. | | Yes |
-| `routes[n].match` | Defines the [rule](../../../tcp/router/rules-and-priority.md#rules) of the underlying router. | | Yes |
-| `routes[n].priority` | Defines the [priority](../../../tcp/router/rules-and-priority.md#priority) to disambiguate rules of the same length, for route matching. | | No |
-| `routes[n].middlewares[n].name` | Defines the [MiddlewareTCP](./middlewaretcp.md) name. | | Yes |
-| `routes[n].middlewares[n].namespace` | Defines the [MiddlewareTCP](./middlewaretcp.md) namespace. | "" | No |
-| `routes[n].services` | List of [Kubernetes service](https://kubernetes.io/docs/concepts/services-networking/service/) definitions. | | No |
-| `routes[n].services[n].name` | Defines the name of a [Kubernetes service](https://kubernetes.io/docs/concepts/services-networking/service/). | | Yes |
-| `routes[n].services[n].port` | Defines the port of a [Kubernetes service](https://kubernetes.io/docs/concepts/services-networking/service/). This can be a reference to a named port. | | Yes |
-| `routes[n].services[n].weight` | Defines the weight to apply to the server load balancing. | 1 | No |
-| `routes[n].services[n].serversTransport` | Defines the [ServersTransportTCP](./serverstransporttcp.md).
The `ServersTransport` namespace is assumed to be the [Kubernetes service](https://kubernetes.io/docs/concepts/services-networking/service/) namespace. | | No |
-| `routes[n].services[n].nativeLB` | Controls, when creating the load-balancer, whether the LB's children are directly the pods IPs or if the only child is the Kubernetes Service clusterIP. See [here](#nativelb) for more information. | false | No |
-| `routes[n].services[n].nodePortLB` | Controls, when creating the load-balancer, whether the LB's children are directly the nodes internal IPs using the nodePort when the service type is `NodePort`. It allows services to be reachable when Traefik runs externally from the Kubernetes cluster but within the same network of the nodes. | false | No |
-| `tls` | Defines [TLS](../../../../install-configuration/tls/certificate-resolvers/overview.md) certificate configuration. | | No |
-| `tls.secretName` | Defines the [secret](https://kubernetes.io/docs/concepts/configuration/secret/) name used to store the certificate (in the `IngressRoute` namespace). | "" | No |
-| `tls.options` | Defines the reference to a [TLSOption](../http/tlsoption.md). | "" | No |
-| `tls.options.name` | Defines the [TLSOption](../http/tlsoption.md) name. | "" | No |
-| `tls.options.namespace` | Defines the [TLSOption](../http/tlsoption.md) namespace. | "" | No |
-| `tls.certResolver` | Defines the reference to a [CertResolver](../../../../install-configuration/tls/certificate-resolvers/overview.md). | "" | No |
-| `tls.domains` | List of domains. | "" | No |
-| `tls.domains[n].main` | Defines the main domain name. | "" | No |
-| `tls.domains[n].sans` | List of SANs (alternative domains). | "" | No |
-| `tls.passthrough` | If `true`, delegates the TLS termination to the backend. | false | No |
-=======
| Field | Description | Default | Required |
|-------------------------------------|-----------------------------|-------------------------------------------|-----------------------|
| `entryPoints` | List of entrypoints names. | | No |
@@ -111,7 +84,6 @@ spec:
| `tls.domains[n].main` | Defines the main domain name. | "" | No |
| `tls.domains[n].sans` | List of SANs (alternative domains). | "" | No |
| `tls.passthrough` | If `true`, delegates the TLS termination to the backend. | false | No |
->>>>>>> 9c932124f (Add anchors in reference tables)
### ExternalName Service