Merge pull request #29905 from luxas/flake_celery2

Automatic merge from submit-queue Second attempt to fix #29585 @ixdy @fejta  --- 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)

Merge pull request #29905 from luxas/flake_celery2
93f802b1 · Kubernetes Submit Queue · GitHub · bd421c96 · 56755b83 · 93f802b1
Commit 93f802b1 authored Aug 09, 2016 by Kubernetes Submit Queue Committed by GitHub Aug 09, 2016
Showing with 20 additions and 2 deletions

README.md examples/celery-rabbitmq/README.md +10 -1

flower-controller.yaml examples/celery-rabbitmq/flower-controller.yaml +3 -1

rabbitmq-controller.yaml examples/celery-rabbitmq/rabbitmq-controller.yaml +7 -0

No files found.
--- a/examples/celery-rabbitmq/README.md
+++ b/examples/celery-rabbitmq/README.md
@@ -123,6 +123,13 @@ spec:
        resources:
          limits:
            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)
@@ -269,6 +276,8 @@ spec:
      containers:
      - image: endocode/flower
        name: flower
+        ports:
+        - containerPort: 5555
        resources:
          limits:
            cpu: 100m
@@ -276,7 +285,7 @@ spec:
          httpGet:
            # Path to probe; should be cheap, but representative of typical behavior
            path: /
-            port: 80
+            port: 5555
          initialDelaySeconds: 30
          timeoutSeconds: 1
 ```

--- a/examples/celery-rabbitmq/flower-controller.yaml
+++ b/examples/celery-rabbitmq/flower-controller.yaml
@@ -15,6 +15,8 @@ spec:
      containers:
      - image: endocode/flower
        name: flower
+        ports:
+        - containerPort: 5555
        resources:
          limits:
            cpu: 100m
@@ -22,6 +24,6 @@ spec:
          httpGet:
            # Path to probe; should be cheap, but representative of typical behavior
            path: /
-            port: 80
+            port: 5555
          initialDelaySeconds: 30
          timeoutSeconds: 1
--- a/examples/celery-rabbitmq/rabbitmq-controller.yaml
+++ b/examples/celery-rabbitmq/rabbitmq-controller.yaml
@@ -20,3 +20,10 @@ spec:
        resources:
          limits:
            cpu: 100m
+        livenessProbe:
+          httpGet:
+            # Path to probe; should be cheap, but representative of typical behavior
+            path: /
+            port: 5672
+          initialDelaySeconds: 30
+          timeoutSeconds: 1