Merge pull request #1550 from aledbf/e2e-4

Add e2e tests - default backend

pkg/ingress/type_equals_test.go

@@ -24,19 +24,19 @@ import (
 )
 
 func TestEqualConfiguration(t *testing.T) {
-	ap, _ := filepath.Abs("../../tests/manifests/configuration-a.json")
+	ap, _ := filepath.Abs("../../test/manifests/configuration-a.json")
 	a, err := readJSON(ap)
 	if err != nil {
 		t.Errorf("unexpected error reading JSON file: %v", err)
 	}
 
-	bp, _ := filepath.Abs("../../tests/manifests/configuration-b.json")
+	bp, _ := filepath.Abs("../../test/manifests/configuration-b.json")
 	b, err := readJSON(bp)
 	if err != nil {
 		t.Errorf("unexpected error reading JSON file: %v", err)
 	}
 
-	cp, _ := filepath.Abs("../../tests/manifests/configuration-c.json")
+	cp, _ := filepath.Abs("../../test/manifests/configuration-c.json")
 	c, err := readJSON(cp)
 	if err != nil {
 		t.Errorf("unexpected error reading JSON file: %v", err)

pkg/k8s/ensure.go

@@ -0,0 +1,58 @@
+/*
+Copyright 2017 The Kubernetes Authors.
+
+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 k8s
+
+import (
+	api "k8s.io/api/core/v1"
+	core "k8s.io/api/core/v1"
+	extensions "k8s.io/api/extensions/v1beta1"
+	k8sErrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/client-go/kubernetes"
+)
+
+func EnsureSecret(cl kubernetes.Interface, secret *api.Secret) (*api.Secret, error) {
+	s, err := cl.CoreV1().Secrets(secret.Namespace).Create(secret)
+	if err != nil {
+		if k8sErrors.IsAlreadyExists(err) {
+			return cl.CoreV1().Secrets(secret.Namespace).Update(secret)
+		}
+		return nil, err
+	}
+	return s, nil
+}
+
+func EnsureIngress(cl kubernetes.Interface, ingress *extensions.Ingress) (*extensions.Ingress, error) {
+	s, err := cl.ExtensionsV1beta1().Ingresses(ingress.Namespace).Update(ingress)
+	if err != nil {
+		if k8sErrors.IsNotFound(err) {
+			return cl.ExtensionsV1beta1().Ingresses(ingress.Namespace).Create(ingress)
+		}
+		return nil, err
+	}
+	return s, nil
+}
+
+func EnsureService(cl kubernetes.Interface, service *core.Service) (*core.Service, error) {
+	s, err := cl.CoreV1().Services(service.Namespace).Update(service)
+	if err != nil {
+		if k8sErrors.IsNotFound(err) {
+			return cl.CoreV1().Services(service.Namespace).Create(service)
+		}
+		return nil, err
+	}
+	return s, nil
+}

pkg/nginx/template/template_test.go

@@ -163,7 +163,7 @@ func TestBuildAuthResponseHeaders(t *testing.T) {
 
 func TestTemplateWithData(t *testing.T) {
 	pwd, _ := os.Getwd()
-	f, err := os.Open(path.Join(pwd, "../../../tests/data/config.json"))
+	f, err := os.Open(path.Join(pwd, "../../../test/data/config.json"))
 	if err != nil {
 		t.Errorf("unexpected error reading json file: %v", err)
 	}