refact: Initialize the nft structure after starting the service

Signed-off-by: ComixHe <[email protected]>
black-desk · Nov 17, 2023 · 4e7e5f7 · 4e7e5f7
1 parent 1c23345
commit 4e7e5f7
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/pkg/interfaces/nftman.go b/pkg/interfaces/nftman.go
diff --git a/pkg/nftman/new.go b/pkg/nftman/new.go
@@ -73,11 +73,6 @@ func New(opts ...Opt) (ret *NFTManager, err error) {
 		t.log = zap.NewNop().Sugar()
 	}
 
-	err = t.initStructure()
-	if err != nil {
-		return
-	}
-
 	ret = t
 
 	t.log.Debugw("NFTManager created.")
@@ -151,7 +146,7 @@ func WithConnFactory(f interfaces.NetlinkConnector) Opt {
 	}
 }
 
-func (nft *NFTManager) initStructure() (err error) {
+func (nft *NFTManager) InitStructure() (err error) {
 	defer Wrap(&err, "flush initial content")
 
 	nft.log.Debug("Initialing nft table structure.")

diff --git a/pkg/nftman/nftman_test.go b/pkg/nftman/nftman_test.go
@@ -44,9 +44,11 @@ var _ = Describe("Netfliter table", Ordered, func() {
 			ContextTableEntry(injectedNFTManagerWithConnector).WithFmt("connector"),
 			func(injectedNFTManager func(cGroupRoot config.CGroupRoot) (*NFTManager, error)) {
 				BeforeEach(func() {
-					By("Create a Table object.", func() {
+					By("Create a Table object and initialize structure", func() {
 						nft, err = injectedNFTManager(config.CGroupRoot(cgroupRoot))
 						Expect(err).To(Succeed())
+						err = nft.InitStructure()
+						Expect(err).To(Succeed())
 					})
 				})
 

diff --git a/pkg/routeman/public.go b/pkg/routeman/public.go
@@ -12,6 +12,12 @@ func (m *RouteManager) RunRouteManager(ctx context.Context) (err error) {
 	defer Wrap(&err, "running route manager")
 
 	defer m.removeRoute()
+
+	err = m.nft.InitStructure()
+	if err != nil {
+		return
+	}
+
 	err = m.addRoute()
 	if err != nil {
 		return