Skip to content

Commit

Permalink
Merge pull request kubernetes#17614 from bprashanth/IngressE2E
Browse files Browse the repository at this point in the history
Auto commit by PR queue bot
  • Loading branch information
k8s-merge-robot committed Dec 1, 2015
2 parents d8c1a9a + c553b15 commit 53a544d
Show file tree
Hide file tree
Showing 5 changed files with 319 additions and 46 deletions.
10 changes: 6 additions & 4 deletions cluster/addons/cluster-loadbalancing/glbc/glbc-controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@ metadata:
namespace: kube-system
labels:
k8s-app: glbc
version: v0.5
version: v0.5.1
kubernetes.io/cluster-service: "true"
kubernetes.io/name: "GLBC"
spec:
# There should never be more than 1 controller alive simultaneously.
replicas: 1
selector:
k8s-app: glbc
version: v0.5
version: v0.5.1
template:
metadata:
labels:
k8s-app: glbc
version: v0.5
version: v0.5.1
name: glbc
kubernetes.io/cluster-service: "true"
spec:
Expand All @@ -45,13 +45,15 @@ spec:
requests:
cpu: 10m
memory: 20Mi
- image: gcr.io/google_containers/glbc:0.5
- image: gcr.io/google_containers/glbc:0.5.1
livenessProbe:
httpGet:
path: /healthz
port: 8081
scheme: HTTP
initialDelaySeconds: 30
# healthz reaches out to GCE
periodSeconds: 30
timeoutSeconds: 5
name: l7-lb-controller
resources:
Expand Down
2 changes: 1 addition & 1 deletion hack/jenkins/e2e.sh
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ GCE_SLOW_TESTS=(

# Tests which are not able to be run in parallel.
GCE_PARALLEL_SKIP_TESTS=(
"GCE\sL7\sLoadBalancer\sController" # TODO: This cannot run in parallel with other L4 tests till quota has been bumped up.
"GCE\sL7\sLoadBalancer\sController" # namespaced watch flakes, issue: #17805
"Nodes\sNetwork"
"MaxPods"
"Resource\susage\sof\ssystem\scontainers"
Expand Down
2 changes: 1 addition & 1 deletion hack/lib/golang.sh
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ readonly KUBE_CLIENT_PLATFORMS=(
# arbitrary, but is a reasonable splitting point for 2015
# laptops-versus-not.
#
# If you are using boot2docker, the following seems to work (note
# If you are using boot2docker, the following seems to work (note
# that 12000 rounds to 11G):
# boot2docker down
# VBoxManage modifyvm boot2docker-vm --memory 12000
Expand Down
Loading

0 comments on commit 53a544d

Please sign in to comment.