Skip to content

Commit a16d314

Browse files
authored
Merge pull request #2018 from rkonfj/main
`types.KillOptions` > `types.ContainerKillOptions` to be consistent
2 parents ce832e3 + 484c853 commit a16d314

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

cmd/nerdctl/container_kill.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func killAction(cmd *cobra.Command, args []string) error {
4747
if err != nil {
4848
return err
4949
}
50-
options := types.KillOptions{
50+
options := types.ContainerKillOptions{
5151
GOptions: globalOptions,
5252
KillSignal: killSignal,
5353
Stdout: cmd.OutOrStdout(),

pkg/api/types/container_types.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ type ContainerStartOptions struct {
3030
Attach bool
3131
}
3232

33-
// KillOptions specifies options for `nerdctl (container) kill`.
34-
type KillOptions struct {
33+
// ContainerKillOptions specifies options for `nerdctl (container) kill`.
34+
type ContainerKillOptions struct {
3535
Stdout io.Writer
3636
Stderr io.Writer
3737
// GOptions is the global options

pkg/cmd/container/kill.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333
)
3434

3535
// Kill kills a list of containers
36-
func Kill(ctx context.Context, client *containerd.Client, reqs []string, options types.KillOptions) error {
36+
func Kill(ctx context.Context, client *containerd.Client, reqs []string, options types.ContainerKillOptions) error {
3737
if !strings.HasPrefix(options.KillSignal, "SIG") {
3838
options.KillSignal = "SIG" + options.KillSignal
3939
}

0 commit comments

Comments
 (0)