Skip to content

Commit 12b5f1d

Browse files
committed
remove extclients on network destroy action
1 parent 2f5acf6 commit 12b5f1d

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

logic/gateway.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -275,9 +275,6 @@ func DeleteIngressGateway(nodeid string) (models.Node, []models.ExtClient, error
275275
logger.Log(3, "deleting ingress gateway")
276276
node.LastModified = time.Now().UTC()
277277
node.IsIngressGateway = false
278-
if !servercfg.IsPro {
279-
node.IsInternetGateway = false
280-
}
281278
delete(node.Tags, models.TagID(fmt.Sprintf("%s.%s", node.Network, models.GwTagName)))
282279
node.IngressGatewayRange = ""
283280
node.Metadata = ""

logic/networks.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,10 @@ func DeleteNetwork(network string, force bool, done chan struct{}) error {
215215
if err != nil {
216216
continue
217217
}
218+
if node.IsGw {
219+
// delete ext clients belonging to gateway
220+
DeleteGatewayExtClients(node.ID.String(), node.Network)
221+
}
218222
DissasociateNodeFromHost(&node, host)
219223
}
220224
}

0 commit comments

Comments
 (0)