From a060c541e987a61198f57594e204fa314ab4a04c Mon Sep 17 00:00:00 2001
From: Daniel Smith <dbsmith@google.com>
Date: Fri, 27 Mar 2015 11:05:31 -0700
Subject: [PATCH] Update network tester files to v1beta3

---
 contrib/for-tests/network-tester/rc.json      | 55 +++++++++++--------
 contrib/for-tests/network-tester/service.json | 22 +++++---
 2 files changed, 46 insertions(+), 31 deletions(-)

diff --git a/contrib/for-tests/network-tester/rc.json b/contrib/for-tests/network-tester/rc.json
index 0a2712acfc2b0..a627fc26de25f 100644
--- a/contrib/for-tests/network-tester/rc.json
+++ b/contrib/for-tests/network-tester/rc.json
@@ -1,29 +1,40 @@
 {
-  "id": "nettestController",
   "kind": "ReplicationController",
-  "apiVersion": "v1beta1",
-  "desiredState": {
+  "apiVersion": "v1beta3",
+  "metadata": {
+    "name": "nettest-controller",
+    "labels": {
+      "name": "nettest"
+    }
+  },
+  "spec": {
     "replicas": 8,
-    "replicaSelector": {"name": "nettest"},
-    "podTemplate": {
-      "desiredState": {
-        "manifest": {
-          "version": "v1beta1",
-          "id": "nettest",
-          "containers": [{
+    "selector": {
+      "name": "nettest"
+    },
+    "template": {
+      "metadata": {
+        "labels": {
+          "name": "nettest"
+        }
+      },
+      "spec": {
+        "containers": [
+          {
             "name": "webserver",
             "image": "kubernetes/nettest:latest",
-            "command": ["-service=nettest"],
-            "ports": [{
-              "containerPort": 8080
-            }]
-          }]
-        }
-       },
-       "labels": {
-         "name": "nettest"
-       }
+            "command": [
+              "-service=nettest"
+            ],
+            "ports": [
+              {
+                "containerPort": 8080,
+                "protocol": "TCP"
+              }
+            ]
+          }
+        ]
       }
-    },
-  "labels": {"name": "nettest"}
+    }
+  }
 }
diff --git a/contrib/for-tests/network-tester/service.json b/contrib/for-tests/network-tester/service.json
index 36b5633138063..e220d5cad19c2 100644
--- a/contrib/for-tests/network-tester/service.json
+++ b/contrib/for-tests/network-tester/service.json
@@ -1,14 +1,18 @@
 {
-  "id": "nettest",
   "kind": "Service",
-  "apiVersion": "v1beta1",
-  "port": 8080,
-  "containerPort": 8080,
-  "selector": {
-    "name": "nettest"
+  "apiVersion": "v1beta3",
+  "metadata": {
+    "name": "nettest",
+    "labels": {
+      "name": "nettest"
+    }
   },
-  "labels": {
-    "name": "nettest"
+  "spec": {
+    "port": 8080,
+    "protocol": "TCP",
+    "selector": {
+      "name": "nettest"
+    },
+    "targetPort": 8080,
   }
 }
-