Merge pull request kubernetes#565 from brendandburns/api2

Fork API types.
duda · Jul 25, 2014 · 321ce0e · 321ce0e
2 parents dde108a + 3723eb7
commit 321ce0e
Show file tree

Hide file tree

Showing 28 changed files with 1,279 additions and 77 deletions.
diff --git a/README.md b/README.md
@@ -91,6 +91,8 @@ Where pod.json contains something like:
 ```
 {
   "id": "php",
+  "kind": "Pod",
+  "apiVersion": "v1beta1",
   "desiredState": {
     "manifest": {
       "version": "v1beta1",

diff --git a/api/examples/controller-list.json b/api/examples/controller-list.json
@@ -1,4 +1,6 @@
 {
+    "kind": "ReplicationControllerList",
+    "apiVersion": "v1beta1",
     "items": [
         {
             "id": "testRun",
@@ -30,4 +32,4 @@
             }
         }
     ]
-}
+}
diff --git a/api/examples/controller.json b/api/examples/controller.json
@@ -1,5 +1,7 @@
   {
     "id": "nginxController",
+    "apiVersion": "v1beta1",
+    "kind": "ReplicationController",
     "desiredState": {
       "replicas": 2,
       "replicaSelector": {"name": "nginx"},

diff --git a/api/examples/external-service.json b/api/examples/external-service.json
@@ -1,5 +1,7 @@
 {
   "id": "example",
+  "kind": "Service",
+  "apiVersion": "v1beta1",
   "port": 8000,
   "labels": {
      "name": "nginx"

diff --git a/api/examples/pod-list.json b/api/examples/pod-list.json
@@ -1,4 +1,6 @@
 {
+    "kind": "PodList",
+    "apiVersion": "v1beta1",
     "items": [
         {
             "id": "my-pod-1",

diff --git a/api/examples/pod.json b/api/examples/pod.json
@@ -1,4 +1,6 @@
 {
+  "kind": "Pod",
+  "apiVersion": "v1beta1",
   "id": "php",
   "desiredState": {
     "manifest": {

diff --git a/api/examples/service-list.json b/api/examples/service-list.json
@@ -1,4 +1,6 @@
 {
+    "kind": "ServiceList",
+    "apiVersion": "v1beta1",
     "items": [
         {
             "id": "example1",

diff --git a/api/examples/service.json b/api/examples/service.json
@@ -1,4 +1,6 @@
 {
+  "kind": "Service",
+  "apiVersion": "v1beta1",
   "id": "example",
   "port": 8000,
   "labels": {

diff --git a/cmd/integration/integration.go b/cmd/integration/integration.go
@@ -157,7 +157,7 @@ func runAtomicPutTest(c *client.Client) {
 	var svc api.Service
 	err := c.Post().Path("services").Body(
 		api.Service{
-			JSONBase: api.JSONBase{ID: "atomicService"},
+			JSONBase: api.JSONBase{ID: "atomicService", APIVersion: "v1beta1"},
 			Port:     12345,
 			Labels: map[string]string{
 				"name": "atomicService",

diff --git a/examples/guestbook/frontend-controller.json b/examples/guestbook/frontend-controller.json
@@ -1,5 +1,7 @@
   {
     "id": "frontendController",
+    "kind": "ReplicationController",
+    "apiVersion": "v1beta1",
     "desiredState": {
       "replicas": 3,
       "replicaSelector": {"name": "frontend"},

diff --git a/examples/guestbook/frontend-service.json b/examples/guestbook/frontend-service.json
@@ -1,5 +1,7 @@
 {
   "id": "frontend",
+  "kind": "Service",
+  "apiVersion": "v1beta1",
   "port": 9998,
   "selector": {
     "name": "frontend"

diff --git a/examples/guestbook/redis-master-service.json b/examples/guestbook/redis-master-service.json
@@ -1,5 +1,7 @@
 {
   "id": "redismaster",
+  "kind": "Service",
+  "apiVersion": "v1beta1",
   "port": 10000,
   "selector": {
     "name": "redis-master"

diff --git a/examples/guestbook/redis-master.json b/examples/guestbook/redis-master.json
@@ -1,5 +1,7 @@
 {
   "id": "redis-master-2",
+  "kind": "Pod",
+  "apiVersion": "v1beta1",
   "desiredState": {
     "manifest": {
       "version": "v1beta1",

diff --git a/examples/guestbook/redis-slave-controller.json b/examples/guestbook/redis-slave-controller.json
@@ -1,5 +1,7 @@
   {
     "id": "redisSlaveController",
+    "kind": "ReplicationController",
+    "apiVersion": "v1beta1",
     "desiredState": {
       "replicas": 2,
       "replicaSelector": {"name": "redisslave"},

diff --git a/examples/guestbook/redis-slave-service.json b/examples/guestbook/redis-slave-service.json
@@ -1,5 +1,7 @@
 {
   "id": "redisslave",
+  "kind": "Service",
+  "apiVersion": "v1beta1",
   "port": 10001,
   "labels": {
     "name": "redisslave"

diff --git a/hack/test-go.sh b/hack/test-go.sh
@@ -41,10 +41,10 @@ KUBE_COVER="-cover -covermode=atomic -coverprofile=\"tmp.out\""
 cd "${KUBE_TARGET}"
 
 if [ "$1" != "" ]; then
-  go test -race $KUBE_COVER "$KUBE_GO_PACKAGE/$1" "${@:2}"
+  go test -race -timeout 30s $KUBE_COVER "$KUBE_GO_PACKAGE/$1" "${@:2}"
   exit 0
 fi
 
 for package in $(find_test_dirs); do
-  go test -race $KUBE_COVER "${KUBE_GO_PACKAGE}/${package}" "${@:2}"
+  go test -race -timeout 30s $KUBE_COVER "${KUBE_GO_PACKAGE}/${package}" "${@:2}"
 done
diff --git a/pkg/api/apiobj_test.go b/pkg/api/apiobj_test.go
@@ -28,8 +28,11 @@ func TestAPIObject(t *testing.T) {
 		Object      APIObject `yaml:"object,omitempty" json:"object,omitempty"`
 		EmptyObject APIObject `yaml:"emptyObject,omitempty" json:"emptyObject,omitempty"`
 	}
-
-	AddKnownTypes(EmbeddedTest{})
+	convert := func(obj interface{}) (interface{}, error) { return obj, nil }
+	AddKnownTypes("", EmbeddedTest{})
+	AddKnownTypes("v1beta1", EmbeddedTest{})
+	AddExternalConversion("EmbeddedTest", convert)
+	AddInternalConversion("EmbeddedTest", convert)
 
 	outer := &EmbeddedTest{
 		JSONBase: JSONBase{ID: "outer"},