Skip to content

Commit

Permalink
Merge pull request #1064 from nicksardo/glbc-0.9.6
Browse files Browse the repository at this point in the history
[GLBC] Bump GLBC version to 0.9.6
  • Loading branch information
nicksardo committed Aug 3, 2017
2 parents 391d0b5 + ecac1bf commit fe19ebb
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion controllers/gce/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
all: push

# 0.0 shouldn't clobber any released builds
TAG = 0.9.5
TAG = 0.9.6
PREFIX = gcr.io/google_containers/glbc

server:
Expand Down
2 changes: 1 addition & 1 deletion controllers/gce/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ So simply delete the replication controller:
$ kubectl get rc glbc
CONTROLLER CONTAINER(S) IMAGE(S) SELECTOR REPLICAS AGE
glbc default-http-backend gcr.io/google_containers/defaultbackend:1.0 k8s-app=glbc,version=v0.5 1 2m
l7-lb-controller gcr.io/google_containers/glbc:0.9.5
l7-lb-controller gcr.io/google_containers/glbc:0.9.6

$ kubectl delete rc glbc
replicationcontroller "glbc" deleted
Expand Down
2 changes: 1 addition & 1 deletion controllers/gce/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ const (
alphaNumericChar = "0"

// Current docker image version. Only used in debug logging.
imageVersion = "glbc:0.9.5"
imageVersion = "glbc:0.9.6"

// Key used to persist UIDs to configmaps.
uidConfigMapName = "ingress-uid"
Expand Down
8 changes: 4 additions & 4 deletions controllers/gce/rc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,18 @@ metadata:
name: l7-lb-controller
labels:
k8s-app: glbc
version: v0.9.5
version: v0.9.6
spec:
# There should never be more than 1 controller alive simultaneously.
replicas: 1
selector:
k8s-app: glbc
version: v0.9.5
version: v0.9.6
template:
metadata:
labels:
k8s-app: glbc
version: v0.9.5
version: v0.9.6
name: glbc
spec:
terminationGracePeriodSeconds: 600
Expand All @@ -61,7 +61,7 @@ spec:
requests:
cpu: 10m
memory: 20Mi
- image: gcr.io/google_containers/glbc:0.9.5
- image: gcr.io/google_containers/glbc:0.9.6
livenessProbe:
httpGet:
path: /healthz
Expand Down

0 comments on commit fe19ebb

Please sign in to comment.