diff --git a/.golangci.yml b/.golangci.yml
index 7413263bba..e438f29af6 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -77,9 +77,30 @@ linters-settings:
     #  2. you use go >= 1.10
     #  3. you do repeated runs (false for CI) or cache $GOPATH/pkg or `go env GOCACHE` dir in CI.
     use-installed-packages: false
-  golint:
-    # minimal confidence for issues, default is 0.8
-    min-confidence: 0.8
+  revive:
+    confidence: 0.8
+    severity: warning
+    errorCode: 0
+    warningCode: 0
+    rules:
+      - name: blank-imports
+      - name: context-as-argument
+      - name: context-keys-type
+      - name: error-return
+      - name: error-strings
+      - name: error-naming
+      - name: exported
+      - name: if-return
+      - name: increment-decrement
+      - name: var-naming
+      - name: var-declaration
+      - name: package-comments
+      - name: range
+      - name: receiver-naming
+      - name: time-naming
+      - name: unexported-return
+      - name: indent-error-flow
+      - name: errorf
   gofmt:
     # simplify code: gofmt with `-s` option, true by default
     simplify: false
@@ -157,7 +178,7 @@ linters:
     - errcheck
     - gofmt
     - goimports
-    - golint
+    - revive
     - gosimple
     - govet
     - ineffassign
diff --git a/integration/tests/backwards_compat/backwards_compatibility_test.go b/integration/tests/backwards_compat/backwards_compatibility_test.go
index 1ef76876e1..eb3e4a6bd4 100644
--- a/integration/tests/backwards_compat/backwards_compatibility_test.go
+++ b/integration/tests/backwards_compat/backwards_compatibility_test.go
@@ -1,6 +1,7 @@
 //go:build integration
 // +build integration
 
+//revive:disable Not changing package name
 package backwards_compat
 
 import (
diff --git a/integration/tests/before_active/createdeletebeforeactive_test.go b/integration/tests/before_active/createdeletebeforeactive_test.go
index b6a3296860..c54b265202 100644
--- a/integration/tests/before_active/createdeletebeforeactive_test.go
+++ b/integration/tests/before_active/createdeletebeforeactive_test.go
@@ -1,20 +1,21 @@
 //go:build integration
 // +build integration
 
+//revive:disable Not changing package name
 package before_active
 
 import (
 	"fmt"
 	"testing"
 
+	awseks "github.com/aws/aws-sdk-go/service/eks"
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+
 	. "github.com/weaveworks/eksctl/integration/matchers"
 	. "github.com/weaveworks/eksctl/integration/runner"
 	"github.com/weaveworks/eksctl/integration/tests"
 	"github.com/weaveworks/eksctl/pkg/testutils"
-
-	awseks "github.com/aws/aws-sdk-go/service/eks"
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
 )
 
 var params *tests.Params
diff --git a/integration/tests/cloudwatch_logging/cloudwatch_logging_test.go b/integration/tests/cloudwatch_logging/cloudwatch_logging_test.go
index 4081852a60..26b3da631b 100644
--- a/integration/tests/cloudwatch_logging/cloudwatch_logging_test.go
+++ b/integration/tests/cloudwatch_logging/cloudwatch_logging_test.go
@@ -1,6 +1,7 @@
 //go:build integration
 // +build integration
 
+//revive:disable Not changing package name
 package cloudwatch_logging
 
 import (
@@ -15,6 +16,7 @@ import (
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 
 	"github.com/pkg/errors"
+
 	"github.com/weaveworks/eksctl/pkg/testutils"
 
 	. "github.com/weaveworks/eksctl/integration/runner"
diff --git a/integration/tests/cluster_api/cluster_api_endpoints_test.go b/integration/tests/cluster_api/cluster_api_endpoints_test.go
index c1dd7727a4..9ddc874245 100644
--- a/integration/tests/cluster_api/cluster_api_endpoints_test.go
+++ b/integration/tests/cluster_api/cluster_api_endpoints_test.go
@@ -1,6 +1,7 @@
 //go:build integration
 // +build integration
 
+//revive:disable Not changing package name
 package cluster_api
 
 import (
diff --git a/integration/tests/cluster_dns/cluster_dns_test.go b/integration/tests/cluster_dns/cluster_dns_test.go
index 71d45e0c80..dbcb726677 100644
--- a/integration/tests/cluster_dns/cluster_dns_test.go
+++ b/integration/tests/cluster_dns/cluster_dns_test.go
@@ -1,6 +1,7 @@
 //go:build integration
 // +build integration
 
+//revive:disable Not changing package name
 package cluster_dns
 
 import (
@@ -10,6 +11,7 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	. "github.com/onsi/gomega"
+
 	. "github.com/weaveworks/eksctl/integration/runner"
 	"github.com/weaveworks/eksctl/integration/utilities/kube"
 
diff --git a/integration/tests/dry_run/dry_run_test.go b/integration/tests/dry_run/dry_run_test.go
index 4fcb34ab10..2cf8c96c63 100644
--- a/integration/tests/dry_run/dry_run_test.go
+++ b/integration/tests/dry_run/dry_run_test.go
@@ -1,6 +1,7 @@
 //go:build integration
 // +build integration
 
+//revive:disable Not changing package name
 package dry_run
 
 import (
@@ -10,18 +11,17 @@ import (
 	"testing"
 
 	"github.com/aws/aws-sdk-go/aws"
+	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/ginkgo/extensions/table"
 	. "github.com/onsi/gomega"
 	"github.com/pkg/errors"
-	. "github.com/weaveworks/eksctl/integration/runner"
 
+	. "github.com/weaveworks/eksctl/integration/runner"
 	"github.com/weaveworks/eksctl/integration/tests"
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 	"github.com/weaveworks/eksctl/pkg/eks"
 	"github.com/weaveworks/eksctl/pkg/testutils"
 	"github.com/weaveworks/eksctl/pkg/utils/ipnet"
-
-	. "github.com/onsi/ginkgo"
 )
 
 var params *tests.Params
diff --git a/integration/tests/eks_connector/eks_connector_test.go b/integration/tests/eks_connector/eks_connector_test.go
index ed1be3f907..5a1549d122 100644
--- a/integration/tests/eks_connector/eks_connector_test.go
+++ b/integration/tests/eks_connector/eks_connector_test.go
@@ -1,6 +1,7 @@
 //go:build integration
 // +build integration
 
+//revive:disable Not changing package name
 package eks_connector_test
 
 import (
@@ -14,6 +15,7 @@ import (
 	awseks "github.com/aws/aws-sdk-go/service/eks"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
+
 	. "github.com/weaveworks/eksctl/integration/runner"
 	"github.com/weaveworks/eksctl/integration/tests"
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
diff --git a/integration/tests/instance_selector/instance_selector_test.go b/integration/tests/instance_selector/instance_selector_test.go
index 755da69180..a06d8a4fa2 100644
--- a/integration/tests/instance_selector/instance_selector_test.go
+++ b/integration/tests/instance_selector/instance_selector_test.go
@@ -1,6 +1,7 @@
 //go:build integration
 // +build integration
 
+//revive:disable Not changing package name
 package instance_selector
 
 import (
diff --git a/integration/tests/quickstart_profiles_gen/quickstart_profiles_gen_test.go b/integration/tests/quickstart_profiles_gen/quickstart_profiles_gen_test.go
index 13e957d6f7..c8940b5af4 100644
--- a/integration/tests/quickstart_profiles_gen/quickstart_profiles_gen_test.go
+++ b/integration/tests/quickstart_profiles_gen/quickstart_profiles_gen_test.go
@@ -1,6 +1,7 @@
 //go:build integration
 // +build integration
 
+//revive:disable Not changing package name
 package quickstart_profiles_gen
 
 import (
diff --git a/integration/tests/unowned_cluster/unowned_cluster_test.go b/integration/tests/unowned_cluster/unowned_cluster_test.go
index 61531563d2..a316673d11 100644
--- a/integration/tests/unowned_cluster/unowned_cluster_test.go
+++ b/integration/tests/unowned_cluster/unowned_cluster_test.go
@@ -1,6 +1,7 @@
 //go:build integration
 // +build integration
 
+//revive:disable Not changing package name
 package unowned_clusters
 
 import (
@@ -11,23 +12,19 @@ import (
 	"testing"
 	"time"
 
-	"github.com/aws/aws-sdk-go/service/kms"
-	"github.com/weaveworks/eksctl/pkg/eks"
-
-	cfn "github.com/aws/aws-sdk-go/service/cloudformation"
-
 	"github.com/aws/aws-sdk-go/aws"
-
-	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
-
+	cfn "github.com/aws/aws-sdk-go/service/cloudformation"
 	awseks "github.com/aws/aws-sdk-go/service/eks"
-	. "github.com/weaveworks/eksctl/integration/runner"
-	"github.com/weaveworks/eksctl/integration/tests"
-	"github.com/weaveworks/eksctl/pkg/testutils"
-
+	"github.com/aws/aws-sdk-go/service/kms"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gbytes"
+
+	. "github.com/weaveworks/eksctl/integration/runner"
+	"github.com/weaveworks/eksctl/integration/tests"
+	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
+	"github.com/weaveworks/eksctl/pkg/eks"
+	"github.com/weaveworks/eksctl/pkg/testutils"
 )
 
 var params *tests.Params
diff --git a/pkg/actions/identityproviders/wait.go b/pkg/actions/identityproviders/wait.go
index 9577da1957..da53cf4c55 100644
--- a/pkg/actions/identityproviders/wait.go
+++ b/pkg/actions/identityproviders/wait.go
@@ -7,6 +7,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/request"
 	"github.com/aws/aws-sdk-go/service/eks"
+
 	"github.com/weaveworks/eksctl/pkg/utils/waiters"
 )
 
@@ -38,8 +39,5 @@ func (m *Manager) waitForUpdate(
 		clusterName,
 	)
 
-	if err := waiters.Wait(clusterName, msg, acceptors, newRequest, timeout, nil); err != nil {
-		return err
-	}
-	return nil
+	return waiters.Wait(clusterName, msg, acceptors, newRequest, timeout, nil)
 }
diff --git a/pkg/actions/nodegroup/create.go b/pkg/actions/nodegroup/create.go
index 3623d76a4f..4ce40da2dd 100644
--- a/pkg/actions/nodegroup/create.go
+++ b/pkg/actions/nodegroup/create.go
@@ -189,11 +189,7 @@ func (m *Manager) nodeCreationTasks(options CreateOpts, nodegroupFilter filter.N
 	}
 
 	taskTree.Append(allNodeGroupTasks)
-	if err := m.init.DoAllNodegroupStackTasks(taskTree, meta.Region, meta.Name); err != nil {
-		return err
-	}
-
-	return nil
+	return m.init.DoAllNodegroupStackTasks(taskTree, meta.Region, meta.Name)
 }
 
 func (m *Manager) postNodeCreationTasks(clientSet kubernetes.Interface, options CreateOpts) error {
@@ -307,9 +303,5 @@ func loadVPCFromConfig(provider api.ClusterProvider, cfg *api.ClusterConfig) err
 		return err
 	}
 
-	if err := cfg.CanUseForPrivateNodeGroups(); err != nil {
-		return err
-	}
-
-	return nil
+	return cfg.CanUseForPrivateNodeGroups()
 }
diff --git a/pkg/actions/repo/enable.go b/pkg/actions/repo/enable.go
index ac3ae5cd90..dfa16a0287 100644
--- a/pkg/actions/repo/enable.go
+++ b/pkg/actions/repo/enable.go
@@ -17,14 +17,15 @@ import (
 	portforward "github.com/justinbarrick/go-k8s-portforward"
 	"github.com/kris-nova/logger"
 	"github.com/pkg/errors"
-	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
-	"github.com/weaveworks/eksctl/pkg/git"
-	"github.com/weaveworks/eksctl/pkg/gitops/deploykey"
-	"github.com/weaveworks/eksctl/pkg/kubernetes"
 	apierrs "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kubeclient "k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
+
+	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
+	"github.com/weaveworks/eksctl/pkg/git"
+	"github.com/weaveworks/eksctl/pkg/gitops/deploykey"
+	"github.com/weaveworks/eksctl/pkg/kubernetes"
 )
 
 const (
@@ -215,10 +216,7 @@ func (fi *Installer) addFilesToRepo() error {
 	}
 
 	// git push
-	if err := fi.GitClient.Push(); err != nil {
-		return err
-	}
-	return nil
+	return fi.GitClient.Push()
 }
 
 func (fi *Installer) createFluxNamespaceIfMissing(manifestsMap map[string][]byte) error {
diff --git a/pkg/apis/eksctl.io/v1alpha5/addon.go b/pkg/apis/eksctl.io/v1alpha5/addon.go
index a57b88e020..e3bf840dc2 100644
--- a/pkg/apis/eksctl.io/v1alpha5/addon.go
+++ b/pkg/apis/eksctl.io/v1alpha5/addon.go
@@ -19,7 +19,7 @@ type Addon struct {
 	// AttachPolicy holds a policy document to attach
 	// +optional
 	AttachPolicy InlineDocument `json:"attachPolicy,omitempty"`
-	// ARN of the permissions boundary to associate
+	// ARN of the permissions' boundary to associate
 	// +optional
 	PermissionsBoundary string `json:"permissionsBoundary,omitempty"`
 	// WellKnownPolicies for attaching common IAM policies
@@ -41,11 +41,7 @@ func (a Addon) Validate() error {
 		return fmt.Errorf("name required")
 	}
 
-	if err := a.checkOnlyOnePolicyProviderIsSet(); err != nil {
-		return err
-	}
-
-	return nil
+	return a.checkOnlyOnePolicyProviderIsSet()
 }
 
 func (a Addon) checkOnlyOnePolicyProviderIsSet() error {
diff --git a/pkg/cfn/builder/managed_nodegroup.go b/pkg/cfn/builder/managed_nodegroup.go
index 5fc8a8744d..99c41b7925 100644
--- a/pkg/cfn/builder/managed_nodegroup.go
+++ b/pkg/cfn/builder/managed_nodegroup.go
@@ -262,17 +262,17 @@ func validateLaunchTemplate(launchTemplateData *ec2.ResponseLaunchTemplateData,
 
 func getAMIType(ng *api.ManagedNodeGroup, instanceType string) string {
 	amiTypeMapping := map[string]struct {
-		X86_64 string
+		X86x64 string
 		GPU    string
 		ARM    string
 	}{
 		api.NodeImageFamilyAmazonLinux2: {
-			X86_64: eks.AMITypesAl2X8664,
+			X86x64: eks.AMITypesAl2X8664,
 			GPU:    eks.AMITypesAl2X8664Gpu,
 			ARM:    eks.AMITypesAl2Arm64,
 		},
 		api.NodeImageFamilyBottlerocket: {
-			X86_64: eks.AMITypesBottlerocketX8664,
+			X86x64: eks.AMITypesBottlerocketX8664,
 			ARM:    eks.AMITypesBottlerocketArm64,
 		},
 	}
@@ -288,7 +288,7 @@ func getAMIType(ng *api.ManagedNodeGroup, instanceType string) string {
 	case instanceutils.IsARMInstanceType(instanceType):
 		return amiType.ARM
 	default:
-		return amiType.X86_64
+		return amiType.X86x64
 	}
 }
 
diff --git a/pkg/cfn/builder/network_interfaces.go b/pkg/cfn/builder/network_interfaces.go
index 0c59beb986..0391c0a02c 100644
--- a/pkg/cfn/builder/network_interfaces.go
+++ b/pkg/cfn/builder/network_interfaces.go
@@ -39,7 +39,7 @@ func buildNetworkInterfaces(
 			return errors.Wrapf(err, "couldn't retrieve instance type description for %v", instanceTypes)
 		}
 
-		var numEFAs float64 = math.MaxFloat64
+		var numEFAs = math.MaxFloat64
 		for _, it := range info.InstanceTypes {
 			networkInfo := it.NetworkInfo
 			numEFAs = math.Min(float64(aws.Int64Value(networkInfo.MaximumNetworkCards)), numEFAs)
diff --git a/pkg/ctl/cmdutils/nodegroup.go b/pkg/ctl/cmdutils/nodegroup.go
index af7e2ddb75..fc02bfd0ee 100644
--- a/pkg/ctl/cmdutils/nodegroup.go
+++ b/pkg/ctl/cmdutils/nodegroup.go
@@ -3,6 +3,7 @@ package cmdutils
 import (
 	"github.com/aws/aws-sdk-go/service/eks"
 	"github.com/kris-nova/logger"
+
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 	"github.com/weaveworks/eksctl/pkg/cfn/manager"
 )
@@ -21,11 +22,8 @@ func PopulateNodegroup(stackManager manager.StackManager, name string, cfg *api.
 		}
 		nodeGroupType = api.NodeGroupTypeUnowned
 	}
-	if err = PopulateNodegroupFromStack(nodeGroupType, name, cfg); err != nil {
-		return err
-	}
 
-	return nil
+	return PopulateNodegroupFromStack(nodeGroupType, name, cfg)
 }
 
 // PopulateNodegroupFromStack populates the nodegroup field of an api.ClusterConfig by type from its CF stack.
diff --git a/pkg/ctl/create/cluster.go b/pkg/ctl/create/cluster.go
index a25cd5057f..8a503698a3 100644
--- a/pkg/ctl/create/cluster.go
+++ b/pkg/ctl/create/cluster.go
@@ -7,24 +7,22 @@ import (
 	"strings"
 
 	"github.com/aws/amazon-ec2-instance-selector/v2/pkg/selector"
-	"github.com/weaveworks/eksctl/pkg/kops"
-	"github.com/weaveworks/eksctl/pkg/utils"
-
-	"github.com/weaveworks/eksctl/pkg/actions/addon"
-
 	"github.com/kris-nova/logger"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	"k8s.io/client-go/tools/clientcmd"
 
+	"github.com/weaveworks/eksctl/pkg/actions/addon"
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 	"github.com/weaveworks/eksctl/pkg/authconfigmap"
 	"github.com/weaveworks/eksctl/pkg/ctl/cmdutils"
 	"github.com/weaveworks/eksctl/pkg/ctl/cmdutils/filter"
 	"github.com/weaveworks/eksctl/pkg/eks"
 	"github.com/weaveworks/eksctl/pkg/gitops"
+	"github.com/weaveworks/eksctl/pkg/kops"
 	"github.com/weaveworks/eksctl/pkg/printers"
+	"github.com/weaveworks/eksctl/pkg/utils"
 	"github.com/weaveworks/eksctl/pkg/utils/kubeconfig"
 	"github.com/weaveworks/eksctl/pkg/utils/kubectl"
 	"github.com/weaveworks/eksctl/pkg/utils/names"
@@ -398,11 +396,7 @@ func doCreateCluster(cmd *cmdutils.Cmd, ngFilter *filter.NodeGroupFilter, params
 
 	logger.Success("%s is ready", meta.LogString())
 
-	if err := printer.LogObj(logger.Debug, "cfg.json = \\\n%s\n", cfg); err != nil {
-		return err
-	}
-
-	return nil
+	return printer.LogObj(logger.Debug, "cfg.json = \\\n%s\n", cfg)
 }
 
 func createOrImportVPC(cmd *cmdutils.Cmd, cfg *api.ClusterConfig, params *cmdutils.CreateClusterCmdParams, ctl *eks.ClusterProvider) error {
@@ -421,10 +415,8 @@ func createOrImportVPC(cmd *cmdutils.Cmd, cfg *api.ClusterConfig, params *cmduti
 		if params.DryRun {
 			return nil
 		}
-		if err := vpc.SetSubnets(cfg.VPC, cfg.AvailabilityZones); err != nil {
-			return err
-		}
-		return nil
+
+		return vpc.SetSubnets(cfg.VPC, cfg.AvailabilityZones)
 	}
 
 	if params.KopsClusterNameForVPC != "" {
diff --git a/pkg/ctl/enable/flux.go b/pkg/ctl/enable/flux.go
index 4965e06680..7cc5ec0b39 100644
--- a/pkg/ctl/enable/flux.go
+++ b/pkg/ctl/enable/flux.go
@@ -6,6 +6,7 @@ import (
 	"github.com/kris-nova/logger"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
+
 	"github.com/weaveworks/eksctl/pkg/actions/flux"
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 	"github.com/weaveworks/eksctl/pkg/ctl/cmdutils"
@@ -84,11 +85,7 @@ func flux2Install(cmd *cmdutils.Cmd) error {
 		return err
 	}
 
-	if err := installer.Run(); err != nil {
-		return err
-	}
-
-	return nil
+	return installer.Run()
 }
 
 func kubeconfAndContextNotSet(flags map[string]string) bool {
diff --git a/pkg/ctl/get/identityprovider.go b/pkg/ctl/get/identityprovider.go
index efaef5db94..c9d88ac209 100644
--- a/pkg/ctl/get/identityprovider.go
+++ b/pkg/ctl/get/identityprovider.go
@@ -84,11 +84,7 @@ func doGetIdentityProvider(cmd *cmdutils.Cmd, params getCmdParams, name string)
 		addIdentityProviderTableColumns(printer.(*printers.TablePrinter), len(summaries))
 	}
 
-	if err := printer.PrintObjWithKind("identity provider summary", summaries, os.Stdout); err != nil {
-		return err
-	}
-
-	return nil
+	return printer.PrintObjWithKind("identity provider summary", summaries, os.Stdout)
 }
 
 func addIdentityProviderTableColumns(printer *printers.TablePrinter, num int) {
diff --git a/pkg/ctl/scale/nodegroup.go b/pkg/ctl/scale/nodegroup.go
index d8f78ab484..4d59f1fb17 100644
--- a/pkg/ctl/scale/nodegroup.go
+++ b/pkg/ctl/scale/nodegroup.go
@@ -60,19 +60,13 @@ func doScaleNodeGroup(cmd *cmdutils.Cmd, ng *api.NodeGroupBase) error {
 		if err := cmdutils.NewScaleAllNodeGroupLoader(cmd).Load(); err != nil {
 			return err
 		}
-		if err := scaleAllNodegroups(cmd); err != nil {
-			return err
-		}
-		return nil
+		return scaleAllNodegroups(cmd)
 	}
 
 	if err := cmdutils.NewScaleNodeGroupLoader(cmd, ng).Load(); err != nil {
 		return err
 	}
-	if err := scaleNodegroup(cmd, ng); err != nil {
-		return err
-	}
-	return nil
+	return scaleNodegroup(cmd, ng)
 }
 
 func scaleAllNodegroups(cmd *cmdutils.Cmd) error {
diff --git a/pkg/eks/eks.go b/pkg/eks/eks.go
index 14a5d0abd7..f75993fe61 100644
--- a/pkg/eks/eks.go
+++ b/pkg/eks/eks.go
@@ -7,25 +7,23 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/weaveworks/eksctl/pkg/cfn/manager"
-	"github.com/weaveworks/eksctl/pkg/cfn/waiter"
-	"github.com/weaveworks/eksctl/pkg/version"
-
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/arn"
-	"github.com/kris-nova/logger"
-	"github.com/pkg/errors"
-
 	"github.com/aws/aws-sdk-go/service/ec2"
 	awseks "github.com/aws/aws-sdk-go/service/eks"
-
+	"github.com/kris-nova/logger"
+	"github.com/pkg/errors"
 	"k8s.io/client-go/kubernetes"
 
+	"github.com/aws/aws-sdk-go/aws/awserr"
+
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
+	"github.com/weaveworks/eksctl/pkg/cfn/manager"
+	"github.com/weaveworks/eksctl/pkg/cfn/waiter"
 	"github.com/weaveworks/eksctl/pkg/fargate"
 	iamoidc "github.com/weaveworks/eksctl/pkg/iam/oidc"
 	"github.com/weaveworks/eksctl/pkg/utils"
+	"github.com/weaveworks/eksctl/pkg/version"
 	"github.com/weaveworks/eksctl/pkg/vpc"
 )
 
@@ -299,10 +297,7 @@ func (c *ClusterProvider) LoadClusterIntoSpecFromStack(spec *api.ClusterConfig,
 	if err := c.RefreshClusterStatus(spec); err != nil {
 		return err
 	}
-	if err := c.loadClusterKubernetesNetworkConfig(spec); err != nil {
-		return err
-	}
-	return nil
+	return c.loadClusterKubernetesNetworkConfig(spec)
 }
 
 // LoadClusterVPC loads the VPC configuration
diff --git a/pkg/git/git.go b/pkg/git/git.go
index 33c1871a12..ade3334c4b 100644
--- a/pkg/git/git.go
+++ b/pkg/git/git.go
@@ -132,10 +132,7 @@ func (git *Client) isRemoteBranch(branch string) bool {
 // Add performs can perform a `git add` operation on the given file paths
 func (git Client) Add(files ...string) error {
 	args := append([]string{"add", "--"}, files...)
-	if err := git.runGitCmd(args...); err != nil {
-		return err
-	}
-	return nil
+	return git.runGitCmd(args...)
 }
 
 // Commit makes a commit if there are staged changes
@@ -174,10 +171,7 @@ func (git Client) Commit(message, user, email string) error {
 		"-m", message,
 		fmt.Sprintf("--author=%s <%s>", user, email),
 	}
-	if err := git.runGitCmd(args...); err != nil {
-		return err
-	}
-	return nil
+	return git.runGitCmd(args...)
 }
 
 // Push pushes the changes to the origin remote
diff --git a/pkg/printers/table.go b/pkg/printers/table.go
index 36a8264cbf..9d516fa315 100644
--- a/pkg/printers/table.go
+++ b/pkg/printers/table.go
@@ -44,10 +44,7 @@ func (t *TablePrinter) PrintObjWithKind(kind string, obj interface{}, writer io.
 		if _, err := w.WriteString(fmt.Sprintf("No %s found\n", strings.ToLower(kind))); err != nil {
 			return err
 		}
-		if err := w.Flush(); err != nil {
-			return err
-		}
-		return nil
+		return w.Flush()
 	}
 
 	return t.table.Render(obj, writer, t.columnames...)
diff --git a/pkg/version/generate/release_generate.go b/pkg/version/generate/release_generate.go
index 070f866d53..4472df4e6c 100644
--- a/pkg/version/generate/release_generate.go
+++ b/pkg/version/generate/release_generate.go
@@ -104,8 +104,5 @@ func writeVersionToFile(version, preReleaseID, fileName string) error {
 	f.Comment("buildDate is the time of the build with format yyyy-mm-ddThh:mm:ssZ. It will be set by the linker.")
 	f.Var().Id("buildDate").Op("=").Lit("")
 
-	if err := f.Save(fileName); err != nil {
-		return err
-	}
-	return nil
+	return f.Save(fileName)
 }
diff --git a/pkg/vpc/vpc.go b/pkg/vpc/vpc.go
index bb4320f47a..9c500ed2f7 100644
--- a/pkg/vpc/vpc.go
+++ b/pkg/vpc/vpc.go
@@ -6,17 +6,14 @@ import (
 	"net"
 	"strings"
 
-	"github.com/aws/aws-sdk-go/service/ec2/ec2iface"
-
-	"github.com/pkg/errors"
-	"k8s.io/apimachinery/pkg/util/sets"
-
-	"github.com/kris-nova/logger"
-
 	"github.com/aws/aws-sdk-go/aws"
 	cfn "github.com/aws/aws-sdk-go/service/cloudformation"
 	"github.com/aws/aws-sdk-go/service/ec2"
+	"github.com/aws/aws-sdk-go/service/ec2/ec2iface"
 	awseks "github.com/aws/aws-sdk-go/service/eks"
+	"github.com/kris-nova/logger"
+	"github.com/pkg/errors"
+	"k8s.io/apimachinery/pkg/util/sets"
 
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 	"github.com/weaveworks/eksctl/pkg/cfn/outputs"
@@ -443,10 +440,7 @@ func ValidateExistingPublicSubnets(provider api.ClusterProvider, vpcID string, s
 	if err != nil {
 		return err
 	}
-	if err := validatePublicSubnet(subnets); err != nil {
-		return err
-	}
-	return nil
+	return validatePublicSubnet(subnets)
 }
 
 // EnsureMapPublicIPOnLaunchEnabled will enable MapPublicIpOnLaunch in EC2 for all given subnet IDs