Skip to content

Commit b4d1f0d

Browse files
avorimaavorima
authored
🌱 Bump go patch and linter version (#239)
**What is the purpose of this pull request/Why do we need it?** The current linter version crashes on my machine when I'm using go 1.23. Take the chance to increase the minimum go version to 1.22.7 which includes some CVE fixes. **Issue #, if available:** **Description of changes:** **Special notes for your reviewer:** **Checklist:** - [ ] Documentation updated - [ ] Unit Tests added - [ ] E2E Tests added - [x] Includes [emojis](https://github.com/kubernetes-sigs/kubebuilder-release-tools?tab=readme-ov-file#kubebuilder-project-versioning)
1 parent ca983fe commit b4d1f0d

File tree

8 files changed

+347
-711
lines changed

8 files changed

+347
-711
lines changed

‎go.mod‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
module github.com/ionos-cloud/cluster-api-provider-ionoscloud
22

3-
go 1.22.0
3+
go 1.22.7
44

55
require (
66
github.com/go-logr/logr v1.4.2
77
github.com/google/go-cmp v0.6.0
88
github.com/google/uuid v1.6.0
99
github.com/ionos-cloud/sdk-go/v6 v6.3.0
1010
github.com/jarcoal/httpmock v1.3.1
11-
github.com/onsi/ginkgo/v2 v2.22.0
12-
github.com/onsi/gomega v1.36.0
11+
github.com/onsi/ginkgo/v2 v2.22.2
12+
github.com/onsi/gomega v1.36.2
1313
github.com/spf13/pflag v1.0.5
1414
github.com/stretchr/testify v1.10.0
1515
k8s.io/api v0.30.7
@@ -65,7 +65,7 @@ require (
6565
github.com/google/go-github/v53 v53.2.0 // indirect
6666
github.com/google/go-querystring v1.1.0 // indirect
6767
github.com/google/gofuzz v1.2.0 // indirect
68-
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
68+
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
6969
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
7070
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
7171
github.com/hashicorp/hcl v1.0.0 // indirect
@@ -126,12 +126,12 @@ require (
126126
golang.org/x/term v0.27.0 // indirect
127127
golang.org/x/text v0.21.0 // indirect
128128
golang.org/x/time v0.5.0 // indirect
129-
golang.org/x/tools v0.26.0 // indirect
129+
golang.org/x/tools v0.28.0 // indirect
130130
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
131131
google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2 // indirect
132132
google.golang.org/genproto/googleapis/rpc v0.0.0-20240314234333-6e1732d8331c // indirect
133133
google.golang.org/grpc v1.62.2 // indirect
134-
google.golang.org/protobuf v1.35.1 // indirect
134+
google.golang.org/protobuf v1.36.1 // indirect
135135
gopkg.in/inf.v0 v0.9.1 // indirect
136136
gopkg.in/ini.v1 v1.67.0 // indirect
137137
gopkg.in/yaml.v2 v2.4.0 // indirect

‎go.sum‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,8 @@ github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17
122122
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
123123
github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
124124
github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
125-
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db h1:097atOisP2aRj7vFgYQBbFN4U4JNXUNYpxael3UzMyo=
126-
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
125+
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad h1:a6HEuzUHeKH6hwfN/ZoQgRgVIWFJljSWa/zetS2WTvg=
126+
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
127127
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 h1:SJ+NtwL6QaZ21U+IrK7d0gGgpjGGvd2kz+FzTHVzdqI=
128128
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2/go.mod h1:Tv1PlzqC9t8wNnpPdctvtSUOPUUg4SHeE6vR1Ir2hmg=
129129
github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -198,10 +198,10 @@ github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
198198
github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
199199
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
200200
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
201-
github.com/onsi/ginkgo/v2 v2.22.0 h1:Yed107/8DjTr0lKCNt7Dn8yQ6ybuDRQoMGrNFKzMfHg=
202-
github.com/onsi/ginkgo/v2 v2.22.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
203-
github.com/onsi/gomega v1.36.0 h1:Pb12RlruUtj4XUuPUqeEWc6j5DkVVVA49Uf6YLfC95Y=
204-
github.com/onsi/gomega v1.36.0/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog=
201+
github.com/onsi/ginkgo/v2 v2.22.2 h1:/3X8Panh8/WwhU/3Ssa6rCKqPLuAkVY2I0RoyDLySlU=
202+
github.com/onsi/ginkgo/v2 v2.22.2/go.mod h1:oeMosUL+8LtarXBHu/c0bx2D/K9zyQ6uX3cTyztHwsk=
203+
github.com/onsi/gomega v1.36.2 h1:koNYke6TVk6ZmnyHrCXba/T/MoLBXFjeC1PtvYgw0A8=
204+
github.com/onsi/gomega v1.36.2/go.mod h1:DdwyADRjrc825LhMEkD76cHR5+pUnjhUN8GlHlRPHzY=
205205
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
206206
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
207207
github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrBg0D7ufOcFM=
@@ -382,8 +382,8 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn
382382
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
383383
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
384384
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
385-
golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ=
386-
golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0=
385+
golang.org/x/tools v0.28.0 h1:WuB6qZ4RPCQo5aP3WdKZS7i595EdWqWR8vqJTlwTVK8=
386+
golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw=
387387
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
388388
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
389389
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -398,8 +398,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240314234333-6e1732d8331c h1:
398398
google.golang.org/genproto/googleapis/rpc v0.0.0-20240314234333-6e1732d8331c/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY=
399399
google.golang.org/grpc v1.62.2 h1:iEIj1U5qjyBjzkM5nk3Fq+S1IbjbXSyqeULZ1Nfo4AA=
400400
google.golang.org/grpc v1.62.2/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE=
401-
google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
402-
google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
401+
google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk=
402+
google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
403403
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
404404
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
405405
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

‎internal/service/cloud/network_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ func (s *lanSuite) TestReconcileIPFailoverDeletionControlPlaneSwitchNIC() {
444444
newIonosMachine.SetName("test-machine-2")
445445
newIonosMachine.SetResourceVersion("")
446446
newIonosMachine.SetCreationTimestamp(metav1.NewTime(time.Now()))
447-
newIonosMachine.Spec.ProviderID = ptr.To("ionos://" + exampleSecondaryServerID) //nolint: goconst
447+
newIonosMachine.Spec.ProviderID = ptr.To("ionos://" + exampleSecondaryServerID)
448448
err = s.k8sClient.Create(s.ctx, newIonosMachine)
449449
s.NoError(err)
450450

‎internal/util/locker/locker_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ func TestLockerConcurrency(t *testing.T) {
118118
l := New()
119119

120120
var wg sync.WaitGroup
121-
for i := 0; i <= 10_000; i++ {
121+
for range 10_000 {
122122
wg.Add(1)
123123
go func(t *testing.T) {
124124
assert.NoError(t, l.Lock(context.Background(), "test"))

‎scope/cluster_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ func TestCurrentRequestByDatacenterAccessors(t *testing.T) {
364364

365365
// If there is a concurrency issue, it will very likely become visible here.
366366
var wg sync.WaitGroup
367-
for i := 0; i <= 10_000; i++ {
367+
for i := range 10_000 {
368368
wg.Add(1)
369369
go func(t *testing.T, id string) {
370370
defer wg.Done()

‎test/e2e/config/ionoscloud.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ providers:
6868
- sourcePath: "../data/infrastructure-ionoscloud/cluster-template-image-selector.yaml"
6969
variables:
7070
# Default variables for the e2e test; those values could be overridden via env variables, thus
71-
# allowing the same e2e config file to be re-used in different Prow jobs e.g. each one with a K8s version permutation.
71+
# allowing the same e2e config file to be reused in different Prow jobs e.g. each one with a K8s version permutation.
7272
# The following Kubernetes versions should be the latest versions with already published kindest/node images.
7373
# This avoids building node images in the default case which improves the test duration significantly.
7474
KUBERNETES_VERSION: "v1.30.6"

0 commit comments

Comments
 (0)