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

Merge pull request #866 from nicksardo/gclb-0.9.5

Browse source 
[GLBC] Bump GLBC version to 0.9.5
This commit is contained in:
Nick Sardo 2017-06-14 18:24:01 -07:00 committed by GitHub
commit 13c6b0e44c
4 changed files with 7 additions and 7 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.9.4 TAG = 0.9.5
PREFIX = gcr.io/google_containers/glbc PREFIX = gcr.io/google_containers/glbc
server: server:

2
controllers/gce/README.md
View file

@ -327,7 +327,7 @@ So simply delete the replication controller:
$ kubectl get rc glbc $ kubectl get rc glbc
CONTROLLER CONTAINER(S) IMAGE(S) SELECTOR REPLICAS AGE 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 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.4 l7-lb-controller gcr.io/google_containers/glbc:0.9.5
$ kubectl delete rc glbc $ kubectl delete rc glbc
replicationcontroller "glbc" deleted replicationcontroller "glbc" deleted

2
controllers/gce/main.go
View file

@ -69,7 +69,7 @@ const (
alphaNumericChar = "0" alphaNumericChar = "0"
// Current docker image version. Only used in debug logging. // Current docker image version. Only used in debug logging.
imageVersion = "glbc:0.9.4" imageVersion = "glbc:0.9.5"
// Key used to persist UIDs to configmaps. // Key used to persist UIDs to configmaps.
uidConfigMapName = "ingress-uid" uidConfigMapName = "ingress-uid"

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.9.4 version: v0.9.5
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.9.4 version: v0.9.5
template: template:
metadata: metadata:
labels: labels:
k8s-app: glbc k8s-app: glbc
version: v0.9.4 version: v0.9.5
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.9.4 - image: gcr.io/google_containers/glbc:0.9.5
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /healthz path: /healthz