Merge pull request #7230 from bcbroussard/spark-example

Update examples/spark for v1beta3

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"
+    }
+  }
+}

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"
+          }
+        }
+      }
+    ]
   }
-}
+}

examples/spark/spark-worker-controller.json

@@ -1,28 +1,43 @@
 {
-  "id": "spark-worker-controller",
   "kind": "ReplicationController",
-  "apiVersion": "v1beta1",
-  "desiredState": {
-    "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}]
-           }]
-         }
-      },
-      "labels": {
-        "name": "spark-worker",
-        "uses": "spark-master"
-      }
+  "apiVersion": "v1beta3",
+  "metadata": {
+    "name": "spark-worker-controller",
+    "labels": {
+      "name": "spark-worker"
     }
   },
-  "labels": {"name": "spark-worker"}
-}
+  "spec": {
+    "replicas": 3,
+    "selector": {
+      "name": "spark-worker"
+    },
+    "template": {
+      "metadata": {
+        "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"
+              }
+            }
+          }
+        ]
+      }
+    }
+  }
+}