Merge pull request kubernetes#14623 from linzichang/fixup-cassandra

Auto commit by PR queue bot
nikhiljindal · Nov 25, 2015 · 3136aca · 3136aca
2 parents da8daaa + 51dd067
commit 3136aca
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 20 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -1217,8 +1217,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[@]}"
 
 
   ###########