Merge remote-tracking branch 'origin/main' into proto-ipv6-overlay

# Conflicts:
#	management/server/types/networkmap_components.go

shared/management/http/api/openapi.yml

@@ -2004,10 +2004,6 @@ components:
           description: Network resource status
           type: boolean
           example: true
-        on_routing_peer:
-          description: Indicate if the resource is on a routing peer or not. It is needed if the resource is targeting the IP of the routing peer itself
-          type: boolean
-          example: true
       required:
         - name
         - address

shared/management/http/api/types.gen.go

@@ -2737,9 +2737,6 @@ type NetworkResource struct {
 	// Name Network resource name
 	Name string `json:"name"`
 
-	// OnRoutingPeer Indicate if the resource is on a routing peer or not. It is needed if the resource is targeting the IP of the routing peer itself
-	OnRoutingPeer *bool `json:"on_routing_peer,omitempty"`
-
 	// Type Network resource type based of the address
 	Type NetworkResourceType `json:"type"`
 }
@@ -2757,9 +2754,6 @@ type NetworkResourceMinimum struct {
 
 	// Name Network resource name
 	Name string `json:"name"`
-
-	// OnRoutingPeer Indicate if the resource is on a routing peer or not. It is needed if the resource is targeting the IP of the routing peer itself
-	OnRoutingPeer *bool `json:"on_routing_peer,omitempty"`
 }
 
 // NetworkResourceRequest defines model for NetworkResourceRequest.
@@ -2778,9 +2772,6 @@ type NetworkResourceRequest struct {
 
 	// Name Network resource name
 	Name string `json:"name"`
-
-	// OnRoutingPeer Indicate if the resource is on a routing peer or not. It is needed if the resource is targeting the IP of the routing peer itself
-	OnRoutingPeer *bool `json:"on_routing_peer,omitempty"`
 }
 
 // NetworkResourceType Network resource type based of the address