Update golangci-lint to newer version

This patch updates the golangci-lint tool to v1.21.0 in order to speed
up the linting to avoid the issue
golangci/golangci-lint#685.

Author: akutz

.golangci.yml

@@ -20,6 +20,9 @@ linters:
   disable-all: true
   # Run with --fast=false for more extensive checks
   fast: true
+run:
+  skip-files:
+  - ".*zz_generated.*\\.go"
 issue:
   max-same-issues: 0
   max-per-linter: 0

controllers/vspheremachine_controller.go

@@ -245,7 +245,7 @@ func (r machineReconciler) Reconcile(req ctrl.Request) (_ ctrl.Result, reterr er
 			// If the resources are the same resource version, then a previous
 			// patch may not have resulted in any changes. Check to see if the
 			// remote status is the same as the local status.
-			if cmp.Diff(localObj, remoteObj) == "" {
+			if cmp.Equal(localObj.Status, remoteObj.Status) {
 				machineContext.Logger.Info(
 					"resource patch was not required",
 					"local-resource-version", localObj.ResourceVersion,

hack/tools/go.mod

@@ -4,7 +4,7 @@ go 1.12
 
 require (
 	github.com/golang/mock v1.3.1
-	github.com/golangci/golangci-lint v1.18.0
+	github.com/golangci/golangci-lint v1.21.0
 	sigs.k8s.io/controller-tools v0.2.0
 	sigs.k8s.io/kustomize/v3 v3.1.0
 	sigs.k8s.io/testing_frameworks v0.1.1