Skip to content

fix: fix golint warning #2821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 2, 2019
Merged

fix: fix golint warning #2821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions cri/v1alpha2/cri_utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,10 +317,7 @@ func (c *CriManager) applySandboxRuntimeHandler(sandboxMeta *metatypes.SandboxMe
runtimehandler = rt
}
sandboxMeta.Runtime = runtimehandler
if err := c.SandboxStore.Put(sandboxMeta); err != nil {
return err
}
return nil
return c.SandboxStore.Put(sandboxMeta)
}

// applySandboxAnnotations applies the annotations extended.
Expand Down
7 changes: 1 addition & 6 deletions daemon/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,12 +179,7 @@ func (cfg *Config) Validate() error {
cfg.CgroupDriver = DefaultCgroupDriver
}

// validates cgroup driver
if err := validateCgroupDriver(cfg.CgroupDriver); err != nil {
return err
}

return nil
return validateCgroupDriver(cfg.CgroupDriver)
}

//MergeConfigurations merges flagSet flags and config file flags into Config.
Expand Down