diff --git a/deploy/tests/integration/base-suite.go b/deploy/tests/integration/base-suite.go index 9502036f..f25ec3c9 100644 --- a/deploy/tests/integration/base-suite.go +++ b/deploy/tests/integration/base-suite.go @@ -152,7 +152,8 @@ func (suite *BaseSuite) StartController() { annotations.InitCfgSnippet() annotations.DisableConfigSnippets(testController.OSArgs.DisableConfigSnippets) - go testController.Controller.Start() + testController.Controller.Start() + go testController.Controller.SyncData() } func (suite *BaseSuite) StopController() { diff --git a/deploy/tests/tnr/routeacl/suite_test.go b/deploy/tests/tnr/routeacl/suite_test.go index 0b8a65ef..71272ac4 100644 --- a/deploy/tests/tnr/routeacl/suite_test.go +++ b/deploy/tests/tnr/routeacl/suite_test.go @@ -126,7 +126,8 @@ func (suite *UseBackendSuite) UseBackendFixture() (eventChan chan k8ssync.SyncDa WithUpdateStatusManager(&updateStatusManager{}). WithArgs(osArgs).Build() - go controller.Start() + controller.Start() + go controller.SyncData() // Now sending store events for test setup ns := store.Namespace{Name: "ns", Status: store.ADDED} @@ -239,7 +240,8 @@ func (suite *UseBackendSuite) NonWildcardHostFixture() (eventChan chan k8ssync.S WithUpdateStatusManager(&updateStatusManager{}). WithArgs(osArgs).Build() - go controller.Start() + controller.Start() + go controller.SyncData() // Now sending store events for test setup ns := store.Namespace{Name: "ns", Status: store.ADDED} @@ -345,7 +347,8 @@ func (suite *UseBackendSuite) WildcardHostFixture() (eventChan chan k8ssync.Sync WithUpdateStatusManager(&updateStatusManager{}). WithArgs(osArgs).Build() - go controller.Start() + controller.Start() + go controller.SyncData() // Now sending store events for test setup ns := store.Namespace{Name: "ns", Status: store.ADDED} diff --git a/deploy/tests/ut/acls/suite_test.go b/deploy/tests/ut/acls/suite_test.go index 054675af..cc683135 100644 --- a/deploy/tests/ut/acls/suite_test.go +++ b/deploy/tests/ut/acls/suite_test.go @@ -108,7 +108,8 @@ func (suite *ACLSuite) UseACLFixture() (eventChan chan k8ssync.SyncDataEvent) { WithUpdateStatusManager(&FakeUpdateSatusManager{}). WithArgs(osArgs).Build() - go controller.Start() + controller.Start() + go controller.SyncData() backend := v3.Backend{ ObjectMeta: metav1.ObjectMeta{ diff --git a/deploy/tests/ut/httprequests/suite_test.go b/deploy/tests/ut/httprequests/suite_test.go index 67ceb7f7..1ea84ebc 100644 --- a/deploy/tests/ut/httprequests/suite_test.go +++ b/deploy/tests/ut/httprequests/suite_test.go @@ -108,7 +108,8 @@ func (suite *HTTPRequestsSuite) UseHTTPRequestsFixture() (eventChan chan k8ssync WithUpdateStatusManager(&FakeUpdateSatusManager{}). WithArgs(osArgs).Build() - go controller.Start() + controller.Start() + go controller.SyncData() backend := v3.Backend{ ObjectMeta: metav1.ObjectMeta{ diff --git a/main.go b/main.go index c3c10a70..b32bfcbd 100644 --- a/main.go +++ b/main.go @@ -177,8 +177,9 @@ func main() { c.SetGatewayAPIInstalled(isGatewayAPIInstalled) + c.Start() go k.MonitorChanges(eventChan, stop, osArgs, isGatewayAPIInstalled) - go c.Start() + go c.SyncData() // Catch QUIT signals signalC := make(chan os.Signal, 1) signal.Notify(signalC, os.Interrupt, syscall.SIGTERM, syscall.SIGUSR1) diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go index 7c7e858d..ef96cdaf 100644 --- a/pkg/controller/controller.go +++ b/pkg/controller/controller.go @@ -84,6 +84,9 @@ func (c *HAProxyController) clientAPIClosure(fn func() error) (err error) { // Start initializes and runs HAProxyController func (c *HAProxyController) Start() { + _, errStart := (c.haproxy.Service("start")) + logger.Panic(errStart) + logger.Panic(c.clientAPIClosure(func() error { err := c.haproxy.PeerEntryDelete("localinstance", "local") if err != nil { @@ -100,10 +103,6 @@ func (c *HAProxyController) Start() { c.initHandlers() logger.Error(c.setupHAProxyRules()) logger.Error(os.Chdir(c.haproxy.Env.CfgDir)) - _, errStart := (c.haproxy.Service("start")) - logger.Panic(errStart) - - c.SyncData() } // Stop handles shutting down HAProxyController