fixing up FVs

projectcalico · Dec 19, 2017 · e3109c7 · bcreane · Dec 20, 2017 · heschlie
1 parent cbdfa83
commit e3109c7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git 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
@@ -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)