DevFW-CICD/ingress-nginx-helm
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bump version

Browse source
This commit is contained in:
Prashanth Balasubramanian 2016-04-17 18:05:49 -07:00
parent fc6d9a47fd
commit d3a51031c3
5 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
controllers/gce/Makefile
View file

@ -1,7 +1,7 @@
all: push all: push
# 0.0 shouldn't clobber any released builds # 0.0 shouldn't clobber any released builds
TAG = 0.6.1 TAG = 0.6.2
PREFIX = gcr.io/google_containers/glbc PREFIX = gcr.io/google_containers/glbc
server: server:

2
controllers/gce/controller/cluster_manager.go
View file

@ -120,7 +120,7 @@ func (c *ClusterManager) Checkpoint(lbs []*loadbalancers.L7RuntimeInfo, nodeName
portMap[p] = struct{}{} portMap[p] = struct{}{}
} }
nodePorts = []int64{} nodePorts = []int64{}
for p, _ := range portMap { for p := range portMap {
nodePorts = append(nodePorts, p) nodePorts = append(nodePorts, p)
} }
if err := c.backendPool.Sync(nodePorts); err != nil { if err := c.backendPool.Sync(nodePorts); err != nil {

4
controllers/gce/firewalls/fakes.go
View file

@ -48,7 +48,7 @@ func (f *fakeFirewallRules) CreateFirewall(name, msgTag string, srcRange netset.
// prefix to the given rule name. // prefix to the given rule name.
Name: f.namer.FrName(name), Name: f.namer.FrName(name),
SourceRanges: srcRange.StringSlice(), SourceRanges: srcRange.StringSlice(),
Allowed: []*compute.FirewallAllowed{&compute.FirewallAllowed{Ports: strPorts}}, Allowed: []*compute.FirewallAllowed{{Ports: strPorts}},
}) })
return nil return nil
} }
@ -88,7 +88,7 @@ func (f *fakeFirewallRules) UpdateFirewall(name, msgTag string, srcRange netset.
f.fw[i] = &compute.Firewall{ f.fw[i] = &compute.Firewall{
Name: name, Name: name,
SourceRanges: srcRange.StringSlice(), SourceRanges: srcRange.StringSlice(),
Allowed: []*compute.FirewallAllowed{&compute.FirewallAllowed{Ports: strPorts}}, Allowed: []*compute.FirewallAllowed{{Ports: strPorts}},
} }
} }
} }

1
controllers/gce/loadbalancers/loadbalancers.go
View file

@ -582,6 +582,7 @@ func (l *L7) edgeHop() error {
} }
} }
if l.runtimeInfo.TLS != nil { if l.runtimeInfo.TLS != nil {
glog.V(3).Infof("Edge hopping https for %v", l.Name)
if err := l.edgeHopHttps(); err != nil { if err := l.edgeHopHttps(); err != nil {
return err return err
} }

8
controllers/gce/rc.yaml
View file

@ -24,18 +24,18 @@ metadata:
name: l7-lb-controller name: l7-lb-controller
labels: labels:
k8s-app: glbc k8s-app: glbc
version: v0.6.1 version: v0.6.2
spec: spec:
# There should never be more than 1 controller alive simultaneously. # There should never be more than 1 controller alive simultaneously.
replicas: 1 replicas: 1
selector: selector:
k8s-app: glbc k8s-app: glbc
version: v0.6.1 version: v0.6.2
template: template:
metadata: metadata:
labels: labels:
k8s-app: glbc k8s-app: glbc
version: v0.6.1 version: v0.6.2
name: glbc name: glbc
spec: spec:
terminationGracePeriodSeconds: 600 terminationGracePeriodSeconds: 600
@ -61,7 +61,7 @@ spec:
requests: requests:
cpu: 10m cpu: 10m
memory: 20Mi memory: 20Mi
- image: gcr.io/google_containers/glbc:0.6.1 - image: gcr.io/google_containers/glbc:0.6.2
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /healthz path: /healthz