Remove notion of 2 discovery services

Author: jackwaudby

modules/ROOT/pages/clustering/disaster-recovery.adoc

@@ -98,7 +98,7 @@ Either:
 ... Add completely new servers (see xref:clustering/servers.adoc#cluster-add-server[Add a server to the cluster]) or
 ... Change the `system` database mode (`server.cluster.system_database_mode`) on the current `system` database's secondary servers to allow them to be primaries for the new `system` database.
 .. On each server, run `bin/neo4j-admin database load system --from-path=[path-to-dump] --overwrite-destination=true` to load the current `system` database dump.
-.. Ensure that `dbms.cluster.discovery.endpoints` are set correctly on all servers, see xref:clustering/setup/discovery.adoc[Cluster server discovery] for more information.
+.. Ensure that `dbms.cluster.endpoints` are set correctly on all servers, see xref:clustering/setup/discovery.adoc[Cluster server discovery] for more information.
 .. Return to step 1.
 
 

modules/ROOT/pages/clustering/settings.adoc

@@ -45,62 +45,28 @@ Possible values are:
 
 [.compact]
 `LIST`::
-Treats `dbms.cluster.discovery.endpoints` (or `dbms.cluster.discovery.v2.endpoints`, if you use discovery service v2 available as of Neo4j 5.23) as a list of addresses of servers to contact for discovery.
+Treats `dbms.cluster.endpoints` as a list of addresses of servers to contact for discovery.
 `DNS`::
-Treats `dbms.cluster.discovery.endpoints` (or `dbms.cluster.discovery.v2.endpoints`, if you use discovery service v2 available as of Neo4j 5.23) as a domain name to resolve via DNS.
-Expect DNS resolution to provide A records with hostnames or IP addresses of servers to contact for discovery, on the port specified by `dbms.cluster.discovery.endpoints`.
+Treats `dbms.cluster.endpoints` as a domain name to resolve via DNS.
+Expect DNS resolution to provide A records with hostnames or IP addresses of servers to contact for discovery, on the port specified by `dbms.cluster.endpoints`.
 `SRV`::
-Treats `dbms.cluster.discovery.endpoints` (or `dbms.cluster.discovery.v2.endpoints`, if you use discovery service v2 available as of Neo4j 5.23) as a domain name to resolve via DNS.
+Treats `dbms.cluster.endpoints` as a domain name to resolve via DNS.
 Expect DNS resolution to provide SRV records with hostnames or IP addresses and ports, of servers to contact for discovery.
 `K8S`::
 Accesses the Kubernetes list service API to derive addresses of servers to contact for discovery.
 Requires `dbms.kubernetes.label_selector` to be a Kubernetes label selector for Kubernetes services running a server each and `dbms.kubernetes.service_port_name` to be a service port name identifying the discovery port of cluster servers services.
-The value of `dbms.cluster.discovery.endpoints` (or `dbms.cluster.discovery.v2.endpoints`, if you use discovery service v2 available as of Neo4j 5.23) is ignored for this option.
+The value of `dbms.cluster.endpoints` is ignored for this option.
 For more details, see xref:clustering/setup/discovery.adoc#clustering-discovery-k8s[Discovery in Kubernetes].
 
-From Neo4j 5.23, depending on which version of the discovery service you are using, you need to set either `dbms.cluster.discovery.endpoints` or `dbms.cluster.discovery.v2.endpoints` in the _neo4j.conf_ file.
+You need to set `dbms.cluster.endpoints` in the _neo4j.conf_ file.
 Detailed information about discovery and discovery configuration options is given in xref:clustering/setup/discovery.adoc#clustering-discovery-methods[Methods for server discovery].
 
-| xref:configuration/configuration-settings.adoc#config_dbms.cluster.discovery.endpoints[`dbms.cluster.discovery.endpoints`] label:deprecated[Deprecated in 5.23]
-| One or more network addresses used to discover other servers in the cluster.
-The exact method by which endpoints are resolved to other cluster members is determined by the value of `dbms.cluster.discovery.resolver_type`.
-In the default case, the initial discovery members are given as a comma-separated list of address/port pairs, and the default port for the discovery service is `:5000`.
-
-It is good practice to set this parameter to the same value on all servers in the cluster.
-
-**Example:** `dbms.cluster.discovery.resolver_type=LIST` combined with `server01.example.com:5000,server02.example.com:5000,server03.example.com:5000` attempt to reach Neo4j instances listening on _server01.example.com_, _server02.example.com_ and _server03.example.com_; all on port `5000`.
-
-|xref:configuration/configuration-settings.adoc#config_dbms.cluster.discovery.v2.endpoints[`dbms.cluster.discovery.v2.endpoints`] label:new[Introduced in 5.22]
+|xref:configuration/configuration-settings.adoc#config_dbms.cluster.discovery.v2.endpoints[`dbms.cluster.endpoints`] 
 |A comma-separated list of endpoints that a server should contact in order to discover other cluster members.
 Typically, all cluster members, including the current server, must be specified in this list.
-The setting configures the endpoints for discovery service v2.
 
 **Example:** `dbms.cluster.discovery.resolver_type=LIST` combined with `server01.example.com:6000,server02.example.com:6000,server03.example.com:6000` attempt to reach Neo4j instances listening on _server01.example.com_, _server02.example.com_ and _server03.example.com_; all on port `6000`.
 
-|xref:configuration/configuration-settings.adoc#config_dbms.cluster.discovery.version[`dbms.cluster.discovery.version`] label:new[Introduced in 5.22]
-|This setting allows you to select which discovery service should be started.
-Possible values are:
-
-* V1_ONLY -— it runs only discovery service v1.
-
-* V1_OVER_V2 -— it runs both discovery service v1 and discovery service v2, where v1 is the main service and v2 runs in the background.
-
-* V2_OVER_V1 -— it runs both discovery service v1 and discovery service v2, where v2 is the main service and v1 runs in the background.
-
-* V2_ONLY -- it runs only discovery service v2.
-
-The default value is `V1_ONLY`.
-
-Discovery services v1 and v2 are designed to run in parallel.
-They are completely independent of each other, thus allowing you to keep the cluster functioning while switching over from v1 to v2.
-For details on how to move from discovery service v1 to v2, see xref:clustering/setup/discovery.adoc#clustering-discovery-v1-to-v2[Moving from discovery service v1 to v2].
-
-| xref:configuration/configuration-settings.adoc#config_server.discovery.advertised_address[`server.discovery.advertised_address`] label:deprecated[Deprecated in 5.23]
-| The address/port setting that specifies where the instance advertises that it listens for discovery protocol messages from other members of the cluster.
-If this server is included in the `discovery.endpoints` of other cluster members, the value there must **exactly** match this advertised address.
-
-**Example:** `server.discovery.advertised_address=192.168.33.21:5001` indicates that other cluster members can communicate with this server using the discovery protocol at host `192.168.33.20` and port `5001`.
-
 | xref:configuration/configuration-settings.adoc#config_server.cluster.raft.advertised_address[`server.cluster.raft.advertised_address`]
 | The address/port setting that specifies where the Neo4j server advertises to other members of the cluster that it listens for Raft messages within the cluster.
 
@@ -111,11 +77,6 @@ If this server is included in the `discovery.endpoints` of other cluster members
 
 **Example:** `causal_clustering.transaction_advertised_address=192.168.33.20:6001` listens for transactions from cluster members on the network interface bound to `192.168.33.20` on port `6001`.
 
-| xref:configuration/configuration-settings.adoc#config_server.discovery.listen_address[`server.discovery.listen_address`] label:deprecated[Deprecated in 5.23]
-| The address/port setting that specifies which network interface and port the Neo4j instance binds to for the cluster discovery protocol.
-
-**Example:** `server.discovery.listen_address=0.0.0.0:5001` listens for cluster membership communication on any network interface at port `5001`.
-
 | xref:configuration/configuration-settings.adoc#config_server.cluster.raft.listen_address[`server.cluster.raft.listen_address`]
 | The address/port setting that specifies which network interface and port the Neo4j instance binds to for cluster communication.
 This setting must be set in coordination with the address this instance advertises it listens at in the setting `server.cluster.raft.advertised_address`.