enable golangci-lint gosimple and fix lint errors

Signed-off-by: gy95 <1015105054@qq.com>
volcano-sh · Aug 12, 2021 · 55c43cf · 55c43cf
1 parent d60805f
commit 55c43cf
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -47,7 +47,7 @@ linters:
     # linters default enabled by golangci-lint .
     - deadcode
     #- errcheck
-    #- gosimple
+    - gosimple
     - ineffassign
     - staticcheck
     - structcheck

diff --git a/pkg/scheduler/api/resource_info.go b/pkg/scheduler/api/resource_info.go
@@ -293,7 +293,7 @@ func (r *Resource) Less(rr *Resource, defaultValue DimensionDefaultValue) bool {
 	r.setDefaultValue(leftResource, rightResource, defaultValue)
 
 	for resourceName, leftValue := range leftResource.ScalarResources {
-		rightValue, _ := rightResource.ScalarResources[resourceName]
+		rightValue := rightResource.ScalarResources[resourceName]
 		if rightValue == -1 {
 			continue
 		}
@@ -328,7 +328,7 @@ func (r *Resource) LessEqual(rr *Resource, defaultValue DimensionDefaultValue) b
 	r.setDefaultValue(leftResource, rightResource, defaultValue)
 
 	for resourceName, leftValue := range leftResource.ScalarResources {
-		rightValue, _ := rightResource.ScalarResources[resourceName]
+		rightValue := rightResource.ScalarResources[resourceName]
 		if rightValue == -1 {
 			continue
 		}
@@ -357,7 +357,7 @@ func (r *Resource) LessPartly(rr *Resource, defaultValue DimensionDefaultValue)
 	r.setDefaultValue(leftResource, rightResource, defaultValue)
 
 	for resourceName, leftValue := range leftResource.ScalarResources {
-		rightValue, _ := rightResource.ScalarResources[resourceName]
+		rightValue := rightResource.ScalarResources[resourceName]
 		if leftValue == -1 {
 			continue
 		}
@@ -389,7 +389,7 @@ func (r *Resource) LessEqualPartly(rr *Resource, defaultValue DimensionDefaultVa
 	r.setDefaultValue(leftResource, rightResource, defaultValue)
 
 	for resourceName, leftValue := range leftResource.ScalarResources {
-		rightValue, _ := rightResource.ScalarResources[resourceName]
+		rightValue := rightResource.ScalarResources[resourceName]
 		if leftValue == -1 {
 			continue
 		}
@@ -418,7 +418,7 @@ func (r *Resource) Equal(rr *Resource, defaultValue DimensionDefaultValue) bool
 	r.setDefaultValue(leftResource, rightResource, defaultValue)
 
 	for resourceName, leftValue := range leftResource.ScalarResources {
-		rightValue, _ := rightResource.ScalarResources[resourceName]
+		rightValue := rightResource.ScalarResources[resourceName]
 		if !equalFunc(leftValue, rightValue, minResource) {
 			return false
 		}

diff --git a/pkg/webhooks/admission/pods/mutate/mutate_pod.go b/pkg/webhooks/admission/pods/mutate/mutate_pod.go
@@ -82,7 +82,6 @@ func Pods(ar v1beta1.AdmissionReview) *v1beta1.AdmissionResponse {
 	switch ar.Request.Operation {
 	case v1beta1.Create:
 		patchBytes, _ = createPatch(pod)
-		break
 	default:
 		err = fmt.Errorf("expect operation to be 'CREATE' ")
 		return util.ToAdmissionResponse(err)