Skip to content

Commit 7f2a570

Browse files
authored
Merge pull request #868 from Prajyot-Parab/update_bits
Bump github.com/golangci/golangci-lint from 1.50.1 to 1.52.1
2 parents b6779b4 + 236b48b commit 7f2a570

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ ENVSUBST_VER := v1.2.0
7171
ENVSUBST_BIN := envsubst
7272
ENVSUBST := $(TOOLS_BIN_DIR)/$(ENVSUBST_BIN)
7373

74-
GOLANGCI_LINT_VER := v1.50.1
74+
GOLANGCI_LINT_VER := v1.52.1
7575
GOLANGCI_LINT_BIN := golangci-lint
7676
GOLANGCI_LINT := $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER)
7777

exp/controllers/gcpmanagedcluster_controller.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ func (r *GCPManagedClusterReconciler) SetupWithManager(ctx context.Context, mgr
143143
log := ctrl.LoggerFrom(ctx)
144144

145145
c, err := ctrl.NewControllerManagedBy(mgr).
146+
WithOptions(options).
146147
For(&infrav1exp.GCPManagedCluster{}).
147148
WithEventFilter(predicates.ResourceNotPausedAndHasFilterLabel(log, r.WatchFilterValue)).
148149
Watches(

hack/tools/tools.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
//go:build tools
2-
// +build tools
1+
//go:build capgtools
2+
// +build capgtools
33

44
/*
55
# Copyright 2022 The Kubernetes Authors.

scripts/go_install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,6 @@ fi
4040
rm "${GOBIN}/${2}"* || true
4141

4242
# install the golang module specified as the first argument
43-
go install -tags tools "${1}@${3}"
43+
go install -tags capgtools "${1}@${3}"
4444
mv "${GOBIN}/${2}" "${GOBIN}/${2}-${3}"
4545
ln -sf "${GOBIN}/${2}-${3}" "${GOBIN}/${2}"

0 commit comments

Comments
 (0)