git mv Ingress ingress

controllers/gce/healthchecks/fakes.go

@@ -0,0 +1,67 @@
+/*
+Copyright 2015 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package healthchecks
+
+import (
+	"fmt"
+
+	compute "google.golang.org/api/compute/v1"
+)
+
+// NewFakeHealthChecks returns a new FakeHealthChecks.
+func NewFakeHealthChecks() *FakeHealthChecks {
+	return &FakeHealthChecks{hc: []*compute.HttpHealthCheck{}}
+}
+
+// FakeHealthChecks fakes out health checks.
+type FakeHealthChecks struct {
+	hc []*compute.HttpHealthCheck
+}
+
+// CreateHttpHealthCheck fakes out http health check creation.
+func (f *FakeHealthChecks) CreateHttpHealthCheck(hc *compute.HttpHealthCheck) error {
+	f.hc = append(f.hc, hc)
+	return nil
+}
+
+// GetHttpHealthCheck fakes out getting a http health check from the cloud.
+func (f *FakeHealthChecks) GetHttpHealthCheck(name string) (*compute.HttpHealthCheck, error) {
+	for _, h := range f.hc {
+		if h.Name == name {
+			return h, nil
+		}
+	}
+	return nil, fmt.Errorf("Health check %v not found.", name)
+}
+
+// DeleteHttpHealthCheck fakes out deleting a http health check.
+func (f *FakeHealthChecks) DeleteHttpHealthCheck(name string) error {
+	healthChecks := []*compute.HttpHealthCheck{}
+	exists := false
+	for _, h := range f.hc {
+		if h.Name == name {
+			exists = true
+			continue
+		}
+		healthChecks = append(healthChecks, h)
+	}
+	if !exists {
+		return fmt.Errorf("Failed to find health check %v", name)
+	}
+	f.hc = healthChecks
+	return nil
+}

controllers/gce/healthchecks/healthchecks.go

@@ -0,0 +1,89 @@
+/*
+Copyright 2015 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package healthchecks
+
+import (
+	compute "google.golang.org/api/compute/v1"
+
+	"github.com/golang/glog"
+	"k8s.io/contrib/ingress/controllers/gce/utils"
+	"net/http"
+)
+
+// HealthChecks manages health checks.
+type HealthChecks struct {
+	cloud       SingleHealthCheck
+	defaultPath string
+	namer       utils.Namer
+}
+
+// NewHealthChecker creates a new health checker.
+// cloud: the cloud object implementing SingleHealthCheck.
+// defaultHealthCheckPath: is the HTTP path to use for health checks.
+func NewHealthChecker(cloud SingleHealthCheck, defaultHealthCheckPath string, namer utils.Namer) HealthChecker {
+	return &HealthChecks{cloud, defaultHealthCheckPath, namer}
+}
+
+// Add adds a healthcheck if one for the same port doesn't already exist.
+func (h *HealthChecks) Add(port int64, path string) error {
+	hc, _ := h.Get(port)
+	name := h.namer.BeName(port)
+	if path == "" {
+		path = h.defaultPath
+	}
+	if hc == nil {
+		glog.Infof("Creating health check %v", name)
+		if err := h.cloud.CreateHttpHealthCheck(
+			&compute.HttpHealthCheck{
+				Name:        name,
+				Port:        port,
+				RequestPath: path,
+				Description: "Default kubernetes L7 Loadbalancing health check.",
+				// How often to health check.
+				CheckIntervalSec: 1,
+				// How long to wait before claiming failure of a health check.
+				TimeoutSec: 1,
+				// Number of healthchecks to pass for a vm to be deemed healthy.
+				HealthyThreshold: 1,
+				// Number of healthchecks to fail before the vm is deemed unhealthy.
+				UnhealthyThreshold: 10,
+			}); err != nil {
+			return err
+		}
+	} else {
+		// TODO: Does this health check need an edge hop?
+		glog.Infof("Health check %v already exists", hc.Name)
+	}
+	return nil
+}
+
+// Delete deletes the health check by port.
+func (h *HealthChecks) Delete(port int64) error {
+	name := h.namer.BeName(port)
+	glog.Infof("Deleting health check %v", name)
+	if err := h.cloud.DeleteHttpHealthCheck(h.namer.BeName(port)); err != nil {
+		if !utils.IsHTTPErrorCode(err, http.StatusNotFound) {
+			return err
+		}
+	}
+	return nil
+}
+
+// Get returns the given health check.
+func (h *HealthChecks) Get(port int64) (*compute.HttpHealthCheck, error) {
+	return h.cloud.GetHttpHealthCheck(h.namer.BeName(port))
+}

controllers/gce/healthchecks/interfaces.go

@@ -0,0 +1,35 @@
+/*
+Copyright 2015 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package healthchecks
+
+import (
+	compute "google.golang.org/api/compute/v1"
+)
+
+// SingleHealthCheck is an interface to manage a single GCE health check.
+type SingleHealthCheck interface {
+	CreateHttpHealthCheck(hc *compute.HttpHealthCheck) error
+	DeleteHttpHealthCheck(name string) error
+	GetHttpHealthCheck(name string) (*compute.HttpHealthCheck, error)
+}
+
+// HealthChecker is an interface to manage cloud HTTPHealthChecks.
+type HealthChecker interface {
+	Add(port int64, path string) error
+	Delete(port int64) error
+	Get(port int64) (*compute.HttpHealthCheck, error)
+}