Skip to content

Commit 63b9a12

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #2028 from chrischdi/pr-bump-golangci-lint
🌱 Bump golangci-lint to v1.53.3 and adapt installation from core CAPI
2 parents e213136 + 1b7a228 commit 63b9a12

9 files changed

+57
-484
lines changed

‎.github/workflows/golangci-lint.yaml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,15 @@ jobs:
1212
name: lint
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v3
16-
- uses: actions/[email protected]
15+
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # tag=v3.5.3
16+
- name: Calculate go version
17+
id: vars
18+
run: echo "go_version=$(make go-version)" >> $GITHUB_OUTPUT
19+
- name: Set up Go
20+
uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # tag=v4.0.1
1721
with:
18-
go-version: 1.19
22+
go-version: ${{ steps.vars.outputs.go_version }}
1923
- name: golangci-lint
20-
uses: golangci/[email protected]
24+
uses: golangci/golangci-lint-action@639cd343e1d3b897ff35927a75193d57cfcba299 # tag=v3.6.0
2125
with:
22-
version: v1.52.2
26+
version: v1.53.3

‎.golangci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ linters:
33
enable:
44
- asciicheck
55
- bodyclose
6-
- depguard
76
- dogsled
87
- errcheck
98
- exportloopref

‎Makefile

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,15 +72,19 @@ KUSTOMIZE_BIN := kustomize
7272
KUSTOMIZE := $(abspath $(TOOLS_BIN_DIR)/$(KUSTOMIZE_BIN)-$(KUSTOMIZE_VER))
7373
KUSTOMIZE_PKG := sigs.k8s.io/kustomize/kustomize/v4
7474

75+
GOLANGCI_LINT_BIN := golangci-lint
76+
GOLANGCI_LINT_VER := $(shell cat .github/workflows/golangci-lint.yaml | grep [[:space:]]version: | sed 's/.*version: //')
77+
GOLANGCI_LINT := $(abspath $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER))
78+
GOLANGCI_LINT_PKG := github.com/golangci/golangci-lint/cmd/golangci-lint
79+
7580
CONVERSION_GEN := $(TOOLS_BIN_DIR)/conversion-gen
7681
GINKGO := $(TOOLS_BIN_DIR)/ginkgo
77-
GOLANGCI_LINT := $(TOOLS_BIN_DIR)/golangci-lint
7882
KIND := $(TOOLS_BIN_DIR)/kind
7983
SETUP_ENVTEST := $(abspath $(TOOLS_BIN_DIR)/setup-envtest)
8084
CONVERSION_VERIFIER := $(abspath $(TOOLS_BIN_DIR)/conversion-verifier)
8185
GO_APIDIFF := $(TOOLS_BIN_DIR)/go-apidiff
8286
RELEASE_NOTES := $(TOOLS_BIN_DIR)/release-notes
83-
TOOLING_BINARIES := $(CONVERSION_GEN) $(GINKGO) $(GOLANGCI_LINT) $(KIND) $(CONVERSION_VERIFIER) $(GO_APIDIFF) $(RELEASE_NOTES)
87+
TOOLING_BINARIES := $(CONVERSION_GEN) $(GINKGO) $(KIND) $(CONVERSION_VERIFIER) $(GO_APIDIFF) $(RELEASE_NOTES)
8488
ARTIFACTS ?= $(ROOT_DIR)/_artifacts
8589

8690
# Set --output-base for conversion-gen if we are not within GOPATH
@@ -253,6 +257,12 @@ $(KUSTOMIZE): # Build kustomize from tools folder.
253257
.PHONY: $(KUSTOMIZE_BIN)
254258
$(KUSTOMIZE_BIN): $(KUSTOMIZE) ## Build a local copy of kustomize.
255259

260+
.PHONY: $(GOLANGCI_LINT_BIN)
261+
$(GOLANGCI_LINT_BIN): $(GOLANGCI_LINT) ## Build a local copy of golangci-lint.
262+
263+
$(GOLANGCI_LINT): # Build golangci-lint from tools folder.
264+
GOBIN=$(TOOLS_BIN_DIR) $(GO_INSTALL) $(GOLANGCI_LINT_PKG) $(GOLANGCI_LINT_BIN) $(GOLANGCI_LINT_VER)
265+
256266
## --------------------------------------
257267
## Linting and fixing linter errors
258268
## --------------------------------------

‎controllers/vmware/vspherecluster_reconciler.go

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,8 @@ func (r ClusterReconciler) Reconcile(_ goctx.Context, req ctrl.Request) (_ ctrl.
112112

113113
// Handle deleted clusters
114114
if !vsphereCluster.DeletionTimestamp.IsZero() {
115-
return r.reconcileDelete(clusterContext), nil
115+
r.reconcileDelete(clusterContext)
116+
return ctrl.Result{}, nil
116117
}
117118

118119
if cluster == nil {
@@ -121,10 +122,10 @@ func (r ClusterReconciler) Reconcile(_ goctx.Context, req ctrl.Request) (_ ctrl.
121122
}
122123

123124
// Handle non-deleted clusters
124-
return r.reconcileNormal(clusterContext)
125+
return ctrl.Result{}, r.reconcileNormal(clusterContext)
125126
}
126127

127-
func (r *ClusterReconciler) reconcileDelete(ctx *vmware.ClusterContext) reconcile.Result {
128+
func (r *ClusterReconciler) reconcileDelete(ctx *vmware.ClusterContext) {
128129
ctx.Logger.Info("Reconciling vsphereCluster delete")
129130

130131
deletingConditionTypes := []clusterv1.ConditionType{
@@ -141,11 +142,9 @@ func (r *ClusterReconciler) reconcileDelete(ctx *vmware.ClusterContext) reconcil
141142

142143
// Cluster is deleted so remove the finalizer.
143144
controllerutil.RemoveFinalizer(ctx.VSphereCluster, vmwarev1.ClusterFinalizer)
144-
145-
return reconcile.Result{}
146145
}
147146

148-
func (r *ClusterReconciler) reconcileNormal(ctx *vmware.ClusterContext) (reconcile.Result, error) {
147+
func (r *ClusterReconciler) reconcileNormal(ctx *vmware.ClusterContext) error {
149148
ctx.Logger.Info("Reconciling vsphereCluster")
150149

151150
// If the vsphereCluster doesn't have our finalizer, add it.
@@ -154,7 +153,7 @@ func (r *ClusterReconciler) reconcileNormal(ctx *vmware.ClusterContext) (reconci
154153
// Get any failure domains to report back to the CAPI core controller.
155154
failureDomains, err := r.getFailureDomains(ctx)
156155
if err != nil {
157-
return reconcile.Result{}, errors.Wrapf(
156+
return errors.Wrapf(
158157
err,
159158
"unexpected error while discovering failure domains for %s", ctx.VSphereCluster.Name)
160159
}
@@ -166,7 +165,7 @@ func (r *ClusterReconciler) reconcileNormal(ctx *vmware.ClusterContext) (reconci
166165
resourcePolicyName, err := r.ResourcePolicyService.ReconcileResourcePolicy(ctx)
167166
if err != nil {
168167
conditions.MarkFalse(ctx.VSphereCluster, vmwarev1.ResourcePolicyReadyCondition, vmwarev1.ResourcePolicyCreationFailedReason, clusterv1.ConditionSeverityWarning, err.Error())
169-
return reconcile.Result{}, errors.Wrapf(err,
168+
return errors.Wrapf(err,
170169
"failed to configure resource policy for vsphereCluster %s/%s",
171170
ctx.VSphereCluster.Namespace, ctx.VSphereCluster.Name)
172171
}
@@ -176,20 +175,20 @@ func (r *ClusterReconciler) reconcileNormal(ctx *vmware.ClusterContext) (reconci
176175
// Configure the cluster for the cluster network
177176
err = r.NetworkProvider.ProvisionClusterNetwork(ctx)
178177
if err != nil {
179-
return reconcile.Result{}, errors.Wrapf(err,
178+
return errors.Wrapf(err,
180179
"failed to configure cluster network for vsphereCluster %s/%s",
181180
ctx.VSphereCluster.Namespace, ctx.VSphereCluster.Name)
182181
}
183182

184183
if ok, err := r.reconcileControlPlaneEndpoint(ctx); !ok {
185184
if err != nil {
186-
return reconcile.Result{}, errors.Wrapf(err, "unexpected error while reconciling control plane endpoint for %s", ctx.VSphereCluster.Name)
185+
return errors.Wrapf(err, "unexpected error while reconciling control plane endpoint for %s", ctx.VSphereCluster.Name)
187186
}
188187
}
189188

190189
ctx.VSphereCluster.Status.Ready = true
191190
ctx.Logger.V(2).Info("Reconcile completed, vsphereCluster is infrastructure-ready")
192-
return reconcile.Result{}, nil
191+
return nil
193192
}
194193

195194
func (r *ClusterReconciler) reconcileControlPlaneEndpoint(ctx *vmware.ClusterContext) (bool, error) {

‎controllers/vsphereclusteridentity_controller.go

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ func (r clusterIdentityReconciler) Reconcile(ctx _context.Context, req reconcile
114114
}()
115115

116116
if !identity.DeletionTimestamp.IsZero() {
117-
return r.reconcileDelete(ctx, identity)
117+
return ctrl.Result{}, r.reconcileDelete(ctx, identity)
118118
}
119119

120120
// fetch secret
@@ -159,7 +159,7 @@ func (r clusterIdentityReconciler) Reconcile(ctx _context.Context, req reconcile
159159
return reconcile.Result{}, nil
160160
}
161161

162-
func (r clusterIdentityReconciler) reconcileDelete(ctx _context.Context, identity *infrav1.VSphereClusterIdentity) (reconcile.Result, error) {
162+
func (r clusterIdentityReconciler) reconcileDelete(ctx _context.Context, identity *infrav1.VSphereClusterIdentity) error {
163163
r.Logger.Info("Reconciling VSphereClusterIdentity delete")
164164
secret := &corev1.Secret{}
165165
secretKey := client.ObjectKey{
@@ -169,9 +169,9 @@ func (r clusterIdentityReconciler) reconcileDelete(ctx _context.Context, identit
169169
err := r.Client.Get(ctx, secretKey, secret)
170170
if err != nil {
171171
if apierrors.IsNotFound(err) {
172-
return reconcile.Result{}, nil
172+
return nil
173173
}
174-
return reconcile.Result{}, err
174+
return err
175175
}
176176
r.Logger.Info(fmt.Sprintf("Removing finalizer from Secret %s/%s", secret.Namespace, secret.Name))
177177
// Check if the old finalizer(from v0.7) is present, if yes, delete it
@@ -181,11 +181,7 @@ func (r clusterIdentityReconciler) reconcileDelete(ctx _context.Context, identit
181181
}
182182
ctrlutil.RemoveFinalizer(secret, infrav1.SecretIdentitySetFinalizer)
183183
if err := r.Client.Update(ctx, secret); err != nil {
184-
return reconcile.Result{}, err
184+
return err
185185
}
186-
if err := r.Client.Delete(ctx, secret); err != nil {
187-
return reconcile.Result{}, err
188-
}
189-
190-
return reconcile.Result{}, nil
186+
return r.Client.Delete(ctx, secret)
191187
}

‎controllers/vspheredeploymentzone_controller.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -144,36 +144,36 @@ func (r vsphereDeploymentZoneReconciler) Reconcile(ctx goctx.Context, request re
144144
}()
145145

146146
if !vsphereDeploymentZone.DeletionTimestamp.IsZero() {
147-
return r.reconcileDelete(vsphereDeploymentZoneContext)
147+
return ctrl.Result{}, r.reconcileDelete(vsphereDeploymentZoneContext)
148148
}
149149

150-
return r.reconcileNormal(vsphereDeploymentZoneContext)
150+
return ctrl.Result{}, r.reconcileNormal(vsphereDeploymentZoneContext)
151151
}
152152

153-
func (r vsphereDeploymentZoneReconciler) reconcileNormal(ctx *context.VSphereDeploymentZoneContext) (reconcile.Result, error) {
153+
func (r vsphereDeploymentZoneReconciler) reconcileNormal(ctx *context.VSphereDeploymentZoneContext) error {
154154
ctrlutil.AddFinalizer(ctx.VSphereDeploymentZone, infrav1.DeploymentZoneFinalizer)
155155

156156
authSession, err := r.getVCenterSession(ctx)
157157
if err != nil {
158158
ctx.Logger.V(4).Error(err, "unable to create session")
159159
conditions.MarkFalse(ctx.VSphereDeploymentZone, infrav1.VCenterAvailableCondition, infrav1.VCenterUnreachableReason, clusterv1.ConditionSeverityError, err.Error())
160160
ctx.VSphereDeploymentZone.Status.Ready = pointer.Bool(false)
161-
return reconcile.Result{}, errors.Wrapf(err, "unable to create auth session")
161+
return errors.Wrapf(err, "unable to create auth session")
162162
}
163163
ctx.AuthSession = authSession
164164
conditions.MarkTrue(ctx.VSphereDeploymentZone, infrav1.VCenterAvailableCondition)
165165

166166
if err := r.reconcilePlacementConstraint(ctx); err != nil {
167167
ctx.VSphereDeploymentZone.Status.Ready = pointer.Bool(false)
168-
return reconcile.Result{}, errors.Wrap(err, "placement constraint is misconfigured")
168+
return errors.Wrap(err, "placement constraint is misconfigured")
169169
}
170170
conditions.MarkTrue(ctx.VSphereDeploymentZone, infrav1.PlacementConstraintMetCondition)
171171

172172
// reconcile the failure domain
173173
if err := r.reconcileFailureDomain(ctx); err != nil {
174174
ctx.Logger.V(4).Error(err, "failed to reconcile failure domain", "failureDomain", ctx.VSphereDeploymentZone.Spec.FailureDomain)
175175
ctx.VSphereDeploymentZone.Status.Ready = pointer.Bool(false)
176-
return reconcile.Result{}, errors.Wrapf(err, "failed to reconcile failure domain")
176+
return errors.Wrapf(err, "failed to reconcile failure domain")
177177
}
178178
conditions.MarkTrue(ctx.VSphereDeploymentZone, infrav1.VSphereFailureDomainValidatedCondition)
179179

@@ -191,12 +191,12 @@ func (r vsphereDeploymentZoneReconciler) reconcileNormal(ctx *context.VSphereDep
191191
UID: ctx.VSphereDeploymentZone.UID,
192192
})
193193
}); err != nil {
194-
return reconcile.Result{}, err
194+
return err
195195
}
196196
}
197197

198198
ctx.VSphereDeploymentZone.Status.Ready = pointer.Bool(true)
199-
return reconcile.Result{}, nil
199+
return nil
200200
}
201201

202202
func (r vsphereDeploymentZoneReconciler) reconcilePlacementConstraint(ctx *context.VSphereDeploymentZoneContext) error {
@@ -257,13 +257,13 @@ func (r vsphereDeploymentZoneReconciler) getVCenterSession(ctx *context.VSphereD
257257
params)
258258
}
259259

260-
func (r vsphereDeploymentZoneReconciler) reconcileDelete(ctx *context.VSphereDeploymentZoneContext) (reconcile.Result, error) {
260+
func (r vsphereDeploymentZoneReconciler) reconcileDelete(ctx *context.VSphereDeploymentZoneContext) error {
261261
r.Logger.Info("Deleting VSphereDeploymentZone")
262262

263263
machines := &clusterv1.MachineList{}
264264
if err := r.Client.List(ctx, machines); err != nil {
265265
r.Logger.Error(err, "unable to list machines")
266-
return reconcile.Result{}, errors.Wrapf(err, "unable to list machines")
266+
return errors.Wrapf(err, "unable to list machines")
267267
}
268268

269269
machinesUsingDeploymentZone := collections.FromMachineList(machines).Filter(collections.ActiveMachines, func(machine *clusterv1.Machine) bool {
@@ -276,7 +276,7 @@ func (r vsphereDeploymentZoneReconciler) reconcileDelete(ctx *context.VSphereDep
276276
machineNamesStr := util.MachinesAsString(machinesUsingDeploymentZone.SortedByCreationTimestamp())
277277
err := errors.Errorf("%s is currently in use by machines: %s", ctx.VSphereDeploymentZone.Name, machineNamesStr)
278278
r.Logger.Error(err, "Error deleting VSphereDeploymentZone", "name", ctx.VSphereDeploymentZone.Name)
279-
return reconcile.Result{}, err
279+
return err
280280
}
281281

282282
if err := updateOwnerReferences(ctx, ctx.VSphereFailureDomain, r.Client, func() []metav1.OwnerReference {
@@ -286,7 +286,7 @@ func (r vsphereDeploymentZoneReconciler) reconcileDelete(ctx *context.VSphereDep
286286
Name: ctx.VSphereDeploymentZone.Name,
287287
})
288288
}); err != nil {
289-
return reconcile.Result{}, err
289+
return err
290290
}
291291

292292
if len(ctx.VSphereFailureDomain.OwnerReferences) == 0 {
@@ -298,7 +298,7 @@ func (r vsphereDeploymentZoneReconciler) reconcileDelete(ctx *context.VSphereDep
298298

299299
ctrlutil.RemoveFinalizer(ctx.VSphereDeploymentZone, infrav1.DeploymentZoneFinalizer)
300300

301-
return reconcile.Result{}, nil
301+
return nil
302302
}
303303

304304
// updateOwnerReferences uses the ownerRef function to calculate the owner references

‎controllers/vspheredeploymentzone_controller_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -578,7 +578,7 @@ func TestVsphereDeploymentZone_Failed_ReconcilePlacementConstraint(t *testing.T)
578578
}
579579

580580
reconciler := vsphereDeploymentZoneReconciler{controllerCtx}
581-
_, err = reconciler.reconcileNormal(deploymentZoneCtx)
581+
err = reconciler.reconcileNormal(deploymentZoneCtx)
582582
g.Expect(err).To(HaveOccurred())
583583
})
584584
}
@@ -624,7 +624,7 @@ func TestVSphereDeploymentZoneReconciler_ReconcileDelete(t *testing.T) {
624624

625625
g := NewWithT(t)
626626
reconciler := vsphereDeploymentZoneReconciler{controllerCtx}
627-
_, err := reconciler.reconcileDelete(deploymentZoneCtx)
627+
err := reconciler.reconcileDelete(deploymentZoneCtx)
628628
g.Expect(err).To(HaveOccurred())
629629
g.Expect(err.Error()).To(MatchRegexp(".*[is currently in use]{1}.*"))
630630
g.Expect(vsphereDeploymentZone.Finalizers).To(HaveLen(1))
@@ -646,7 +646,7 @@ func TestVSphereDeploymentZoneReconciler_ReconcileDelete(t *testing.T) {
646646

647647
g := NewWithT(t)
648648
reconciler := vsphereDeploymentZoneReconciler{controllerCtx}
649-
_, err := reconciler.reconcileDelete(deploymentZoneCtx)
649+
err := reconciler.reconcileDelete(deploymentZoneCtx)
650650
g.Expect(err).NotTo(HaveOccurred())
651651
g.Expect(vsphereDeploymentZone.Finalizers).To(HaveLen(0))
652652
})
@@ -665,7 +665,7 @@ func TestVSphereDeploymentZoneReconciler_ReconcileDelete(t *testing.T) {
665665

666666
g := NewWithT(t)
667667
reconciler := vsphereDeploymentZoneReconciler{controllerCtx}
668-
_, err := reconciler.reconcileDelete(deploymentZoneCtx)
668+
err := reconciler.reconcileDelete(deploymentZoneCtx)
669669
g.Expect(err).NotTo(HaveOccurred())
670670
g.Expect(vsphereDeploymentZone.Finalizers).To(HaveLen(0))
671671
})
@@ -682,7 +682,7 @@ func TestVSphereDeploymentZoneReconciler_ReconcileDelete(t *testing.T) {
682682

683683
g := NewWithT(t)
684684
reconciler := vsphereDeploymentZoneReconciler{controllerCtx}
685-
_, err := reconciler.reconcileDelete(deploymentZoneCtx)
685+
err := reconciler.reconcileDelete(deploymentZoneCtx)
686686
g.Expect(err).NotTo(HaveOccurred())
687687
g.Expect(vsphereDeploymentZone.Finalizers).To(HaveLen(0))
688688
})
@@ -706,7 +706,7 @@ func TestVSphereDeploymentZoneReconciler_ReconcileDelete(t *testing.T) {
706706

707707
g := NewWithT(t)
708708
reconciler := vsphereDeploymentZoneReconciler{controllerCtx}
709-
_, err := reconciler.reconcileDelete(deploymentZoneCtx)
709+
err := reconciler.reconcileDelete(deploymentZoneCtx)
710710
g.Expect(err).NotTo(HaveOccurred())
711711
})
712712

@@ -728,7 +728,7 @@ func TestVSphereDeploymentZoneReconciler_ReconcileDelete(t *testing.T) {
728728

729729
g := NewWithT(t)
730730
reconciler := vsphereDeploymentZoneReconciler{controllerCtx}
731-
_, err := reconciler.reconcileDelete(deploymentZoneCtx)
731+
err := reconciler.reconcileDelete(deploymentZoneCtx)
732732
g.Expect(err).NotTo(HaveOccurred())
733733

734734
fetchedFailureDomain := &infrav1.VSphereFailureDomain{}

0 commit comments

Comments
 (0)