fix: fix golint warning

AliyunContainerService · Apr 30, 2019 · 323c4b2 · 323c4b2
1 parent 33a9d82
commit 323c4b2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/cri/v1alpha2/cri_utils.go b/cri/v1alpha2/cri_utils.go
@@ -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.

diff --git a/daemon/config/config.go b/daemon/config/config.go
@@ -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.