Merge pull request #14988 from bprashanth/IngressE2E

Auto commit by PR queue bot

hack/jenkins/e2e.sh

@@ -100,6 +100,7 @@ REBOOT_SKIP_TESTS=(
 GCE_DEFAULT_SKIP_TESTS=(
     "${REBOOT_SKIP_TESTS[@]}"
     "Reboot"
+    "ServiceLoadBalancer"
     )
 
 # Tests which cannot be run on GKE, e.g. because they require

test/e2e/serviceloadbalancers.go

@@ -0,0 +1,292 @@
+/*
+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 e2e
+
+import (
+	"fmt"
+	"io/ioutil"
+	"net/http"
+	"path/filepath"
+
+	"k8s.io/kubernetes/pkg/api"
+	client "k8s.io/kubernetes/pkg/client/unversioned"
+	"k8s.io/kubernetes/pkg/fields"
+	"k8s.io/kubernetes/pkg/labels"
+	"k8s.io/kubernetes/pkg/util/wait"
+	utilyaml "k8s.io/kubernetes/pkg/util/yaml"
+
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+// getLoadBalancerControllers returns a list of LBCtesters.
+func getLoadBalancerControllers(repoRoot string, client *client.Client) []LBCTester {
+	return []LBCTester{
+		&haproxyControllerTester{
+			name:   "haproxy",
+			cfg:    filepath.Join(repoRoot, "test", "e2e", "testing-manifests", "haproxyrc.yaml"),
+			client: client,
+		},
+	}
+}
+
+// getIngManagers returns a list of ingManagers.
+func getIngManagers(repoRoot string, client *client.Client) []*ingManager {
+	return []*ingManager{
+		{
+			name:        "netexec",
+			rcCfgPaths:  []string{filepath.Join(repoRoot, "test", "e2e", "testing-manifests", "netexecrc.yaml")},
+			svcCfgPaths: []string{filepath.Join(repoRoot, "test", "e2e", "testing-manifests", "netexecsvc.yaml")},
+			svcNames:    []string{},
+			client:      client,
+		},
+	}
+}
+
+// LBCTester is an interface used to test loadbalancer controllers.
+type LBCTester interface {
+	// start starts the loadbalancer controller in the given namespace
+	start(namespace string) error
+	// lookup returns the address (ip/hostname) associated with ingressKey
+	lookup(ingressKey string) string
+	// stop stops the loadbalancer controller
+	stop() error
+	// name returns the name of the loadbalancer
+	getName() string
+}
+
+// haproxyControllerTester implementes LBCTester for bare metal haproxy LBs.
+type haproxyControllerTester struct {
+	client      *client.Client
+	cfg         string
+	rcName      string
+	rcNamespace string
+	name        string
+	address     []string
+}
+
+func (h *haproxyControllerTester) getName() string {
+	return h.name
+}
+
+func (h *haproxyControllerTester) start(namespace string) (err error) {
+
+	// Create a replication controller with the given configuration.
+	rc := rcFromManifest(h.cfg)
+	rc.Namespace = namespace
+	rc.Spec.Template.Labels["rcName"] = rc.Name
+
+	// Add the --namespace arg.
+	// TODO: Remove this when we have proper namespace support.
+	for i, c := range rc.Spec.Template.Spec.Containers {
+		rc.Spec.Template.Spec.Containers[i].Args = append(
+			c.Args, fmt.Sprintf("--namespace=%v", namespace))
+		Logf("Container args %+v", rc.Spec.Template.Spec.Containers[i].Args)
+	}
+
+	rc, err = h.client.ReplicationControllers(rc.Namespace).Create(rc)
+	if err != nil {
+		return
+	}
+	if err = waitForRCPodsRunning(h.client, namespace, h.rcName); err != nil {
+		return
+	}
+	h.rcName = rc.Name
+	h.rcNamespace = rc.Namespace
+
+	// Find the pods of the rc we just created.
+	labelSelector := labels.SelectorFromSet(
+		labels.Set(map[string]string{"rcName": h.rcName}))
+	pods, err := h.client.Pods(h.rcNamespace).List(
+		labelSelector, fields.Everything())
+	if err != nil {
+		return err
+	}
+
+	// Find the external addresses of the nodes the pods are running on.
+	for _, p := range pods.Items {
+		wait.Poll(pollInterval, serviceRespondingTimeout, func() (bool, error) {
+			address, err := getHostExternalAddress(h.client, &p)
+			if err != nil {
+				Logf("%v", err)
+				return false, nil
+			}
+			h.address = append(h.address, address)
+			return true, nil
+		})
+	}
+	if len(h.address) == 0 {
+		return fmt.Errorf("No external ips found for loadbalancer %v", h.getName())
+	}
+	return nil
+}
+
+func (h *haproxyControllerTester) stop() error {
+	return h.client.ReplicationControllers(h.rcNamespace).Delete(h.rcName)
+}
+
+func (h *haproxyControllerTester) lookup(ingressKey string) string {
+	// The address of a service is the address of the lb/servicename, currently.
+	return fmt.Sprintf("http://%v/%v", h.address[0], ingressKey)
+}
+
+// ingManager starts an rc and the associated service.
+type ingManager struct {
+	rcCfgPaths  []string
+	svcCfgPaths []string
+	ingCfgPath  string
+	name        string
+	namespace   string
+	client      *client.Client
+	svcNames    []string
+}
+
+func (s *ingManager) getName() string {
+	return s.name
+}
+
+func (s *ingManager) start(namespace string) (err error) {
+	// Create rcs
+	for _, rcPath := range s.rcCfgPaths {
+		rc := rcFromManifest(rcPath)
+		rc.Namespace = namespace
+		rc.Spec.Template.Labels["rcName"] = rc.Name
+		rc, err = s.client.ReplicationControllers(rc.Namespace).Create(rc)
+		if err != nil {
+			return
+		}
+		if err = waitForRCPodsRunning(s.client, rc.Namespace, rc.Name); err != nil {
+			return
+		}
+	}
+	// Create services.
+	// Note that it's upto the caller to make sure the service actually matches
+	// the pods of the rc.
+	for _, svcPath := range s.svcCfgPaths {
+		svc := svcFromManifest(svcPath)
+		svc.Namespace = namespace
+		svc, err = s.client.Services(svc.Namespace).Create(svc)
+		if err != nil {
+			return
+		}
+		// TODO: This is short term till we have an Ingress.
+		s.svcNames = append(s.svcNames, svc.Name)
+	}
+	s.name = s.svcNames[0]
+	s.namespace = namespace
+	return nil
+}
+
+func (s *ingManager) test(path string) error {
+	url := fmt.Sprintf("%v/hostName", path)
+	httpClient := &http.Client{}
+	return wait.Poll(pollInterval, serviceRespondingTimeout, func() (bool, error) {
+		body, err := simpleGET(httpClient, url)
+		if err != nil {
+			Logf("%v\n%v\n%v", url, body, err)
+			return false, nil
+		}
+		return true, nil
+	})
+}
+
+var _ = Describe("ServiceLoadBalancer", func() {
+	// These variables are initialized after framework's beforeEach.
+	var ns string
+	var repoRoot string
+	var client *client.Client
+
+	framework := Framework{BaseName: "servicelb"}
+
+	BeforeEach(func() {
+		framework.beforeEach()
+		client = framework.Client
+		ns = framework.Namespace.Name
+		repoRoot = testContext.RepoRoot
+	})
+
+	AfterEach(func() {
+		framework.afterEach()
+	})
+
+	It("should support simple GET on Ingress ips", func() {
+		for _, t := range getLoadBalancerControllers(repoRoot, client) {
+			By(fmt.Sprintf("Starting loadbalancer controller %v in namespace %v", t.getName(), ns))
+			Expect(t.start(ns)).NotTo(HaveOccurred())
+
+			for _, s := range getIngManagers(repoRoot, client) {
+				By(fmt.Sprintf("Starting ingress manager %v in namespace %v", s.getName(), ns))
+				Expect(s.start(ns)).NotTo(HaveOccurred())
+
+				for _, sName := range s.svcNames {
+					path := t.lookup(sName)
+					Logf("Testing path %v", path)
+					Expect(s.test(path)).NotTo(HaveOccurred())
+				}
+			}
+
+			Expect(t.stop()).NotTo(HaveOccurred())
+		}
+	})
+})
+
+// simpleGET executes a get on the given url, returns error if non-200 returned.
+func simpleGET(c *http.Client, url string) (string, error) {
+	res, err := c.Get(url)
+	if err != nil {
+		return "", err
+	}
+	defer res.Body.Close()
+	rawBody, err := ioutil.ReadAll(res.Body)
+	if err != nil {
+		return "", err
+	}
+	body := string(rawBody)
+	if res.StatusCode != http.StatusOK {
+		err = fmt.Errorf(
+			"GET returned http error %v", res.StatusCode)
+	}
+	return body, err
+}
+
+// rcFromManifest reads a .json/yaml file and returns the rc in it.
+func rcFromManifest(fileName string) *api.ReplicationController {
+	var controller api.ReplicationController
+	Logf("Parsing rc from %v", fileName)
+	data, err := ioutil.ReadFile(fileName)
+	Expect(err).NotTo(HaveOccurred())
+
+	json, err := utilyaml.ToJSON(data)
+	Expect(err).NotTo(HaveOccurred())
+
+	Expect(api.Scheme.DecodeInto(json, &controller)).NotTo(HaveOccurred())
+	return &controller
+}
+
+// svcFromManifest reads a .json/yaml file and returns the rc in it.
+func svcFromManifest(fileName string) *api.Service {
+	var svc api.Service
+	Logf("Parsing service from %v", fileName)
+	data, err := ioutil.ReadFile(fileName)
+	Expect(err).NotTo(HaveOccurred())
+
+	json, err := utilyaml.ToJSON(data)
+	Expect(err).NotTo(HaveOccurred())
+
+	Expect(api.Scheme.DecodeInto(json, &svc)).NotTo(HaveOccurred())
+	return &svc
+}

test/e2e/testing-manifests/haproxyrc.yaml

@@ -0,0 +1,51 @@
+kind: ReplicationController
+apiVersion: v1
+metadata:
+  name: service-loadbalancer
+  labels:
+    app: service-loadbalancer
+    version: v1
+spec:
+  replicas: 1
+  selector:
+    app: service-loadbalancer
+    version: v1
+  template:
+    metadata:
+      labels:
+        app: service-loadbalancer
+        version: v1
+    spec:
+      nodeSelector:
+        role: loadbalancer
+      containers:
+      - image: gcr.io/google_containers/servicelb:0.1
+        imagePullPolicy: Always
+        livenessProbe:
+          httpGet:
+            path: /healthz
+            port: 8081
+            scheme: HTTP
+          initialDelaySeconds: 30
+          timeoutSeconds: 5
+        name: haproxy
+        ports:
+        # All http services
+        - containerPort: 80
+          hostPort: 80
+          protocol: TCP
+        # nginx https
+        - containerPort: 443
+          hostPort: 8080
+          protocol: TCP
+        # mysql
+        - containerPort: 3306
+          hostPort: 3306
+          protocol: TCP
+        # haproxy stats
+        - containerPort: 1936
+          hostPort: 1936
+          protocol: TCP
+        resources: {}
+        args:
+        - --tcp-services=mysql:3306,nginxsvc:443

test/e2e/testing-manifests/nginxrc.yaml

@@ -0,0 +1,16 @@
+apiVersion: v1
+kind: ReplicationController
+metadata:
+  name: my-nginx
+spec:
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: nginx
+    spec:
+      containers:
+      - name: nginxhttps
+        image: bprashanth/nginxhttps:1.0
+        ports:
+        - containerPort: 80

test/e2e/testing-manifests/nginxsvc.yaml

@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: nginxsvc
+  labels:
+    app: nginx
+spec:
+  ports:
+  - port: 80
+    protocol: TCP
+    name: http
+  selector:
+    app: nginx
+

test/e2e/util.go

@@ -1998,3 +1998,26 @@ func waitForClusterSize(c *client.Client, size int, timeout time.Duration) error
 	}
 	return fmt.Errorf("timeout waiting %v for cluster size to be %d", timeout, size)
 }
+
+// getHostExternalAddress gets the node for a pod and returns the first External
+// address. Returns an error if the node the pod is on doesn't have an External
+// address.
+func getHostExternalAddress(client *client.Client, p *api.Pod) (externalAddress string, err error) {
+	node, err := client.Nodes().Get(p.Spec.NodeName)
+	if err != nil {
+		return "", err
+	}
+	for _, address := range node.Status.Addresses {
+		if address.Type == api.NodeExternalIP {
+			if address.Address != "" {
+				externalAddress = address.Address
+				break
+			}
+		}
+	}
+	if externalAddress == "" {
+		err = fmt.Errorf("No external address for pod %v on node %v",
+			p.Name, p.Spec.NodeName)
+	}
+	return
+}