gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-09-11 15:44:52 +08:00
Code Issues Projects Releases Packages Wiki Activity

Net 1990 (#3386)

Browse source 
* add peerkey to network egress routes model

* add peerkey to network egress routes model

* filter out conflicting routes from node

* add support for egress HA on relay

* add support for egress HA on relay

* add support for egress HA on relay

* skip if curr node is relay node of the peer

* skip if curr node is relay node of the peer

* fix failover egress HA

* add network to egress route model

* clone before modifying

* check for user policies on uni direction check

* add all network fwd rule

* delete all network policies and tags on network deletion
This commit is contained in:
Abhishek K 2025-03-25 00:42:14 +04:00 • committed by GitHub
parent 5e1ef5e366
commit 8a1f36ee8e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
controllers/network.go
View file

@ -494,7 +494,8 @@ func deleteNetwork(w http.ResponseWriter, r *http.Request) {
}
go logic.UnlinkNetworkAndTagsFromEnrollmentKeys(network, true)
go logic.DeleteNetworkRoles(network)
go logic.DeleteDefaultNetworkPolicies(models.NetworkID(network))
go logic.DeleteAllNetworkTags(models.NetworkID(network))
go logic.DeleteNetworkPolicies(models.NetworkID(network))
//delete network from allocated ip map
go logic.RemoveNetworkFromAllocatedIpMap(network)
go func() {

6
logic/acls.go
View file

@ -128,11 +128,11 @@ func CreateDefaultAclNetworkPolicies(netID models.NetworkID) {
CreateDefaultUserPolicies(netID)
}
// DeleteDefaultNetworkPolicies - deletes all default network acl policies
func DeleteDefaultNetworkPolicies(netId models.NetworkID) {
// DeleteNetworkPolicies - deletes all default network acl policies
func DeleteNetworkPolicies(netId models.NetworkID) {
acls, _ := ListAclsByNetwork(netId)
for _, acl := range acls {
if acl.NetworkID == netId && acl.Default {
if acl.NetworkID == netId {
DeleteAcl(acl)
}
}

6
logic/tags.go
View file

@ -105,6 +105,12 @@ func ListTagsWithNodes(netID models.NetworkID) ([]models.TagListResp, error) {
}
return resp, nil
}
func DeleteAllNetworkTags(networkID models.NetworkID) {
tags, _ := ListNetworkTags(networkID)
for _, tagI := range tags {
DeleteTag(tagI.ID, false)
}
}
// ListTags - lists all tags from DB
func ListTags() ([]models.Tag, error) {