fix mycelium ip peers (#24)

* fix mycelium ip peers to get the addresses from public namespace in case
public node

* fix resources.go linting

Author: Omarabdul3ziz

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"
 )

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")
 	}