diff --git a/controllers/gce/Makefile b/controllers/gce/Makefile index f01f58302..3763af797 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.1 +TAG = 0.6.2 PREFIX = gcr.io/google_containers/glbc server: diff --git a/controllers/gce/controller/cluster_manager.go b/controllers/gce/controller/cluster_manager.go index 5f613fb2c..8f31c9590 100644 --- a/controllers/gce/controller/cluster_manager.go +++ b/controllers/gce/controller/cluster_manager.go @@ -120,7 +120,7 @@ func (c *ClusterManager) Checkpoint(lbs []*loadbalancers.L7RuntimeInfo, nodeName portMap[p] = struct{}{} } nodePorts = []int64{} - for p, _ := range portMap { + for p := range portMap { nodePorts = append(nodePorts, p) } if err := c.backendPool.Sync(nodePorts); err != nil { diff --git a/controllers/gce/firewalls/fakes.go b/controllers/gce/firewalls/fakes.go index 236d26e0e..a5c196a09 100644 --- a/controllers/gce/firewalls/fakes.go +++ b/controllers/gce/firewalls/fakes.go @@ -48,7 +48,7 @@ func (f *fakeFirewallRules) CreateFirewall(name, msgTag string, srcRange netset. // prefix to the given rule name. Name: f.namer.FrName(name), SourceRanges: srcRange.StringSlice(), - Allowed: []*compute.FirewallAllowed{&compute.FirewallAllowed{Ports: strPorts}}, + Allowed: []*compute.FirewallAllowed{{Ports: strPorts}}, }) return nil } @@ -88,7 +88,7 @@ func (f *fakeFirewallRules) UpdateFirewall(name, msgTag string, srcRange netset. f.fw[i] = &compute.Firewall{ Name: name, SourceRanges: srcRange.StringSlice(), - Allowed: []*compute.FirewallAllowed{&compute.FirewallAllowed{Ports: strPorts}}, + Allowed: []*compute.FirewallAllowed{{Ports: strPorts}}, } } } diff --git a/controllers/gce/loadbalancers/loadbalancers.go b/controllers/gce/loadbalancers/loadbalancers.go index 68ae51286..69321e780 100644 --- a/controllers/gce/loadbalancers/loadbalancers.go +++ b/controllers/gce/loadbalancers/loadbalancers.go @@ -582,6 +582,7 @@ func (l *L7) edgeHop() error { } } if l.runtimeInfo.TLS != nil { + glog.V(3).Infof("Edge hopping https for %v", l.Name) if err := l.edgeHopHttps(); err != nil { return err } diff --git a/controllers/gce/rc.yaml b/controllers/gce/rc.yaml index 0c5b67940..3f6fd6650 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.1 + version: v0.6.2 spec: # There should never be more than 1 controller alive simultaneously. replicas: 1 selector: k8s-app: glbc - version: v0.6.1 + version: v0.6.2 template: metadata: labels: k8s-app: glbc - version: v0.6.1 + version: v0.6.2 name: glbc spec: terminationGracePeriodSeconds: 600 @@ -61,7 +61,7 @@ spec: requests: cpu: 10m memory: 20Mi - - image: gcr.io/google_containers/glbc:0.6.1 + - image: gcr.io/google_containers/glbc:0.6.2 livenessProbe: httpGet: path: /healthz