Skip to content

Commit aa9bca4

Browse files
upgrade golang bits to be inline with v1.18.x (#770)
Signed-off-by: Prajyot-Parab <[email protected]>
1 parent f22dc45 commit aa9bca4

File tree

7 files changed

+22
-569
lines changed

7 files changed

+22
-569
lines changed

.golangci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,9 @@ linters-settings:
9191
allow-leading-space: false
9292
require-specific: true
9393
staticcheck:
94-
go: "1.17"
94+
go: "1.18"
9595
stylecheck:
96-
go: "1.17"
96+
go: "1.18"
9797
gosec:
9898
excludes:
9999
- G307 # Deferring unsafe method "Close" on type "\*os.File"
@@ -116,7 +116,7 @@ linters-settings:
116116
- whyNoLint
117117
- wrapperFunc
118118
unused:
119-
go: "1.17"
119+
go: "1.18"
120120
issues:
121121
max-same-issues: 0
122122
max-issues-per-linter: 0

controllers/ibmpowervscluster_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ func (c clusterDescendants) filterOwnedDescendants(cluster *infrav1beta1.IBMPowe
212212
obj := o.(client.Object)
213213
acc, err := meta.Accessor(obj)
214214
if err != nil {
215-
return nil //nolint:nilerr // We don't want to exit the EachListItem loop, just continue
215+
return nil // We don't want to exit the EachListItem loop, just continue
216216
}
217217

218218
if util.IsOwnedByObject(acc, cluster) {

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module sigs.k8s.io/cluster-api-provider-ibmcloud
22

3-
go 1.17
3+
go 1.18
44

55
require (
66
github.com/IBM-Cloud/power-go-client v1.1.10

go.sum

Lines changed: 0 additions & 183 deletions
Large diffs are not rendered by default.

hack/tools/go.mod

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module sigs.k8s.io/cluster-api-provider-ibmcloud/hack/tools
22

3-
go 1.17
3+
go 1.18
44

55
require (
66
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46
@@ -47,7 +47,7 @@ require (
4747
github.com/cespare/xxhash/v2 v2.1.2 // indirect
4848
github.com/charithe/durationcheck v0.0.9 // indirect
4949
github.com/chavacava/garif v0.0.0-20220316182200-5cad0b5181d4 // indirect
50-
github.com/daixiang0/gci v0.4.2 // indirect
50+
github.com/daixiang0/gci v0.4.3 // indirect
5151
github.com/davecgh/go-spew v1.1.1 // indirect
5252
github.com/denis-tingaikin/go-header v0.4.3 // indirect
5353
github.com/dnephin/pflag v1.0.7 // indirect
@@ -174,7 +174,7 @@ require (
174174
github.com/sirupsen/logrus v1.8.1 // indirect
175175
github.com/sivchari/containedctx v1.0.2 // indirect
176176
github.com/sivchari/nosnakecase v1.5.0 // indirect
177-
github.com/sivchari/tenv v1.6.0 // indirect
177+
github.com/sivchari/tenv v1.7.0 // indirect
178178
github.com/sonatard/noctx v0.0.1 // indirect
179179
github.com/sourcegraph/go-diff v0.6.1 // indirect
180180
github.com/spf13/afero v1.8.2 // indirect
@@ -209,14 +209,14 @@ require (
209209
go.uber.org/zap v1.19.1 // indirect
210210
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
211211
golang.org/x/exp v0.0.0-20220328175248-053ad81199eb // indirect
212-
golang.org/x/exp/typeparams v0.0.0-20220218215828-6cf2b201936e // indirect
212+
golang.org/x/exp/typeparams v0.0.0-20220613132600-b0d781184e0d // indirect
213213
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
214214
golang.org/x/net v0.0.0-20220617184016-355a448f1bc9 // indirect
215215
golang.org/x/sync v0.0.0-20220513210516-0976fa681c29 // indirect
216216
golang.org/x/sys v0.0.0-20220702020025-31831981b65f // indirect
217217
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
218218
golang.org/x/text v0.3.7 // indirect
219-
golang.org/x/tools v0.1.11 // indirect
219+
golang.org/x/tools v0.1.12-0.20220628192153-7743d1d949f1 // indirect
220220
google.golang.org/protobuf v1.28.0 // indirect
221221
gopkg.in/inf.v0 v0.9.1 // indirect
222222
gopkg.in/ini.v1 v1.66.6 // indirect
@@ -235,7 +235,7 @@ require (
235235
mvdan.cc/gofumpt v0.3.1 // indirect
236236
mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed // indirect
237237
mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect
238-
mvdan.cc/unparam v0.0.0-20211214103731-d0ef000c54e5 // indirect
238+
mvdan.cc/unparam v0.0.0-20220706161116-678bad134442 // indirect
239239
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
240240
sigs.k8s.io/kubebuilder/docs/book/utils v0.0.0-20211028165026-57688c578b5d // indirect
241241
sigs.k8s.io/kustomize/api v0.11.5 // indirect

0 commit comments

Comments
 (0)