Cherry pick cloudnativelabs#725

Missing NPC heartbeat because of interfering Pod updates

commit 94fd7b6

pkg/controllers/netpol/network_policy_controller.go

@@ -58,6 +58,7 @@ type NetworkPolicyController struct {
 	MetricsEnabled  bool
 	v1NetworkPolicy bool
 	readyForUpdates bool
+	healthChan      chan<- *healthcheck.ControllerHeartbeat
 
 	// list of all active network policies expressed as networkPolicyInfo
 	networkPoliciesInfo *[]networkPolicyInfo
@@ -139,6 +140,7 @@ func (npc *NetworkPolicyController) Run(healthChan chan<- *healthcheck.Controlle
 	defer wg.Done()
 
 	glog.Info("Starting network policy controller")
+	npc.healthChan = healthChan
 
 	// loop forever till notified to stop on stopCh
 	for {
@@ -221,6 +223,7 @@ func (npc *NetworkPolicyController) Sync() error {
 	npc.mu.Lock()
 	defer npc.mu.Unlock()
 
+	healthcheck.SendHeartBeat(npc.healthChan, "NPC")
 	start := time.Now()
 	syncVersion := strconv.FormatInt(start.UnixNano(), 10)
 	defer func() {

pkg/controllers/proxy/network_services_controller.go

@@ -340,6 +340,7 @@ func (nsc *NetworkServicesController) Run(healthChan chan<- *healthcheck.Control
 		}
 
 		glog.V(1).Info("Performing periodic sync of ipvs services")
+		healthcheck.SendHeartBeat(healthChan, "NSC")
 		err := nsc.sync()
 		if err != nil {
 			glog.Errorf("Error during periodic ipvs sync in network service controller. Error: " + err.Error())