Merge pull request #7231 from bcbroussard/storm-example

Update examples/storm for v1beta3

examples/storm/storm-nimbus-service.json

@@ -1,9 +1,21 @@
 {
-  "id": "nimbus",
   "kind": "Service",
-  "apiVersion": "v1beta1",
-  "port": 6627,
-  "containerPort": 6627,
-  "selector": { "name": "nimbus" },
-  "labels": { "name": "nimbus" }
+  "apiVersion": "v1beta3",
+  "metadata": {
+    "name": "nimbus",
+    "labels": {
+      "name": "nimbus"
+    }
+  },
+  "spec": {
+    "ports": [
+      {
+        "port": 6627,
+        "targetPort": 6627
+      }
+    ],
+    "selector": {
+      "name": "nimbus"
+    }
+  }
 }

examples/storm/storm-nimbus.json

@@ -1,20 +1,28 @@
 {
-  "id": "nimbus",
   "kind": "Pod",
-  "apiVersion": "v1beta1",
-  "desiredState": {
-    "manifest": {
-      "version": "v1beta1",
-      "id": "nimbus",
-      "containers": [{
+  "apiVersion": "v1beta3",
+  "metadata": {
     "name": "nimbus",
-        "image": "mattf/storm-nimbus",
-        "cpu": 100,
-        "ports": [{ "containerPort": 6627 }]
-      }]
-    }
-  },
     "labels": {
       "name": "nimbus"
     }
+  },
+  "spec": {
+    "containers": [
+      {
+        "name": "nimbus",
+        "image": "mattf/storm-nimbus",
+        "ports": [
+          {
+            "containerPort": 6627
+          }
+        ],
+        "resources": {
+          "limits": {
+            "cpu": "100m"
+          }
+        }
+      }
+    ]
+  }
 }

examples/storm/storm-worker-controller.json

@@ -1,31 +1,55 @@
 {
-  "id": "storm-worker-controller",
   "kind": "ReplicationController",
-  "apiVersion": "v1beta1",
-  "desiredState": {
-    "replicas": 3,
-    "replicaSelector": {"name": "storm-worker"},
-    "podTemplate": {
-      "desiredState": {
-         "manifest": {
-           "version": "v1beta1",
-           "id": "storm-worker-controller",
-           "containers": [{
-             "name": "storm-worker",
-             "image": "mattf/storm-worker",
-             "cpu": 200,
-             "ports": [{"containerPort": 6700, "hostPort": 6700},
-                     {"containerPort": 6701, "hostPort": 6701},
-                     {"containerPort": 6702, "hostPort": 6702},
-                     {"containerPort": 6703, "hostPort": 6703}]
-           }]
+  "apiVersion": "v1beta3",
+  "metadata": {
+    "name": "storm-worker-controller",
+    "labels": {
+      "name": "storm-worker"
     }
   },
+  "spec": {
+    "replicas": 3,
+    "selector": {
+      "name": "storm-worker"
+    },
+    "template": {
+      "metadata": {
         "labels": {
           "name": "storm-worker",
           "uses": "nimbus"
         }
-    }
       },
-  "labels": {"name": "storm-worker"}
+      "spec": {
+        "containers": [
+          {
+            "name": "storm-worker",
+            "image": "mattf/storm-worker",
+            "ports": [
+              {
+                "hostPort": 6700,
+                "containerPort": 6700
+              },
+              {
+                "hostPort": 6701,
+                "containerPort": 6701
+              },
+              {
+                "hostPort": 6702,
+                "containerPort": 6702
+              },
+              {
+                "hostPort": 6703,
+                "containerPort": 6703
+              }
+            ],
+            "resources": {
+              "limits": {
+                "cpu": "200m"
+              }
+            }
+          }
+        ]
+      }
+    }
+  }
 }

examples/storm/zookeeper-service.json

@@ -1,9 +1,21 @@
 {
-  "id": "zookeeper",
   "kind": "Service",
-  "apiVersion": "v1beta1",
-  "port": 2181,
-  "containerPort": 2181,
-  "selector": { "name": "zookeeper" },
-  "labels": { "name": "zookeeper" }
+  "apiVersion": "v1beta3",
+  "metadata": {
+    "name": "zookeeper",
+    "labels": {
+      "name": "zookeeper"
+    }
+  },
+  "spec": {
+    "ports": [
+      {
+        "port": 2181,
+        "targetPort": 2181
+      }
+    ],
+    "selector": {
+      "name": "zookeeper"
+    }
+  }
 }

examples/storm/zookeeper.json

@@ -1,20 +1,28 @@
 {
-  "id": "zookeeper",
   "kind": "Pod",
-  "apiVersion": "v1beta1",
-  "desiredState": {
-    "manifest": {
-      "version": "v1beta1",
-      "id": "zookeeper",
-      "containers": [{
+  "apiVersion": "v1beta3",
+  "metadata": {
     "name": "zookeeper",
-        "image": "mattf/zookeeper",
-        "cpu": 100,
-        "ports": [{ "containerPort": 2181 }]
-      }]
-    }
-  },
     "labels": {
       "name": "zookeeper"
     }
+  },
+  "spec": {
+    "containers": [
+      {
+        "name": "zookeeper",
+        "image": "mattf/zookeeper",
+        "ports": [
+          {
+            "containerPort": 2181
+          }
+        ],
+        "resources": {
+          "limits": {
+            "cpu": "100m"
+          }
+        }
+      }
+    ]
+  }
 }