Skip to content

Commit

Permalink
Updates for lint job and Go for the image (#533)
Browse files Browse the repository at this point in the history
* update lint job

Signed-off-by: cpanato <ctadeu@gmail.com>

* update go to 1.20.10

Signed-off-by: cpanato <ctadeu@gmail.com>

* ignore lints

Signed-off-by: cpanato <ctadeu@gmail.com>

---------

Signed-off-by: cpanato <ctadeu@gmail.com>
  • Loading branch information
cpanato committed Oct 11, 2023
1 parent cdbea39 commit 3456587
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion controllers/docluster_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions controllers/domachine_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 3456587

Please sign in to comment.