Merge branch 'main' into embedded-vnc

shared/management/networkmap/nmdata/peer.go

@@ -27,6 +27,7 @@ type Peer struct {
 	IP                     netip.Addr
 	IPv6                   netip.Addr
 	RequiresApproval       bool
+	Connected              bool
 	ExtraDNSLabels         []string
 	Meta                   PeerSystemMeta
 	ProxyMeta              ProxyMeta
@@ -39,6 +40,14 @@ type ProxyMeta struct {
 	Cluster  string
 }
 
+// ProxyDomain is the slim twin of a registered reverse-proxy domain, carrying
+// what private-service zone resolution needs: the apex a service domain can sit
+// under, and the cluster it is registered against.
+type ProxyDomain struct {
+	Domain        string
+	TargetCluster string
+}
+
 // PeerSystemMeta is the slim twin of peer.PeerSystemMeta.
 type PeerSystemMeta struct {
 	WtVersion          string

shared/management/networkmap/nmdata/service.go

@@ -9,6 +9,7 @@ type Service struct {
 	Enabled      bool
 	Private      bool
 	Mode         string
+	Domain       string
 	ProxyCluster string
 	AccessGroups []string
 	Targets      []*ServiceTarget