github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Use Any instead of []byte

Browse Source 
This allows us to get the fully TypeURL for consuming code.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby
2017-06-29 15:06:59 -07:00
parent 82d0208aaa
commit 72831b6985
5 changed files with 22 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/tasks/service.go
View File

@@ -121,10 +121,6 @@ func (s *Service) Create(ctx context.Context, r *api.CreateTaskRequest) (*api.Cr
if err != nil {
return nil, errdefs.ToGRPC(err)
}
var options []byte
if r.Options != nil {
options = r.Options.Value
}
opts := runtime.CreateOpts{
Spec: container.Spec,
IO: runtime.IO{
@@ -134,7 +130,7 @@ func (s *Service) Create(ctx context.Context, r *api.CreateTaskRequest) (*api.Cr
Terminal: r.Terminal,
},
Checkpoint: checkpointPath,
Options: options,
Options: r.Options,
}
for _, m := range r.Rootfs {
opts.Rootfs = append(opts.Rootfs, mount.Mount{
@@ -361,7 +357,7 @@ func (s *Service) Exec(ctx context.Context, r *api.ExecProcessRequest) (*api.Exe
return nil, err
}
process, err := t.Exec(ctx, runtime.ExecOpts{
Spec: r.Spec.Value,
Spec: r.Spec,
IO: runtime.IO{
Stdin: r.Stdin,
Stdout: r.Stdout,
@@ -418,11 +414,7 @@ func (s *Service) Checkpoint(ctx context.Context, r *api.CheckpointTaskRequest)
return nil, err
}
defer os.RemoveAll(image)
var options []byte
if r.Options != nil {
options = r.Options.Value
}
if err := t.Checkpoint(ctx, image, options); err != nil {
if err := t.Checkpoint(ctx, image, r.Options); err != nil {
return nil, err
}
// write checkpoint to the content store
@@ -454,7 +446,7 @@ func (s *Service) Update(ctx context.Context, r *api.UpdateTaskRequest) (*google
if err != nil {
return nil, err
}
if err := t.Update(ctx, r.Resources.Value); err != nil {
if err := t.Update(ctx, r.Resources); err != nil {
return nil, err
}
return empty, nil