From 1133b62f50b3d2848f28030356deccae9f4d16f9 Mon Sep 17 00:00:00 2001
From: Mike Danese <mikedanese@gmail.com>
Date: Thu, 16 Jul 2015 14:41:51 -0700
Subject: [PATCH] update meteor example according to config best practices.

---
 examples/meteor/README.md              |  8 +++++---
 examples/meteor/meteor-controller.json | 10 ++--------
 examples/meteor/mongo-pod.json         |  4 +---
 examples/meteor/mongo-service.json     |  1 -
 4 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/examples/meteor/README.md b/examples/meteor/README.md
index 81047b1d400..e4220f3dc42 100644
--- a/examples/meteor/README.md
+++ b/examples/meteor/README.md
@@ -151,16 +151,18 @@ kubectl create -f examples/meteor/mongo-service.json
 
 Wait until Mongo is started completely and then start up your Meteor app:
 ```
-kubectl create -f examples/meteor/meteor-controller.json
 kubectl create -f examples/meteor/meteor-service.json
+kubectl create -f examples/meteor/meteor-controller.json
 ```
 
 Note that [`meteor-service.json`](meteor-service.json) creates a load balancer, so
 your app should be available through the IP of that load balancer once
-the Meteor pods are started. You can find the IP of your load balancer
+the Meteor pods are started. We also created the service before creating the rc to
+aid the scheduler in placing pods, as the scheduler ranks pod placement according to
+service anti-affinity (among other things). You can find the IP of your load balancer
 by running:
 ```
-kubectl get services/meteor --template="{{range .status.loadBalancer.ingress}} {{.ip}} {{end}}"
+kubectl get service meteor --template="{{range .status.loadBalancer.ingress}} {{.ip}} {{end}}"
 ```
 
 You will have to open up port 80 if it's not open yet in your
diff --git a/examples/meteor/meteor-controller.json b/examples/meteor/meteor-controller.json
index 57e0d1d3548..fa85afdcba4 100644
--- a/examples/meteor/meteor-controller.json
+++ b/examples/meteor/meteor-controller.json
@@ -9,9 +9,6 @@
   },
   "spec": {
     "replicas": 2,
-    "selector": {
-      "name": "meteor"
-    },
     "template": {
       "metadata": {
         "labels": {
@@ -26,12 +23,9 @@
             "ports": [
               {
                 "name": "http-server",
-                "hostPort": 80,
-                "containerPort": 8080,
-                "protocol": "TCP"
+                "containerPort": 8080
               }
-            ],
-            "resources": {}
+            ]
           }
         ]
       }
diff --git a/examples/meteor/mongo-pod.json b/examples/meteor/mongo-pod.json
index 76c57a2ec69..a5b80ac5de2 100644
--- a/examples/meteor/mongo-pod.json
+++ b/examples/meteor/mongo-pod.json
@@ -25,11 +25,9 @@
         "ports": [
           {
             "name": "mongo",
-            "containerPort": 27017,
-            "protocol": "TCP"
+            "containerPort": 27017
           }
         ],
-        "resources": {},
         "volumeMounts": [
           {
             "name": "mongo-disk",
diff --git a/examples/meteor/mongo-service.json b/examples/meteor/mongo-service.json
index 7f0ac1e993c..bec687e9906 100644
--- a/examples/meteor/mongo-service.json
+++ b/examples/meteor/mongo-service.json
@@ -10,7 +10,6 @@
   "spec": {
     "ports": [
       {
-        "protocol": "TCP",
         "port": 27017,
         "targetPort": "mongo"
       }