From 51dd067f5f1bbbc19eb7aa7022c1fcae4c4432d5 Mon Sep 17 00:00:00 2001
From: Zichang Lin <linzichang@huawei.com>
Date: Tue, 10 Nov 2015 14:19:22 +0800
Subject: [PATCH] Update cassandra example according to config best practices

---
 examples/cassandra/README.md                 | 18 +++++++-----------
 examples/cassandra/cassandra-controller.yaml |  6 ++----
 examples/cassandra/cassandra-service.yaml    |  4 ++--
 examples/cassandra/cassandra.yaml            |  2 +-
 hack/test-cmd.sh                             |  4 ++--
 5 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/examples/cassandra/README.md b/examples/cassandra/README.md
index 7adb5c84aea..87bb1e0f9d2 100644
--- a/examples/cassandra/README.md
+++ b/examples/cassandra/README.md
@@ -59,16 +59,14 @@ apiVersion: v1
 kind: ReplicationController
 metadata:
   labels:
-    name: cassandra
+    app: cassandra
   name: cassandra
 spec:
   replicas: 1
-  selector:
-    name: cassandra
   template:
     metadata:
       labels:
-        name: cassandra
+        app: cassandra
     spec:
       containers:
         - command:
@@ -122,13 +120,13 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    name: cassandra
+    app: cassandra
   name: cassandra
 spec:
   ports:
     - port: 9042
   selector:
-    name: cassandra
+    app: cassandra
 ```
 
 [Download example](cassandra-service.yaml?raw=true)
@@ -165,7 +163,7 @@ kind: Endpoints
 metadata:
   creationTimestamp: 2015-06-21T22:34:12Z
   labels:
-    name: cassandra
+    app: cassandra
   name: cassandra
   namespace: default
   resourceVersion: "944373"
@@ -200,16 +198,14 @@ apiVersion: v1
 kind: ReplicationController
 metadata:
   labels:
-    name: cassandra
+    app: cassandra
   name: cassandra
 spec:
   replicas: 1
-  selector:
-    name: cassandra
   template:
     metadata:
       labels:
-        name: cassandra
+        app: cassandra
     spec:
       containers:
         - command:
diff --git a/examples/cassandra/cassandra-controller.yaml b/examples/cassandra/cassandra-controller.yaml
index 30018d316a1..63ea8dbd40a 100644
--- a/examples/cassandra/cassandra-controller.yaml
+++ b/examples/cassandra/cassandra-controller.yaml
@@ -2,16 +2,14 @@ apiVersion: v1
 kind: ReplicationController
 metadata:
   labels:
-    name: cassandra
+    app: cassandra
   name: cassandra
 spec:
   replicas: 1
-  selector:
-    name: cassandra
   template:
     metadata:
       labels:
-        name: cassandra
+        app: cassandra
     spec:
       containers:
         - command:
diff --git a/examples/cassandra/cassandra-service.yaml b/examples/cassandra/cassandra-service.yaml
index ab4eb6c176d..9efbd39061d 100644
--- a/examples/cassandra/cassandra-service.yaml
+++ b/examples/cassandra/cassandra-service.yaml
@@ -2,10 +2,10 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    name: cassandra
+    app: cassandra
   name: cassandra
 spec:
   ports:
     - port: 9042
   selector:
-    name: cassandra
+    app: cassandra
diff --git a/examples/cassandra/cassandra.yaml b/examples/cassandra/cassandra.yaml
index 1dcc28e0a7c..be6c32a3f64 100644
--- a/examples/cassandra/cassandra.yaml
+++ b/examples/cassandra/cassandra.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Pod
 metadata:
   labels:
-    name: cassandra
+    app: cassandra
   name: cassandra
 spec:
   containers:
diff --git a/hack/test-cmd.sh b/hack/test-cmd.sh
index f925d72d773..b62dcb1144c 100755
--- a/hack/test-cmd.sh
+++ b/hack/test-cmd.sh
@@ -804,8 +804,8 @@ __EOF__
   kubectl create -f examples/cassandra/cassandra-controller.yaml "${kube_flags[@]}"
   kubectl scale rc cassandra --replicas=1 "${kube_flags[@]}"
   kubectl create -f examples/cassandra/cassandra-service.yaml "${kube_flags[@]}"
-  kube::test::get_object_assert "all -l'name=cassandra'" "{{range.items}}{{range .metadata.labels}}{{.}}:{{end}}{{end}}" 'cassandra:cassandra:cassandra:'
-  kubectl delete all -l name=cassandra "${kube_flags[@]}"
+  kube::test::get_object_assert "all -l'app=cassandra'" "{{range.items}}{{range .metadata.labels}}{{.}}:{{end}}{{end}}" 'cassandra:cassandra:cassandra:'
+  kubectl delete all -l app=cassandra "${kube_flags[@]}"
 
 
   ###########