From 6d8cd111b1fa1ba2f47a4aef088698c95996c510 Mon Sep 17 00:00:00 2001 From: Omar Abdulaziz Date: Mon, 28 Apr 2025 16:12:02 +0300 Subject: [PATCH 1/2] fix mycelium ip peers to get the addresses from public namespace in case public node --- pkg/network/nr/net_resource.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkg/network/nr/net_resource.go b/pkg/network/nr/net_resource.go index aae10335..0cd66686 100644 --- a/pkg/network/nr/net_resource.go +++ b/pkg/network/nr/net_resource.go @@ -39,6 +39,8 @@ import ( const ( myceliumInterfaceName = "br-my" + publicNamespaceName = "public" + publicInterfaceName = "public" ) var ( @@ -308,8 +310,14 @@ func (nr *NetResource) SetMycelium() (err error) { "--peers", } - // set mycelium public addresses are the private peers - ips, err := baseifaceutil.GetIPsForIFace(ndmz.DmzPub4, ndmz.DmzNamespace) + // set mycelium public addresses as the private peers + mycNamespace, mycInterface := ndmz.DmzNamespace, ndmz.DmzPub4 + if namespace.Exists(publicNamespaceName) { + mycNamespace = publicNamespaceName + mycInterface = publicInterfaceName + } + + ips, err := baseifaceutil.GetIPsForIFace(mycInterface, mycNamespace) if err != nil { return errors.Wrap(err, "failed to get IPs for npub4") } From 7cf57c73f4e680b43f8fe9d295f351ede194bc03 Mon Sep 17 00:00:00 2001 From: Omar Abdulaziz Date: Mon, 28 Apr 2025 16:16:23 +0300 Subject: [PATCH 2/2] fix resources.go linting --- pkg/netlight/resource/resource.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/netlight/resource/resource.go b/pkg/netlight/resource/resource.go index 79f93ab6..2dc3f024 100644 --- a/pkg/netlight/resource/resource.go +++ b/pkg/netlight/resource/resource.go @@ -11,12 +11,12 @@ import ( "github.com/containernetworking/plugins/pkg/ns" "github.com/pkg/errors" localPkg "github.com/threefoldtech/zosbase/pkg" + "github.com/threefoldtech/zosbase/pkg/netbase/nft" "github.com/threefoldtech/zosbase/pkg/netlight/bridge" "github.com/threefoldtech/zosbase/pkg/netlight/ifaceutil" "github.com/threefoldtech/zosbase/pkg/netlight/namespace" "github.com/threefoldtech/zosbase/pkg/netlight/options" "github.com/threefoldtech/zosbase/pkg/netlight/tuntap" - "github.com/threefoldtech/zosbase/pkg/netbase/nft" "github.com/threefoldtech/zosbase/pkg/zinit" "github.com/vishvananda/netlink" )