From e3109c7eee152920f0df251e3f1300e8fb736a24 Mon Sep 17 00:00:00 2001 From: Stephen Schlie Date: Tue, 19 Dec 2017 15:43:03 -0800 Subject: [PATCH] fixing up FVs --- felix.go | 2 +- fv/health_test.go | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/felix.go b/felix.go index d0603d9b23..ff07da2a08 100644 --- a/felix.go +++ b/felix.go @@ -148,7 +148,7 @@ func main() { const healthName = "felix-startup" // Register this function as a reporter of liveness and readiness, with no timeout. - healthAggregator.RegisterReporter(healthName, &health.HealthReport{Live: true, Ready: false}, 0) + healthAggregator.RegisterReporter(healthName, &health.HealthReport{Live: true, Ready: true}, 0) // Make an initial report that says we're live but not yet ready. healthAggregator.Report(healthName, &health.HealthReport{Live: true, Ready: false}) diff --git a/fv/health_test.go b/fv/health_test.go index d11ef61360..96cc7e2121 100644 --- a/fv/health_test.go +++ b/fv/health_test.go @@ -225,13 +225,6 @@ var _ = Describe("health tests", func() { // describeCommonFelixTests creates specs for Felix tests that are common between the // two scenarios below (with and without Typha). describeCommonFelixTests := func() { - Describe("with no per-node config in datastore", func() { - It("should not open port due to lack of config", func() { - // With no config, Felix won't even open the socket. - Consistently(felixReady, "5s", "1s").Should(BeErr()) - }) - }) - Describe("with per-node config in datastore", func() { BeforeEach(createPerNodeConfig) AfterEach(removePerNodeConfig)