Update examples/spark for v1beta3

bcbroussard · bcbroussard · commit 32374edc7400 · 2015-04-23T16:23:27.000-07:00
diff --git a/examples/spark/README.md b/examples/spark/README.md
@@ -29,19 +29,19 @@ instructions for your platform.
 The Master service is the master (or head) service for a Spark
 cluster.
 
-Use the `examples/spark/spark-master.json` file to create a pod running
+Use the `examples/spark/v1beta3/spark-master.json` file to create a pod running
 the Master service.
 
 ```shell
-$ kubectl create -f examples/spark/spark-master.json
+$ kubectl create -f examples/spark/v1beta3/spark-master.json
 ```
 
-Then, use the `examples/spark/spark-master-service.json` file to
+Then, use the `examples/spark/v1beta3/spark-master-service.json` file to
 create a logical service endpoint that Spark workers can use to access
 the Master pod.
 
 ```shell
-$ kubectl create -f examples/spark/spark-master-service.json
+$ kubectl create -f examples/spark/v1beta3/spark-master-service.json
 ```
 
 Ensure that the Master service is running and functional.
@@ -85,11 +85,11 @@ program.
 
 The Spark workers need the Master service to be running.
 
-Use the `examples/spark/spark-worker-controller.json` file to create a
+Use the `examples/spark/v1beta3/spark-worker-controller.json` file to create a
 ReplicationController that manages the worker pods.
 
 ```shell
-$ kubectl create -f examples/spark/spark-worker-controller.json
+$ kubectl create -f examples/spark/v1beta3/spark-worker-controller.json
 ```
 
 ### Check to see if the workers are running
@@ -164,10 +164,10 @@ SparkContext available as sc.
 
 ## tl;dr
 
-```kubectl create -f spark-master.json```
+```kubectl create -f v1beta3/spark-master.json```
 
-```kubectl create -f spark-master-service.json```
+```kubectl create -f v1beta3/spark-master-service.json```
 
 Make sure the Master Pod is running (use: ```kubectl get pods```).
 
-```kubectl create -f spark-worker-controller.json```
+```kubectl create -f v1beta3/spark-worker-controller.json```
diff --git a/examples/spark/spark-master-service.json b/examples/spark/spark-master-service.json
@@ -1,9 +1,21 @@
 {
-  "id": "spark-master",
   "kind": "Service",
-  "apiVersion": "v1beta1",
-  "port": 7077,
-  "containerPort": 7077,
-  "selector": { "name": "spark-master" },
-  "labels": { "name": "spark-master" }
-}
+  "apiVersion": "v1beta3",
+  "metadata": {
+    "name": "spark-master",
+    "labels": {
+      "name": "spark-master"
+    }
+  },
+  "spec": {
+    "ports": [
+      {
+        "port": 7077,
+        "targetPort": 7077
+      }
+    ],
+    "selector": {
+      "name": "spark-master"
+    }
+  }
+}
diff --git a/examples/spark/spark-master.json b/examples/spark/spark-master.json
@@ -1,20 +1,28 @@
 {
-  "id": "spark-master",
   "kind": "Pod",
-  "apiVersion": "v1beta1",
-  "desiredState": {
-    "manifest": {
-      "version": "v1beta1",
-      "id": "spark-master",
-      "containers": [{
-        "name": "spark-master",
-        "image": "mattf/spark-master",
-        "cpu": 100,
-        "ports": [{ "containerPort": 7077 }]
-      }]
+  "apiVersion": "v1beta3",
+  "metadata": {
+    "name": "spark-master",
+    "labels": {
+      "name": "spark-master"
     }
   },
-  "labels": {
-    "name": "spark-master"
+  "spec": {
+    "containers": [
+      {
+        "name": "spark-master",
+        "image": "mattf/spark-master",
+        "ports": [
+          {
+            "containerPort": 7077
+          }
+        ],
+        "resources": {
+          "limits": {
+            "cpu": "100m"
+          }
+        }
+      }
+    ]
   }
-}
+}
diff --git a/examples/spark/spark-worker-controller.json b/examples/spark/spark-worker-controller.json
@@ -1,28 +1,43 @@
 {
-  "id": "spark-worker-controller",
   "kind": "ReplicationController",
-  "apiVersion": "v1beta1",
-  "desiredState": {
+  "apiVersion": "v1beta3",
+  "metadata": {
+    "name": "spark-worker-controller",
+    "labels": {
+      "name": "spark-worker"
+    }
+  },
+  "spec": {
     "replicas": 3,
-    "replicaSelector": {"name": "spark-worker"},
-    "podTemplate": {
-      "desiredState": {
-         "manifest": {
-           "version": "v1beta1",
-           "id": "spark-worker-controller",
-           "containers": [{
-             "name": "spark-worker",
-             "image": "mattf/spark-worker",
-             "cpu": 100,
-             "ports": [{"containerPort": 8888, "hostPort": 8888}]
-           }]
-         }
+    "selector": {
+      "name": "spark-worker"
+    },
+    "template": {
+      "metadata": {
+        "labels": {
+          "name": "spark-worker",
+          "uses": "spark-master"
+        }
       },
-      "labels": {
-        "name": "spark-worker",
-        "uses": "spark-master"
+      "spec": {
+        "containers": [
+          {
+            "name": "spark-worker",
+            "image": "mattf/spark-worker",
+            "ports": [
+              {
+                "hostPort": 8888,
+                "containerPort": 8888
+              }
+            ],
+            "resources": {
+              "limits": {
+                "cpu": "100m"
+              }
+            }
+          }
+        ]
       }
     }
-  },
-  "labels": {"name": "spark-worker"}
-}
+  }
+}
