From 02349e7889ea66b4bb94e292ceb5ced773cf462a Mon Sep 17 00:00:00 2001
From: Zichang Lin <linzichang@huawei.com>
Date: Wed, 30 Sep 2015 15:56:57 +0800
Subject: [PATCH] Update celery-rabbitmq example according to config best
 practices

---
 examples/celery-rabbitmq/README.md            | 20 +++++++------------
 .../celery-rabbitmq/celery-controller.yaml    |  4 +---
 .../celery-rabbitmq/flower-controller.yaml    |  4 +---
 examples/celery-rabbitmq/flower-service.yaml  |  2 +-
 .../celery-rabbitmq/rabbitmq-controller.yaml  |  4 +---
 .../celery-rabbitmq/rabbitmq-service.yaml     |  2 +-
 6 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/examples/celery-rabbitmq/README.md b/examples/celery-rabbitmq/README.md
index cc2a4db85c5..50e28dedda3 100644
--- a/examples/celery-rabbitmq/README.md
+++ b/examples/celery-rabbitmq/README.md
@@ -71,7 +71,7 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    name: rabbitmq
+    component: rabbitmq
   name: rabbitmq-service
 spec:
   ports:
@@ -104,12 +104,10 @@ apiVersion: v1
 kind: ReplicationController
 metadata:
   labels:
-    name: rabbitmq
+    component: rabbitmq
   name: rabbitmq-controller
 spec:
   replicas: 1
-  selector:
-    component: rabbitmq
   template:
     metadata:
       labels:
@@ -145,12 +143,10 @@ apiVersion: v1
 kind: ReplicationController
 metadata:
   labels:
-    name: celery
+    component: celery
   name: celery-controller
 spec:
   replicas: 1
-  selector:
-    component: celery
   template:
     metadata:
       labels:
@@ -227,7 +223,7 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    name: flower
+    component: flower
   name: flower-service
 spec:
   ports:
@@ -259,12 +255,10 @@ apiVersion: v1
 kind: ReplicationController
 metadata:
   labels:
-    name: flower
+    component: flower
   name: flower-controller
 spec:
   replicas: 1
-  selector:
-    component: flower
   template:
     metadata:
       labels:
@@ -302,8 +296,8 @@ rabbitmq-controller-5eb2l                      1/1       Running      0
 `kubectl get service flower-service` will help you to get the external IP addresses of the flower service.
 
 ```
-NAME             LABELS        SELECTOR                         IP(S)            PORT(S)
-flower-service   name=flower   app=taskQueue,component=flower   10.0.44.166      5555/TCP
+NAME             LABELS             SELECTOR                         IP(S)            PORT(S)
+flower-service   component=flower   app=taskQueue,component=flower   10.0.44.166      5555/TCP
                                                                 162.222.181.180
 ```
 
diff --git a/examples/celery-rabbitmq/celery-controller.yaml b/examples/celery-rabbitmq/celery-controller.yaml
index 31a4f52a308..ac2224b467a 100644
--- a/examples/celery-rabbitmq/celery-controller.yaml
+++ b/examples/celery-rabbitmq/celery-controller.yaml
@@ -2,12 +2,10 @@ apiVersion: v1
 kind: ReplicationController
 metadata:
   labels:
-    name: celery
+    component: celery
   name: celery-controller
 spec:
   replicas: 1
-  selector:
-    component: celery
   template:
     metadata:
       labels:
diff --git a/examples/celery-rabbitmq/flower-controller.yaml b/examples/celery-rabbitmq/flower-controller.yaml
index d7dc60915ef..06935085469 100644
--- a/examples/celery-rabbitmq/flower-controller.yaml
+++ b/examples/celery-rabbitmq/flower-controller.yaml
@@ -2,12 +2,10 @@ apiVersion: v1
 kind: ReplicationController
 metadata:
   labels:
-    name: flower
+    component: flower
   name: flower-controller
 spec:
   replicas: 1
-  selector:
-    component: flower
   template:
     metadata:
       labels:
diff --git a/examples/celery-rabbitmq/flower-service.yaml b/examples/celery-rabbitmq/flower-service.yaml
index 1fdf1ee906e..9ae819d21c6 100644
--- a/examples/celery-rabbitmq/flower-service.yaml
+++ b/examples/celery-rabbitmq/flower-service.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    name: flower
+    component: flower
   name: flower-service
 spec:
   ports:
diff --git a/examples/celery-rabbitmq/rabbitmq-controller.yaml b/examples/celery-rabbitmq/rabbitmq-controller.yaml
index 2d68e34de6e..5baa32c4393 100644
--- a/examples/celery-rabbitmq/rabbitmq-controller.yaml
+++ b/examples/celery-rabbitmq/rabbitmq-controller.yaml
@@ -2,12 +2,10 @@ apiVersion: v1
 kind: ReplicationController
 metadata:
   labels:
-    name: rabbitmq
+    component: rabbitmq
   name: rabbitmq-controller
 spec:
   replicas: 1
-  selector:
-    component: rabbitmq
   template:
     metadata:
       labels:
diff --git a/examples/celery-rabbitmq/rabbitmq-service.yaml b/examples/celery-rabbitmq/rabbitmq-service.yaml
index ec29b32ce9a..75b7cc4650b 100644
--- a/examples/celery-rabbitmq/rabbitmq-service.yaml
+++ b/examples/celery-rabbitmq/rabbitmq-service.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    name: rabbitmq
+    component: rabbitmq
   name: rabbitmq-service
 spec:
   ports: