Merge pull request #7168 from mxpv/linter

Update and align golangci-lint version

pkg/cri/store/container/status_test.go

@@ -131,8 +131,7 @@ func TestStatus(t *testing.T) {
 
 	t.Logf("failed update should not take effect")
 	err = s.Update(func(o Status) (Status, error) {
-		o = updateStatus
-		return o, updateErr
+		return updateStatus, updateErr
 	})
 	assert.Equal(updateErr, err)
 	assert.Equal(testStatus, s.Get())
@@ -142,8 +141,7 @@ func TestStatus(t *testing.T) {
 
 	t.Logf("successful update should take effect but not checkpoint")
 	err = s.Update(func(o Status) (Status, error) {
-		o = updateStatus
-		return o, nil
+		return updateStatus, nil
 	})
 	assert.NoError(err)
 	assert.Equal(updateStatus, s.Get())
@@ -152,14 +150,12 @@ func TestStatus(t *testing.T) {
 	assert.Equal(testStatus, loaded)
 	// Recover status.
 	assert.NoError(s.Update(func(o Status) (Status, error) {
-		o = testStatus
-		return o, nil
+		return testStatus, nil
 	}))
 
 	t.Logf("failed update sync should not take effect")
 	err = s.UpdateSync(func(o Status) (Status, error) {
-		o = updateStatus
-		return o, updateErr
+		return updateStatus, updateErr
 	})
 	assert.Equal(updateErr, err)
 	assert.Equal(testStatus, s.Get())
@@ -169,8 +165,7 @@ func TestStatus(t *testing.T) {
 
 	t.Logf("successful update sync should take effect and checkpoint")
 	err = s.UpdateSync(func(o Status) (Status, error) {
-		o = updateStatus
-		return o, nil
+		return updateStatus, nil
 	})
 	assert.NoError(err)
 	assert.Equal(updateStatus, s.Get())

pkg/cri/store/sandbox/status_test.go

@@ -45,16 +45,14 @@ func TestStatus(t *testing.T) {
 
 	t.Logf("failed update should not take effect")
 	err := s.Update(func(o Status) (Status, error) {
-		o = updateStatus
-		return o, updateErr
+		return updateStatus, updateErr
 	})
 	assert.Equal(updateErr, err)
 	assert.Equal(testStatus, s.Get())
 
 	t.Logf("successful update should take effect but not checkpoint")
 	err = s.Update(func(o Status) (Status, error) {
-		o = updateStatus
-		return o, nil
+		return updateStatus, nil
 	})
 	assert.NoError(err)
 	assert.Equal(updateStatus, s.Get())