Merge pull request #635 from s-urbaniak/k8s

k8s: bump to v1.3.0 and fix API changes.
appc · Jul 6, 2016 · 8880358 · 8880358
2 parents 67cdff0 + de6f4f2
commit 8880358
Show file tree

Hide file tree

Showing 11 changed files with 1,392 additions and 817 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/schema/types/isolator_resources.go b/schema/types/isolator_resources.go
@@ -164,8 +164,8 @@ func NewResourceCPUIsolator(request, limit string) (*ResourceCPU, error) {
 	res := &ResourceCPU{
 		ResourceBase{
 			resourceValue{
-				Request: req,
-				Limit:   lim,
+				Request: &req,
+				Limit:   &lim,
 			},
 		},
 	}
@@ -218,8 +218,8 @@ func NewResourceMemoryIsolator(request, limit string) (*ResourceMemory, error) {
 	res := &ResourceMemory{
 		ResourceBase{
 			resourceValue{
-				Request: req,
-				Limit:   lim,
+				Request: &req,
+				Limit:   &lim,
 			},
 		},
 	}

diff --git a/vendor/k8s.io/kubernetes/pkg/api/resource/amount.go b/vendor/k8s.io/kubernetes/pkg/api/resource/amount.go