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

Sandbox: Add annotations to controller CreateOptions

Browse Source 
Following the addition of annotations to the grpc/ttrpc API surface,
follow suit with adding annotations to the controller api surface.

Signed-off-by: Danny Canter <danny@dcantah.dev>
This commit is contained in:
Danny Canter 2023-08-11 23:24:45 -07:00
parent 939ccbed42
commit def5ff3c4b
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sandbox/controller.go
View File

@ -33,8 +33,9 @@ type CreateOptions struct {
// CRI will use this to pass PodSandboxConfig. // CRI will use this to pass PodSandboxConfig.
// Don't confuse this with Runtime options, which are passed at shim instance start // Don't confuse this with Runtime options, which are passed at shim instance start
// to setup global shim configuration. // to setup global shim configuration.
Options typeurl.Any Options typeurl.Any
NetNSPath string NetNSPath string
Annotations map[string]string
} }
type CreateOpt func(*CreateOptions) error type CreateOpt func(*CreateOptions) error
@ -68,6 +69,14 @@ func WithNetNSPath(netNSPath string) CreateOpt {
} }
} }
// WithAnnotations sets the provided annotations for sandbox creation.
func WithAnnotations(annotations map[string]string) CreateOpt {
return func(co *CreateOptions) error {
co.Annotations = annotations
return nil
}
}
type StopOptions struct { type StopOptions struct {
Timeout *time.Duration Timeout *time.Duration
} }

3
sandbox/proxy/controller.go
View File

@ -52,7 +52,8 @@ func (s *remoteSandboxController) Create(ctx context.Context, sandboxID string,
TypeUrl: options.Options.GetTypeUrl(), TypeUrl: options.Options.GetTypeUrl(),
Value: options.Options.GetValue(), Value: options.Options.GetValue(),
}, },
NetnsPath: options.NetNSPath, NetnsPath: options.NetNSPath,
Annotations: options.Annotations,
}) })
if err != nil { if err != nil {
return errdefs.FromGRPC(err) return errdefs.FromGRPC(err)