Handle HealthCheck for NEG

pkg/backends/backends.go

@@ -171,7 +171,7 @@ func (b *Backends) Get(port int64) (*compute.BackendService, error) {
 }
 
 func (b *Backends) ensureHealthCheck(sp ServicePort) (string, error) {
-	hc := b.healthChecker.New(sp.Port, sp.Protocol)
+	hc := b.healthChecker.New(sp.Port, sp.Protocol, false)
 
 	existingLegacyHC, err := b.healthChecker.GetLegacy(sp.Port)
 	if err != nil && !utils.IsNotFoundError(err) {
@@ -482,10 +482,15 @@ func applyProbeSettingsToHC(p *v1.Probe, hc *healthchecks.HealthCheck) {
 			break
 		}
 	}
-
 	hc.RequestPath = healthPath
 	hc.Host = host
 	hc.Description = "Kubernetes L7 health check generated with readiness probe settings."
-	hc.CheckIntervalSec = int64(p.PeriodSeconds) + int64(healthchecks.DefaultHealthCheckInterval.Seconds())
 	hc.TimeoutSec = int64(p.TimeoutSeconds)
+	if hc.ForNEG {
+		// For NEG mode, we can support more aggresive healthcheck interval.
+		hc.CheckIntervalSec = int64(p.PeriodSeconds)
+	} else {
+		// For IG mode, short healthcheck interval may health check flooding problem.
+		hc.CheckIntervalSec = int64(p.PeriodSeconds) + int64(healthchecks.DefaultHealthCheckInterval.Seconds())
+	}
 }

pkg/healthchecks/fakes.go

@@ -17,6 +17,7 @@ limitations under the License.
 package healthchecks
 
 import (
+	computealpha "google.golang.org/api/compute/v0.alpha"
 	compute "google.golang.org/api/compute/v1"
 
 	"k8s.io/ingress-gce/pkg/utils"
@@ -26,14 +27,14 @@ import (
 func NewFakeHealthCheckProvider() *FakeHealthCheckProvider {
 	return &FakeHealthCheckProvider{
 		http:    make(map[string]compute.HttpHealthCheck),
-		generic: make(map[string]compute.HealthCheck),
+		generic: make(map[string]computealpha.HealthCheck),
 	}
 }
 
 // FakeHealthCheckProvider fakes out health checks.
 type FakeHealthCheckProvider struct {
 	http    map[string]compute.HttpHealthCheck
-	generic map[string]compute.HealthCheck
+	generic map[string]computealpha.HealthCheck
 }
 
 // CreateHttpHealthCheck fakes out http health check creation.
@@ -77,19 +78,37 @@ func (f *FakeHealthCheckProvider) UpdateHttpHealthCheck(hc *compute.HttpHealthCh
 func (f *FakeHealthCheckProvider) CreateHealthCheck(hc *compute.HealthCheck) error {
 	v := *hc
 	v.SelfLink = "https://fake.google.com/compute/healthChecks/" + hc.Name
-	f.generic[hc.Name] = v
+	alphaHC, _ := toAlphaHealthCheck(hc)
+	f.generic[hc.Name] = *alphaHC
+	return nil
+}
+
+// CreateHealthCheck fakes out http health check creation.
+func (f *FakeHealthCheckProvider) CreateAlphaHealthCheck(hc *computealpha.HealthCheck) error {
+	v := *hc
+	v.SelfLink = "https://fake.google.com/compute/healthChecks/" + hc.Name
+	f.generic[hc.Name] = *hc
 	return nil
 }
 
 // GetHealthCheck fakes out getting a http health check from the cloud.
 func (f *FakeHealthCheckProvider) GetHealthCheck(name string) (*compute.HealthCheck, error) {
 	if hc, found := f.generic[name]; found {
-		return &hc, nil
+		v1HC, _ := toV1HealthCheck(&hc)
+		return v1HC, nil
 	}
 
 	return nil, utils.FakeGoogleAPINotFoundErr()
 }
 
+// GetHealthCheck fakes out getting a http health check from the cloud.
+func (f *FakeHealthCheckProvider) GetAlphaHealthCheck(name string) (*computealpha.HealthCheck, error) {
+	if hc, found := f.generic[name]; found {
+		return &hc, nil
+	}
+	return nil, utils.FakeGoogleAPINotFoundErr()
+}
+
 // DeleteHealthCheck fakes out deleting a http health check.
 func (f *FakeHealthCheckProvider) DeleteHealthCheck(name string) error {
 	if _, exists := f.generic[name]; !exists {
@@ -105,6 +124,15 @@ func (f *FakeHealthCheckProvider) UpdateHealthCheck(hc *compute.HealthCheck) err
 	if _, exists := f.generic[hc.Name]; !exists {
 		return utils.FakeGoogleAPINotFoundErr()
 	}
+	alphaHC, _ := toAlphaHealthCheck(hc)
+	f.generic[hc.Name] = *alphaHC
+	return nil
+}
+
+func (f *FakeHealthCheckProvider) UpdateAlphaHealthCheck(hc *computealpha.HealthCheck) error {
+	if _, exists := f.generic[hc.Name]; !exists {
+		return utils.FakeGoogleAPINotFoundErr()
+	}
 
 	f.generic[hc.Name] = *hc
 	return nil