Merge pull request spidernet-io#2971 from Icarus9913/fix/wk/kubevirt

fix: spiderpool-agent crashes when kubevirt static IP feature is off
livil · Dec 21, 2023 · 2aa98aa · 2aa98aa
2 parents 2e5ef5c + 16548f1
commit 2aa98aa
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 16 deletions.
diff --git a/cmd/spiderpool-agent/cmd/daemon.go b/cmd/spiderpool-agent/cmd/daemon.go
@@ -342,14 +342,12 @@ func initAgentServiceManagers(ctx context.Context) {
 	}
 	agentContext.StsManager = statefulSetManager
 
-	if agentContext.Cfg.EnableKubevirtStaticIP {
-		logger.Debug("Begin to initialize Kubevirt manager")
-		kubevirtManager := kubevirtmanager.NewKubevirtManager(
-			agentContext.CRDManager.GetClient(),
-			agentContext.CRDManager.GetAPIReader(),
-		)
-		agentContext.KubevirtManager = kubevirtManager
-	}
+	logger.Debug("Begin to initialize Kubevirt manager")
+	kubevirtManager := kubevirtmanager.NewKubevirtManager(
+		agentContext.CRDManager.GetClient(),
+		agentContext.CRDManager.GetAPIReader(),
+	)
+	agentContext.KubevirtManager = kubevirtManager
 
 	logger.Debug("Begin to initialize Endpoint manager")
 	endpointManager, err := workloadendpointmanager.NewWorkloadEndpointManager(

diff --git a/cmd/spiderpool-controller/cmd/daemon.go b/cmd/spiderpool-controller/cmd/daemon.go
@@ -262,14 +262,12 @@ func initControllerServiceManagers(ctx context.Context) {
 	}
 	controllerContext.StsManager = statefulSetManager
 
-	if controllerContext.Cfg.EnableKubevirtStaticIP {
-		logger.Debug("Begin to initialize Kubevirt manager")
-		kubevirtManager := kubevirtmanager.NewKubevirtManager(
-			controllerContext.CRDManager.GetClient(),
-			controllerContext.CRDManager.GetAPIReader(),
-		)
-		controllerContext.KubevirtManager = kubevirtManager
-	}
+	logger.Debug("Begin to initialize Kubevirt manager")
+	kubevirtManager := kubevirtmanager.NewKubevirtManager(
+		controllerContext.CRDManager.GetClient(),
+		controllerContext.CRDManager.GetAPIReader(),
+	)
+	controllerContext.KubevirtManager = kubevirtManager
 
 	logger.Debug("Begin to initialize Endpoint manager")
 	endpointManager, err := workloadendpointmanager.NewWorkloadEndpointManager(