fix: ConfigStore duplicate lead to aeraki unable to get istiod connec…

…tion status update (#408) Signed-off-by: shenyixiong <[email protected]> Co-authored-by: shenyixiong <[email protected]>
aeraki-mesh · Feb 17, 2024 · 37e78e5 · 37e78e5
1 parent 09e181d
commit 37e78e5
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/internal/controller/istio/controller.go b/internal/controller/istio/controller.go
@@ -134,8 +134,14 @@ func (c *Controller) connectIstio() {
 			time.Sleep(5 * time.Second)
 			continue
 		}
-		configController := memory.NewController(c.Store)
-		c.xdsMCP.Store = configController
+
+		if c.configCache == nil {
+			controllerLog.Warn("configCache is nil")
+			c.xdsMCP.Store = memory.NewController(c.Store)
+		} else {
+			c.xdsMCP.Store = c.configCache
+		}
+
 		if err = c.xdsMCP.Run(); err != nil {
 			controllerLog.Errorf("adsc: failed running %v", err)
 			c.closeConnection()