From 345658742a9579004c642c5833fc3243cf06b8b3 Mon Sep 17 00:00:00 2001 From: Carlos Tadeu Panato Junior Date: Wed, 11 Oct 2023 21:49:43 +0200 Subject: [PATCH] Updates for lint job and Go for the image (#533) * update lint job Signed-off-by: cpanato * update go to 1.20.10 Signed-off-by: cpanato * ignore lints Signed-off-by: cpanato --------- Signed-off-by: cpanato --- .github/workflows/lint.yml | 4 ++-- Dockerfile | 2 +- controllers/docluster_controller.go | 2 +- controllers/domachine_controller.go | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 39c5389a6..8d141ca06 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -19,11 +19,11 @@ jobs: - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0 with: - go-version: "1.19" + go-version: "1.20" check-latest: true cache: false - name: golangci-lint uses: golangci/golangci-lint-action@3a919529898de77ec3da873e3063ca4b10e7f5cc # v3.7.0 with: - version: "v1.52" + version: "v1.54" diff --git a/Dockerfile b/Dockerfile index 0c19ced3b..9c4f5a23d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. # Build the manager binary -FROM golang:1.20.8@sha256:1b46d1164aceec47750cc0c3a6f8c44ee8050a0745c07affcef73518544a2b1f as builder +FROM golang:1.20.10@sha256:ed6c4a5918b0a1ffb97970f6493d742dc5c7ebf3ccbd417c215d52830b57b994 as builder WORKDIR /workspace # Run this with docker build --build_arg $(go env GOPROXY) to override the goproxy diff --git a/controllers/docluster_controller.go b/controllers/docluster_controller.go index 5696345bb..3fd070189 100644 --- a/controllers/docluster_controller.go +++ b/controllers/docluster_controller.go @@ -242,7 +242,7 @@ func (r *DOClusterReconciler) reconcile(ctx context.Context, clusterScope *scope return reconcile.Result{}, nil } -func (r *DOClusterReconciler) reconcileDelete(ctx context.Context, clusterScope *scope.ClusterScope) (reconcile.Result, error) { +func (r *DOClusterReconciler) reconcileDelete(ctx context.Context, clusterScope *scope.ClusterScope) (reconcile.Result, error) { //nolint: unparam clusterScope.Info("Reconciling delete DOCluster") docluster := clusterScope.DOCluster networkingsvc := networking.NewService(ctx, clusterScope) diff --git a/controllers/domachine_controller.go b/controllers/domachine_controller.go index 47903c3e4..e912674b8 100644 --- a/controllers/domachine_controller.go +++ b/controllers/domachine_controller.go @@ -220,7 +220,7 @@ func (r *DOMachineReconciler) Reconcile(ctx context.Context, req ctrl.Request) ( return r.reconcile(ctx, machineScope, clusterScope) } -func (r *DOMachineReconciler) reconcileVolumes(ctx context.Context, mscope *scope.MachineScope, cscope *scope.ClusterScope) (reconcile.Result, error) { +func (r *DOMachineReconciler) reconcileVolumes(ctx context.Context, mscope *scope.MachineScope, cscope *scope.ClusterScope) (reconcile.Result, error) { //nolint: unparam mscope.Info("Reconciling DOMachine Volumes") computesvc := computes.NewService(ctx, cscope) domachine := mscope.DOMachine @@ -312,7 +312,7 @@ func (r *DOMachineReconciler) reconcile(ctx context.Context, machineScope *scope return reconcile.Result{}, nil } } -func (r *DOMachineReconciler) reconcileDeleteVolumes(ctx context.Context, mscope *scope.MachineScope, cscope *scope.ClusterScope) (reconcile.Result, error) { +func (r *DOMachineReconciler) reconcileDeleteVolumes(ctx context.Context, mscope *scope.MachineScope, cscope *scope.ClusterScope) (reconcile.Result, error) { //nolint: unparam mscope.Info("Reconciling delete DOMachine Volumes") computesvc := computes.NewService(ctx, cscope) domachine := mscope.DOMachine