Skip to content
This repository has been archived by the owner on Aug 14, 2020. It is now read-only.

Commit

Permalink
schema/types: adapt to k8s bump
Browse files Browse the repository at this point in the history
  • Loading branch information
@steveej
steveej committed May 26, 2016
1 parent 78a9e43 commit 7da0fdd
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions schema/types/isolator_resources.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,8 @@ func NewResourceCPUIsolator(request, limit string) (*ResourceCPU, error) {
res := &ResourceCPU{
ResourceBase{
resourceValue{
Request: &req,
Limit: &lim,
Request: req,

This comment has been minimized.

Sign in to view

Copy link
@thockin

thockin May 27, 2016

Contributor

I am very confused. the k8s that you vendored in #607 returns a value, you want a pointer, so that PR adapted by taking the address here. This PR undoes it? How does it compile?

This comment has been minimized.

Sign in to view

Copy link
@jonboulle

jonboulle May 30, 2016

Contributor

@thockin in #607 we made the mistake of merging an untagged dependency, which we don't want to do (for distribution packaging reasons). See my confusion here and explanation here. appc/spec builds fine because it uses vendored dependencies but it was breaking go getters because we weren't using go vendoring (now fixed).

As soon as there's a newer k8s tag we can use that.

This comment has been minimized.

Sign in to view

Copy link
@btipling

btipling Jun 11, 2016

FYI I get errors here when I try and build with vagrant up from rkt repo. The getting started with rkt guide no longer works.

This comment has been minimized.

Sign in to view

Copy link
@btipling

btipling Jun 11, 2016

Error:

==> default: # github.com/appc/spec/schema/types
==> default: /root/.gopath/src/github.com/appc/spec/schema/types/isolator_resources.go:158: cannot use req (type resource.Quantity) as type *resource.Quantity in field value
==> default: /root/.gopath/src/github.com/appc/spec/schema/types/isolator_resources.go:159: cannot use lim (type resource.Quantity) as type *resource.Quantity in field value
==> default: /root/.gopath/src/github.com/appc/spec/schema/types/isolator_resources.go:212: cannot use req (type resource.Quantity) as type *resource.Quantity in field value
==> default: /root/.gopath/src/github.com/appc/spec/schema/types/isolator_resources.go:213: cannot use lim (type resource.Quantity) as type *resource.Quantity in field value
Limit: lim,
},
},
}
Expand Down Expand Up @@ -209,8 +209,8 @@ func NewResourceMemoryIsolator(request, limit string) (*ResourceMemory, error) {
res := &ResourceMemory{
ResourceBase{
resourceValue{
Request: &req,
Limit: &lim,
Request: req,
Limit: lim,
},
},
}
Expand Down

0 comments on commit 7da0fdd

Please sign in to comment.