Merge pull request #29905 from luxas/flake_celery2

Automatic merge from submit-queue

Second attempt to fix #29585

@ixdy @fejta

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/29905)
<!-- Reviewable:end -->
pull/6/head
Kubernetes Submit Queue 2016-08-09 11:54:11 -07:00 committed by GitHub
commit 93f802b1a6
3 changed files with 20 additions and 2 deletions

View File

@ -123,6 +123,13 @@ spec:
resources: resources:
limits: limits:
cpu: 100m cpu: 100m
livenessProbe:
httpGet:
# Path to probe; should be cheap, but representative of typical behavior
path: /
port: 5672
initialDelaySeconds: 30
timeoutSeconds: 1
``` ```
[Download example](rabbitmq-controller.yaml?raw=true) [Download example](rabbitmq-controller.yaml?raw=true)
@ -269,6 +276,8 @@ spec:
containers: containers:
- image: endocode/flower - image: endocode/flower
name: flower name: flower
ports:
- containerPort: 5555
resources: resources:
limits: limits:
cpu: 100m cpu: 100m
@ -276,7 +285,7 @@ spec:
httpGet: httpGet:
# Path to probe; should be cheap, but representative of typical behavior # Path to probe; should be cheap, but representative of typical behavior
path: / path: /
port: 80 port: 5555
initialDelaySeconds: 30 initialDelaySeconds: 30
timeoutSeconds: 1 timeoutSeconds: 1
``` ```

View File

@ -15,6 +15,8 @@ spec:
containers: containers:
- image: endocode/flower - image: endocode/flower
name: flower name: flower
ports:
- containerPort: 5555
resources: resources:
limits: limits:
cpu: 100m cpu: 100m
@ -22,6 +24,6 @@ spec:
httpGet: httpGet:
# Path to probe; should be cheap, but representative of typical behavior # Path to probe; should be cheap, but representative of typical behavior
path: / path: /
port: 80 port: 5555
initialDelaySeconds: 30 initialDelaySeconds: 30
timeoutSeconds: 1 timeoutSeconds: 1

View File

@ -20,3 +20,10 @@ spec:
resources: resources:
limits: limits:
cpu: 100m cpu: 100m
livenessProbe:
httpGet:
# Path to probe; should be cheap, but representative of typical behavior
path: /
port: 5672
initialDelaySeconds: 30
timeoutSeconds: 1