Merge pull request #2191 from gravitl/GRA-1513-ingress

don't fail deleting ingress if no extclients exist
gravitl · Apr 12, 2023 · 7c3ab41 · 7c3ab41
2 parents 382da9d + 3711c1e
commit 7c3ab41
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/logic/gateway.go b/logic/gateway.go
@@ -140,16 +140,8 @@ func DeleteIngressGateway(networkName string, nodeid string) (models.Node, bool,
 	if err != nil {
 		return models.Node{}, false, removedClients, err
 	}
-	//host, err := GetHost(node.ID.String())
-	//if err != nil {
-	//return models.Node{}, false, err
-	//}
-	//network, err := GetParentNetwork(networkName)
-	if err != nil {
-		return models.Node{}, false, removedClients, err
-	}
 	clients, err := GetExtClientsByID(nodeid, networkName)
-	if err != nil {
+	if err != nil && !database.IsEmptyRecord(err) {
 		return models.Node{}, false, removedClients, err
 	}
 
@@ -190,7 +182,10 @@ func DeleteIngressGateway(networkName string, nodeid string) (models.Node, bool,
 // DeleteGatewayExtClients - deletes ext clients based on gateway (mac) of ingress node and network
 func DeleteGatewayExtClients(gatewayID string, networkName string) error {
 	currentExtClients, err := GetNetworkExtClients(networkName)
-	if err != nil && !database.IsEmptyRecord(err) {
+	if database.IsEmptyRecord(err) {
+		return nil
+	}
+	if err != nil {
 		return err
 	}
 	for _, extClient := range currentExtClients {