zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-05 16:57:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

ignore network parameter passed to delete ingress endpoint (#2471)

Browse Source
This commit is contained in:
Matthew R Kasun
2023-07-28 11:46:35 -04:00
committed by GitHub
parent cf11169553
commit 114db708d6
4 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
logic/gateway.go
View File

@@ -127,13 +127,13 @@ func CreateIngressGateway(netid string, nodeid string, ingress models.IngressReq
}
// DeleteIngressGateway - deletes an ingress gateway
func DeleteIngressGateway(networkName string, nodeid string) (models.Node, bool, []models.ExtClient, error) {
func DeleteIngressGateway(nodeid string) (models.Node, bool, []models.ExtClient, error) {
removedClients := []models.ExtClient{}
node, err := GetNodeByID(nodeid)
if err != nil {
return models.Node{}, false, removedClients, err
}
clients, err := GetExtClientsByID(nodeid, networkName)
clients, err := GetExtClientsByID(nodeid, node.Network)
if err != nil && !database.IsEmptyRecord(err) {
return models.Node{}, false, removedClients, err
}
@@ -141,7 +141,7 @@ func DeleteIngressGateway(networkName string, nodeid string) (models.Node, bool,
removedClients = clients
// delete ext clients belonging to ingress gateway
if err = DeleteGatewayExtClients(node.ID.String(), networkName); err != nil {
if err = DeleteGatewayExtClients(node.ID.String(), node.Network); err != nil {
return models.Node{}, false, removedClients, err
}
logger.Log(3, "deleting ingress gateway")
@@ -163,7 +163,7 @@ func DeleteIngressGateway(networkName string, nodeid string) (models.Node, bool,
if err != nil {
return models.Node{}, wasFailover, removedClients, err
}
err = SetNetworkNodesLastModified(networkName)
err = SetNetworkNodesLastModified(node.Network)
return node, wasFailover, removedClients, err
}