Move lifecycle handlers to its own sub package.

This will allow injecting it into the runtimes.

pkg/kubelet/lifecycle/doc.go

@@ -0,0 +1,18 @@
+/*
+Copyright 2015 Google Inc. 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.
+*/
+
+// Handlers for pod lifecycle events.
+package lifecycle

pkg/kubelet/lifecycle/handlers.go

@@ -0,0 +1,114 @@
+/*
+Copyright 2014 Google Inc. 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 lifecycle
+
+import (
+	"fmt"
+	"net"
+	"strconv"
+
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
+	kubecontainer "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/container"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/dockertools"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/prober"
+	kubeletTypes "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/types"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
+	"github.com/golang/glog"
+)
+
+type HandlerRunner struct {
+	httpGetter       kubeletTypes.HttpGetter
+	commandRunner    prober.ContainerCommandRunner
+	containerManager *dockertools.DockerManager
+}
+
+// TODO(yifan): Merge commandRunner and containerManager once containerManager implements the ContainerCommandRunner interface.
+func NewHandlerRunner(httpGetter kubeletTypes.HttpGetter, commandRunner prober.ContainerCommandRunner, containerManager *dockertools.DockerManager) kubecontainer.HandlerRunner {
+	return &HandlerRunner{
+		httpGetter:       httpGetter,
+		commandRunner:    commandRunner,
+		containerManager: containerManager,
+	}
+}
+
+// TODO(yifan): Use a strong type for containerID.
+func (hr *HandlerRunner) Run(containerID string, pod *api.Pod, container *api.Container, handler *api.Handler) error {
+	switch {
+	case handler.Exec != nil:
+		_, err := hr.commandRunner.RunInContainer(containerID, handler.Exec.Command)
+		return err
+	case handler.HTTPGet != nil:
+		return hr.runHTTPHandler(pod, container, handler)
+	default:
+		err := fmt.Errorf("Invalid handler: %v", handler)
+		glog.Errorf("Cannot run handler: %v", err)
+		return err
+	}
+}
+
+// resolvePort attempts to turn a IntOrString port reference into a concrete port number.
+// If portReference has an int value, it is treated as a literal, and simply returns that value.
+// If portReference is a string, an attempt is first made to parse it as an integer.  If that fails,
+// an attempt is made to find a port with the same name in the container spec.
+// If a port with the same name is found, it's ContainerPort value is returned.  If no matching
+// port is found, an error is returned.
+func resolvePort(portReference util.IntOrString, container *api.Container) (int, error) {
+	if portReference.Kind == util.IntstrInt {
+		return portReference.IntVal, nil
+	} else {
+		portName := portReference.StrVal
+		port, err := strconv.Atoi(portName)
+		if err == nil {
+			return port, nil
+		}
+		for _, portSpec := range container.Ports {
+			if portSpec.Name == portName {
+				return portSpec.ContainerPort, nil
+			}
+		}
+
+	}
+	return -1, fmt.Errorf("couldn't find port: %v in %v", portReference, container)
+}
+
+func (hr *HandlerRunner) runHTTPHandler(pod *api.Pod, container *api.Container, handler *api.Handler) error {
+	host := handler.HTTPGet.Host
+	if len(host) == 0 {
+		status, err := hr.containerManager.GetPodStatus(pod)
+		if err != nil {
+			glog.Errorf("Unable to get pod info, event handlers may be invalid.")
+			return err
+		}
+		if status.PodIP == "" {
+			return fmt.Errorf("failed to find networking container: %v", status)
+		}
+		host = status.PodIP
+	}
+	var port int
+	if handler.HTTPGet.Port.Kind == util.IntstrString && len(handler.HTTPGet.Port.StrVal) == 0 {
+		port = 80
+	} else {
+		var err error
+		port, err = resolvePort(handler.HTTPGet.Port, container)
+		if err != nil {
+			return err
+		}
+	}
+	url := fmt.Sprintf("http://%s/%s", net.JoinHostPort(host, strconv.Itoa(port)), handler.HTTPGet.Path)
+	_, err := hr.httpGetter.Get(url)
+	return err
+}

pkg/kubelet/lifecycle/handlers_test.go

@@ -0,0 +1,69 @@
+/*
+Copyright 2014 Google Inc. 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 lifecycle
+
+import (
+	"testing"
+
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
+)
+
+func TestResolvePortInt(t *testing.T) {
+	expected := 80
+	port, err := resolvePort(util.IntOrString{Kind: util.IntstrInt, IntVal: expected}, &api.Container{})
+	if port != expected {
+		t.Errorf("expected: %d, saw: %d", expected, port)
+	}
+	if err != nil {
+		t.Errorf("unexpected error: %v", err)
+	}
+}
+
+func TestResolvePortString(t *testing.T) {
+	expected := 80
+	name := "foo"
+	container := &api.Container{
+		Ports: []api.ContainerPort{
+			{Name: name, ContainerPort: expected},
+		},
+	}
+	port, err := resolvePort(util.IntOrString{Kind: util.IntstrString, StrVal: name}, container)
+	if port != expected {
+		t.Errorf("expected: %d, saw: %d", expected, port)
+	}
+	if err != nil {
+		t.Errorf("unexpected error: %v", err)
+	}
+}
+
+func TestResolvePortStringUnknown(t *testing.T) {
+	expected := 80
+	name := "foo"
+	container := &api.Container{
+		Ports: []api.ContainerPort{
+			{Name: "bar", ContainerPort: expected},
+		},
+	}
+	port, err := resolvePort(util.IntOrString{Kind: util.IntstrString, StrVal: name}, container)
+	if port != -1 {
+		t.Errorf("expected: -1, saw: %d", port)
+	}
+	if err == nil {
+		t.Error("unexpected non-error")
+	}
+}