Merge pull request #677 from NikitaSkrynnik/strictipam

Add `strictipam.Server` to cleanup ipcontext on healing
networkservicemesh · May 27, 2024 · 1406d90 · 1406d90
2 parents d74a4a0 + e3b46a5
commit 1406d90
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/internal/imports/imports_linux.go b/internal/imports/imports_linux.go
diff --git a/main.go b/main.go
@@ -26,6 +26,7 @@ package main
 import (
 	"context"
 	"crypto/tls"
+	"net"
 	"net/url"
 	"os"
 	"os/signal"
@@ -57,6 +58,8 @@ import (
 	"github.com/networkservicemesh/sdk/pkg/networkservice/common/mechanisms/sendfd"
 	"github.com/networkservicemesh/sdk/pkg/networkservice/core/chain"
 	"github.com/networkservicemesh/sdk/pkg/networkservice/ipam/groupipam"
+	"github.com/networkservicemesh/sdk/pkg/networkservice/ipam/point2pointipam"
+	"github.com/networkservicemesh/sdk/pkg/networkservice/ipam/strictipam"
 	registryclient "github.com/networkservicemesh/sdk/pkg/registry/chains/client"
 	registryauthorize "github.com/networkservicemesh/sdk/pkg/registry/common/authorize"
 	"github.com/networkservicemesh/sdk/pkg/registry/common/clientinfo"
@@ -189,7 +192,9 @@ func main() {
 		endpoint.WithName(config.Name),
 		endpoint.WithAuthorizeServer(authorize.NewServer()),
 		endpoint.WithAdditionalFunctionality(
-			groupipam.NewServer(config.CidrPrefix),
+			groupipam.NewServer(config.CidrPrefix, groupipam.WithCustomIPAMServer(func(prefixes ...*net.IPNet) networkservice.NetworkServiceServer {
+				return strictipam.NewServer(point2pointipam.NewServer, prefixes...)
+			})),
 			mechanisms.NewServer(map[string]networkservice.NetworkServiceServer{
 				memif.MECHANISM: chain.NewNetworkServiceServer(
 					sendfd.NewServer(),