From 2afc21c0216b6d2ab21fc05f04fefb7c642925a1 Mon Sep 17 00:00:00 2001
From: Prashanth Balasubramanian <beeps@google.com>
Date: Mon, 4 Apr 2016 14:10:19 -0700
Subject: [PATCH] Bump up glbc version.

---
 controllers/gce/Makefile             | 2 +-
 controllers/gce/backends/backends.go | 6 +++++-
 controllers/gce/main.go              | 2 +-
 controllers/gce/rc.yaml              | 8 ++++----
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/controllers/gce/Makefile b/controllers/gce/Makefile
index 979b3779e..f01f58302 100644
--- a/controllers/gce/Makefile
+++ b/controllers/gce/Makefile
@@ -1,7 +1,7 @@
 all: push
 
 # 0.0 shouldn't clobber any released builds
-TAG = 0.6.0
+TAG = 0.6.1
 PREFIX = gcr.io/google_containers/glbc
 
 server:
diff --git a/controllers/gce/backends/backends.go b/controllers/gce/backends/backends.go
index 711cd40ba..a47190cc5 100644
--- a/controllers/gce/backends/backends.go
+++ b/controllers/gce/backends/backends.go
@@ -59,7 +59,11 @@ func portKey(port int64) string {
 func NewBackendPool(
 	cloud BackendServices,
 	healthChecker healthchecks.HealthChecker,
-	nodePool instances.NodePool, namer utils.Namer, ignorePorts []int64, resyncWithCloud bool) *Backends {
+	nodePool instances.NodePool,
+	namer utils.Namer,
+	ignorePorts []int64,
+	resyncWithCloud bool) *Backends {
+
 	ignored := []string{}
 	for _, p := range ignorePorts {
 		ignored = append(ignored, portKey(p))
diff --git a/controllers/gce/main.go b/controllers/gce/main.go
index ac84c8f17..dd414f9ae 100644
--- a/controllers/gce/main.go
+++ b/controllers/gce/main.go
@@ -58,7 +58,7 @@ const (
 	alphaNumericChar = "0"
 
 	// Current docker image version. Only used in debug logging.
-	imageVersion = "glbc:0.6.0"
+	imageVersion = "glbc:0.6.1"
 )
 
 var (
diff --git a/controllers/gce/rc.yaml b/controllers/gce/rc.yaml
index f777c1e30..0c5b67940 100644
--- a/controllers/gce/rc.yaml
+++ b/controllers/gce/rc.yaml
@@ -24,18 +24,18 @@ metadata:
   name: l7-lb-controller
   labels:
     k8s-app: glbc
-    version: v0.6.0
+    version: v0.6.1
 spec:
   # There should never be more than 1 controller alive simultaneously.
   replicas: 1
   selector:
     k8s-app: glbc
-    version: v0.6.0
+    version: v0.6.1
   template:
     metadata:
       labels:
         k8s-app: glbc
-        version: v0.6.0
+        version: v0.6.1
         name: glbc
     spec:
       terminationGracePeriodSeconds: 600
@@ -61,7 +61,7 @@ spec:
           requests:
             cpu: 10m
             memory: 20Mi
-      - image: gcr.io/google_containers/glbc:0.6.0
+      - image: gcr.io/google_containers/glbc:0.6.1
         livenessProbe:
           httpGet:
             path: /healthz