Skip to content

Commit ecd2404

Browse files
committed
Update cluster-api to v1.8.0-beta.0
1 parent b817136 commit ecd2404

File tree

11 files changed

+277
-284
lines changed

11 files changed

+277
-284
lines changed

.golangci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,9 @@ linters-settings:
101101
allow-leading-space: false
102102
require-specific: true
103103
staticcheck:
104-
go: "1.21"
104+
go: "1.22"
105105
stylecheck:
106-
go: "1.21"
106+
go: "1.22"
107107
gosec:
108108
excludes:
109109
- G307 # Deferring unsafe method "Close" on type "\*os.File"
@@ -126,7 +126,7 @@ linters-settings:
126126
- whyNoLint
127127
- wrapperFunc
128128
unused:
129-
go: "1.21"
129+
go: "1.22"
130130
issues:
131131
max-same-issues: 0
132132
max-issues-per-linter: 0

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ RELEASE_DIR := out
6363
OUTPUT_TYPE ?= type=registry
6464

6565
# Go
66-
GO_VERSION ?=1.21.12
66+
GO_VERSION ?=1.22.5
6767
GO_CONTAINER_IMAGE ?= golang:$(GO_VERSION)
6868

6969
# kind

go.mod

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

3-
go 1.21
3+
go 1.22.0
44

55
// Keep these modules sync with sigs.k8s.io/cluster-api repository
66
replace (
7-
github.com/onsi/ginkgo/v2 => github.com/onsi/ginkgo/v2 v2.17.1
8-
github.com/onsi/gomega => github.com/onsi/gomega v1.32.0
9-
sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.7.4
7+
github.com/onsi/ginkgo/v2 => github.com/onsi/ginkgo/v2 v2.19.0
8+
github.com/onsi/gomega => github.com/onsi/gomega v1.33.1
9+
sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.8.0-beta.0
1010
)
1111

1212
require (
@@ -18,11 +18,11 @@ require (
1818
github.com/IBM/vpc-go-sdk v0.55.0
1919
github.com/blang/semver/v4 v4.0.0
2020
github.com/coreos/ignition/v2 v2.19.0
21-
github.com/go-logr/logr v1.4.1
21+
github.com/go-logr/logr v1.4.2
2222
github.com/go-openapi/strfmt v0.23.0
2323
github.com/golang-jwt/jwt v3.2.2+incompatible
24-
github.com/onsi/ginkgo/v2 v2.17.1
25-
github.com/onsi/gomega v1.32.0
24+
github.com/onsi/ginkgo/v2 v2.19.0
25+
github.com/onsi/gomega v1.33.1
2626
github.com/pkg/errors v0.9.1
2727
github.com/ppc64le-cloud/powervs-utils v0.0.0-20240610070307-1c0d75a5c247
2828
github.com/spf13/cobra v1.8.1
@@ -32,16 +32,16 @@ require (
3232
golang.org/x/crypto v0.25.0
3333
golang.org/x/net v0.27.0
3434
golang.org/x/text v0.16.0
35-
k8s.io/api v0.29.3
36-
k8s.io/apiextensions-apiserver v0.29.3
37-
k8s.io/apimachinery v0.29.3
38-
k8s.io/cli-runtime v0.29.3
39-
k8s.io/client-go v0.29.3
40-
k8s.io/klog/v2 v2.110.1
35+
k8s.io/api v0.30.2
36+
k8s.io/apiextensions-apiserver v0.30.2
37+
k8s.io/apimachinery v0.30.2
38+
k8s.io/cli-runtime v0.30.2
39+
k8s.io/client-go v0.30.2
40+
k8s.io/klog/v2 v2.120.1
4141
k8s.io/utils v0.0.0-20231127182322-b307cd553661
42-
sigs.k8s.io/cluster-api v1.7.4
43-
sigs.k8s.io/cluster-api/test v1.7.4
44-
sigs.k8s.io/controller-runtime v0.17.3
42+
sigs.k8s.io/cluster-api v1.8.0-beta.0
43+
sigs.k8s.io/cluster-api/test v1.8.0-beta.0
44+
sigs.k8s.io/controller-runtime v0.18.4
4545
sigs.k8s.io/yaml v1.4.0
4646
)
4747

@@ -55,7 +55,7 @@ require (
5555
github.com/Microsoft/go-winio v0.5.0 // indirect
5656
github.com/NYTimes/gziphandler v1.1.1 // indirect
5757
github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect
58-
github.com/adrg/xdg v0.4.0 // indirect
58+
github.com/adrg/xdg v0.5.0 // indirect
5959
github.com/alessio/shellescape v1.4.1 // indirect
6060
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
6161
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
@@ -68,12 +68,12 @@ require (
6868
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
6969
github.com/coreos/vcontext v0.0.0-20230201181013-d72178a18687 // indirect
7070
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
71-
github.com/distribution/reference v0.5.0 // indirect
72-
github.com/docker/docker v25.0.5+incompatible // indirect
71+
github.com/distribution/reference v0.6.0 // indirect
72+
github.com/docker/docker v27.0.3+incompatible // indirect
7373
github.com/docker/go-connections v0.5.0 // indirect
7474
github.com/docker/go-units v0.5.0 // indirect
7575
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
76-
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
76+
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
7777
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
7878
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
7979
github.com/felixge/httpsnoop v1.0.4 // indirect
@@ -92,18 +92,18 @@ require (
9292
github.com/go-playground/locales v0.14.1 // indirect
9393
github.com/go-playground/universal-translator v0.18.1 // indirect
9494
github.com/go-playground/validator/v10 v10.19.0 // indirect
95-
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
95+
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
9696
github.com/gobuffalo/flect v1.0.2 // indirect
9797
github.com/gogo/protobuf v1.3.2 // indirect
9898
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
9999
github.com/golang/protobuf v1.5.4 // indirect
100-
github.com/google/cel-go v0.17.7 // indirect
100+
github.com/google/cel-go v0.17.8 // indirect
101101
github.com/google/gnostic-models v0.6.8 // indirect
102102
github.com/google/go-cmp v0.6.0 // indirect
103103
github.com/google/go-github/v53 v53.2.0 // indirect
104104
github.com/google/go-querystring v1.1.0 // indirect
105105
github.com/google/gofuzz v1.2.0 // indirect
106-
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
106+
github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
107107
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
108108
github.com/google/uuid v1.6.0 // indirect
109109
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
@@ -125,6 +125,7 @@ require (
125125
github.com/mitchellh/copystructure v1.2.0 // indirect
126126
github.com/mitchellh/mapstructure v1.5.0 // indirect
127127
github.com/mitchellh/reflectwalk v1.0.2 // indirect
128+
github.com/moby/docker-image-spec v1.3.1 // indirect
128129
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
129130
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
130131
github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -134,10 +135,10 @@ require (
134135
github.com/opencontainers/image-spec v1.0.2 // indirect
135136
github.com/opentracing/opentracing-go v1.2.0 // indirect
136137
github.com/pelletier/go-toml v1.9.5 // indirect
137-
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
138+
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
138139
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
139140
github.com/prometheus/client_golang v1.18.0 // indirect
140-
github.com/prometheus/client_model v0.5.0 // indirect
141+
github.com/prometheus/client_model v0.6.0 // indirect
141142
github.com/prometheus/common v0.45.0 // indirect
142143
github.com/prometheus/procfs v0.12.0 // indirect
143144
github.com/sagikazarmark/locafero v0.4.0 // indirect
@@ -146,7 +147,7 @@ require (
146147
github.com/sourcegraph/conc v0.3.0 // indirect
147148
github.com/spf13/afero v1.11.0 // indirect
148149
github.com/spf13/cast v1.6.0 // indirect
149-
github.com/spf13/viper v1.18.2 // indirect
150+
github.com/spf13/viper v1.19.0 // indirect
150151
github.com/stoewer/go-strcase v1.2.0 // indirect
151152
github.com/subosito/gotenv v1.6.0 // indirect
152153
github.com/valyala/fastjson v1.6.4 // indirect
@@ -162,7 +163,7 @@ require (
162163
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
163164
go.uber.org/multierr v1.11.0 // indirect
164165
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
165-
golang.org/x/oauth2 v0.20.0 // indirect
166+
golang.org/x/oauth2 v0.21.0 // indirect
166167
golang.org/x/sync v0.7.0 // indirect
167168
golang.org/x/sys v0.22.0 // indirect
168169
golang.org/x/term v0.22.0 // indirect
@@ -177,11 +178,11 @@ require (
177178
gopkg.in/ini.v1 v1.67.0 // indirect
178179
gopkg.in/yaml.v2 v2.4.0 // indirect
179180
gopkg.in/yaml.v3 v3.0.1 // indirect
180-
k8s.io/apiserver v0.29.3 // indirect
181-
k8s.io/cluster-bootstrap v0.29.3 // indirect
182-
k8s.io/component-base v0.29.3 // indirect
183-
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
184-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect
181+
k8s.io/apiserver v0.30.2 // indirect
182+
k8s.io/cluster-bootstrap v0.30.2 // indirect
183+
k8s.io/component-base v0.30.2 // indirect
184+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
185+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.0 // indirect
185186
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
186187
sigs.k8s.io/kind v0.23.0 // indirect
187188
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect

0 commit comments

Comments
 (0)