Merge pull request #1349 from containous/prepare-release-v1.2.1

Prepare release v1.2.1
2017-03-27 17:08:32 +02:00 · 2017-03-27 15:45:00 +02:00 · 2017-03-27 15:41:36 +02:00 · 2017-03-27 14:39:14 +02:00 · 2017-03-24 09:32:30 +01:00 · 2017-03-22 18:59:39 +01:00
5 changed files with 22 additions and 14 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Change Log

+## [v1.2.1](https://github.com/containous/traefik/tree/v1.2.1) (2017-03-27)
+[Full Changelog](https://github.com/containous/traefik/compare/v1.2.0...v1.2.1)
+
+**Merged pull requests:**
+
+- bump lego 0e2937900 [\#1347](https://github.com/containous/traefik/pull/1347) ([emilevauge](https://github.com/emilevauge))
+- k8s: Do not log service fields when GetService is failing. [\#1331](https://github.com/containous/traefik/pull/1331) ([timoreimann](https://github.com/timoreimann))
+
 ## [v1.2.0](https://github.com/containous/traefik/tree/v1.2.0) (2017-03-20)
 [Full Changelog](https://github.com/containous/traefik/compare/v1.1.2...v1.2.0)

--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: 741ec5fae23f12e6c0fa0e4c7c00c0af06fac1ddc199dd4b45c904856890b347
-updated: 2017-03-15T10:48:05.202095822+01:00
+hash: b689cb0faed68086641d9e3504ee29498e5bf06b088ad4fcd1e76543446d4d9a
+updated: 2017-03-27T14:29:54.009570184+02:00
 imports:
 - name: bitbucket.org/ww/goautoneg
  version: 75cd24fc2f2c2a2088577d12123ddee5f54e0675
@@ -125,6 +125,10 @@ imports:
  version: f6b1d56f1c048bd94d7e42ac36efb4d57b069b6f
 - name: github.com/dgrijalva/jwt-go
  version: 9ed569b5d1ac936e6494082958d63a6aa4fff99a
+- name: github.com/dnsimple/dnsimple-go
+  version: eeb343928d9a3de357a650c8c25d8f1318330d57
+  subpackages:
+  - dnsimple
 - name: github.com/docker/distribution
  version: 325b0804fef3a66309d962357aac3c2ce3f4d329
  subpackages:
@@ -482,12 +486,8 @@ imports:
  - plugin
  - plugin/rewrite
  - router
- name: github.com/weppos/dnsimple-go
-  version: 65c1ca73cb19baf0f8b2b33219b7f57595a3ccb0
-  subpackages:
-  - dnsimple
 - name: github.com/xenolf/lego
-  version: ce8fb060cb8361a9ff8b5fb7c2347fa907b6fcac
+  version: 0e2937900b224325f4476745a9b53aef246b7410
  subpackages:
  - acme
  - providers/dns
--- a/glide.yaml
+++ b/glide.yaml
@@ -62,7 +62,7 @@ import:
  subpackages:
  - plugin/rewrite
 - package: github.com/xenolf/lego
-  version: ce8fb060cb8361a9ff8b5fb7c2347fa907b6fcac
+  version: 0e2937900b224325f4476745a9b53aef246b7410
  subpackages:
  - acme
 - package: gopkg.in/fsnotify.v1
--- a/provider/kubernetes.go
+++ b/provider/kubernetes.go
@@ -161,12 +161,12 @@ func (provider *Kubernetes) loadIngresses(k8sClient k8s.Client) (*types.Configur
 				}
 				service, exists, err := k8sClient.GetService(i.ObjectMeta.Namespace, pa.Backend.ServiceName)
 				if err != nil {
-					log.Errorf("Error while retrieving service information from k8s API %s/%s: %v", service.ObjectMeta.Namespace, pa.Backend.ServiceName, err)
+					log.Errorf("Error while retrieving service information from k8s API %s/%s: %v", i.ObjectMeta.Namespace, pa.Backend.ServiceName, err)
 					return nil, err
 				}

 				if !exists {
-					log.Errorf("Service not found for %s/%s", service.ObjectMeta.Namespace, pa.Backend.ServiceName)
+					log.Errorf("Service not found for %s/%s", i.ObjectMeta.Namespace, pa.Backend.ServiceName)
 					delete(templateObjects.Frontends, r.Host+pa.Path)
 					continue
 				}
--- a/provider/kubernetes_test.go
+++ b/provider/kubernetes_test.go
@@ -1821,7 +1821,7 @@ func (c clientMock) GetIngresses(namespaces k8s.Namespaces) []*v1beta1.Ingress {

 func (c clientMock) GetService(namespace, name string) (*v1.Service, bool, error) {
 	if c.apiServiceError != nil {
-		return &v1.Service{}, false, c.apiServiceError
+		return nil, false, c.apiServiceError
 	}

 	for _, service := range c.services {
@@ -1829,12 +1829,12 @@ func (c clientMock) GetService(namespace, name string) (*v1.Service, bool, error
 			return service, true, nil
 		}
 	}
-	return &v1.Service{}, false, nil
+	return nil, false, nil
 }

 func (c clientMock) GetEndpoints(namespace, name string) (*v1.Endpoints, bool, error) {
 	if c.apiEndpointsError != nil {
-		return &v1.Endpoints{}, false, c.apiEndpointsError
+		return nil, false, c.apiEndpointsError
 	}

 	for _, endpoints := range c.endpoints {
@@ -1844,7 +1844,7 @@ func (c clientMock) GetEndpoints(namespace, name string) (*v1.Endpoints, bool, e
 	}

 	if c.properExists {
-		return &v1.Endpoints{}, false, nil
+		return nil, false, nil
 	}

 	return &v1.Endpoints{}, true, nil
Author	SHA1	Message	Date
Emile Vauge	fba3db5291	Merge pull request #1349 from containous/prepare-release-v1.2.1 Prepare release v1.2.1	2017-03-27 17:08:32 +02:00
Emile Vauge	023cda1398	Prepare release v1.2.1 Signed-off-by: Emile Vauge <emile@vauge.com>	2017-03-27 15:45:00 +02:00
Emile Vauge	3cf6d7e9e5	Merge pull request #1347 from containous/bump-lego-0e2937900 bump lego 0e2937900	2017-03-27 15:41:36 +02:00
Emile Vauge	0d657a09b0	bump lego 0e2937900 Signed-off-by: Emile Vauge <emile@vauge.com>	2017-03-27 14:39:14 +02:00
Emile Vauge	07176396e2	Merge pull request #1331 from containous/k8s-fix-logging-when-objects-are-missing k8s: Do not log service fields when GetService is failing.	2017-03-24 09:32:30 +01:00
Timo Reimann	5183c98fb7	k8s: Do not log service fields when GetService is failing. Update tests too.	2017-03-22 18:59:39 +01:00