Skip to content

Commit f879852

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #2395 from shiftstack/bumps_main
🌱 Bump k8s, CR, CG and deps
2 parents 3ee4cf0 + 380d5c6 commit f879852

File tree

87 files changed

+1312
-2377
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+1312
-2377
lines changed

‎api_violations.report

+1
Original file line numberDiff line numberDiff line change
@@ -122,3 +122,4 @@ API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,MachineDeplo
122122
API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,MachineHealthCheckStatus,V1Beta2
123123
API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,MachineSetStatus,V1Beta2
124124
API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,MachineStatus,V1Beta2
125+
API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,MachineTemplateSpec,ObjectMeta

‎cmd/models-schema/zz_generated.openapi.go

+243-166
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/crd/bases/infrastructure.cluster.x-k8s.io_openstackclusters.yaml

+5-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/crd/bases/infrastructure.cluster.x-k8s.io_openstackclustertemplates.yaml

+9-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/crd/bases/infrastructure.cluster.x-k8s.io_openstackfloatingippools.yaml

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/crd/bases/infrastructure.cluster.x-k8s.io_openstackmachines.yaml

+7-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/crd/bases/infrastructure.cluster.x-k8s.io_openstackmachinetemplates.yaml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/crd/bases/infrastructure.cluster.x-k8s.io_openstackservers.yaml

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎go.mod

+30-31
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,24 @@ require (
2020
golang.org/x/crypto v0.32.0
2121
golang.org/x/text v0.21.0
2222
gopkg.in/ini.v1 v1.67.0
23-
k8s.io/api v0.31.5
24-
k8s.io/apiextensions-apiserver v0.31.5
25-
k8s.io/apimachinery v0.31.5
26-
k8s.io/client-go v0.31.5
27-
k8s.io/code-generator v0.31.5
28-
k8s.io/component-base v0.31.5
23+
k8s.io/api v0.32.1
24+
k8s.io/apiextensions-apiserver v0.32.1
25+
k8s.io/apimachinery v0.32.1
26+
k8s.io/client-go v0.32.1
27+
k8s.io/code-generator v0.32.1
28+
k8s.io/component-base v0.32.1
2929
k8s.io/klog/v2 v2.130.1
30-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340
31-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
32-
sigs.k8s.io/cluster-api v1.9.4
33-
sigs.k8s.io/cluster-api/test v1.9.4
34-
sigs.k8s.io/controller-runtime v0.19.4
35-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1
30+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f
31+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
32+
sigs.k8s.io/cluster-api v1.9.0-rc.0.0.20250128112323-b8d827c8751f
33+
sigs.k8s.io/cluster-api/test v1.9.0-rc.0.0.20250128112323-b8d827c8751f
34+
sigs.k8s.io/controller-runtime v0.20.1
35+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2
3636
sigs.k8s.io/yaml v1.4.0
3737
)
3838

3939
require (
40+
cel.dev/expr v0.18.0 // indirect
4041
dario.cat/mergo v1.0.1 // indirect
4142
github.com/BurntSushi/toml v1.4.0 // indirect
4243
github.com/MakeNowJust/heredoc v1.0.0 // indirect
@@ -56,27 +57,27 @@ require (
5657
github.com/cespare/xxhash/v2 v2.3.0 // indirect
5758
github.com/cloudflare/circl v1.3.7 // indirect
5859
github.com/distribution/reference v0.6.0 // indirect
59-
github.com/docker/docker v27.3.1+incompatible // indirect
60+
github.com/docker/docker v27.5.1+incompatible // indirect
6061
github.com/docker/go-connections v0.5.0 // indirect
6162
github.com/docker/go-units v0.4.0 // indirect
6263
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
6364
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
64-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
65+
github.com/evanphx/json-patch/v5 v5.9.10 // indirect
6566
github.com/felixge/httpsnoop v1.0.4 // indirect
6667
github.com/fsnotify/fsnotify v1.7.0 // indirect
6768
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
6869
github.com/go-logr/stdr v1.2.2 // indirect
6970
github.com/go-logr/zapr v1.3.0 // indirect
70-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
71+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
7172
github.com/go-openapi/jsonreference v0.20.2 // indirect
72-
github.com/go-openapi/swag v0.22.4 // indirect
73+
github.com/go-openapi/swag v0.23.0 // indirect
7374
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
7475
github.com/gobuffalo/flect v1.0.3 // indirect
7576
github.com/gofrs/uuid/v5 v5.3.0 // indirect
7677
github.com/gogo/protobuf v1.3.2 // indirect
77-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
7878
github.com/golang/protobuf v1.5.4 // indirect
79-
github.com/google/cel-go v0.20.1 // indirect
79+
github.com/google/btree v1.1.3 // indirect
80+
github.com/google/cel-go v0.22.0 // indirect
8081
github.com/google/gnostic-models v0.6.8 // indirect
8182
github.com/google/go-github/v53 v53.2.0 // indirect
8283
github.com/google/go-querystring v1.1.0 // indirect
@@ -85,7 +86,6 @@ require (
8586
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
8687
github.com/hashicorp/hcl v1.0.0 // indirect
8788
github.com/huandu/xstrings v1.5.0 // indirect
88-
github.com/imdario/mergo v0.3.15 // indirect
8989
github.com/inconshreveable/mousetrap v1.1.0 // indirect
9090
github.com/josharian/intern v1.0.0 // indirect
9191
github.com/json-iterator/go v1.1.12 // indirect
@@ -134,26 +134,25 @@ require (
134134
go.uber.org/zap v1.27.0 // indirect
135135
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
136136
golang.org/x/mod v0.22.0 // indirect
137-
golang.org/x/net v0.33.0 // indirect
138-
golang.org/x/oauth2 v0.24.0 // indirect
137+
golang.org/x/net v0.34.0 // indirect
138+
golang.org/x/oauth2 v0.25.0 // indirect
139139
golang.org/x/sync v0.10.0 // indirect
140140
golang.org/x/sys v0.29.0 // indirect
141141
golang.org/x/term v0.28.0 // indirect
142-
golang.org/x/time v0.5.0 // indirect
142+
golang.org/x/time v0.7.0 // indirect
143143
golang.org/x/tools v0.28.0 // indirect
144144
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
145-
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
146-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
145+
google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 // indirect
146+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
147147
google.golang.org/grpc v1.65.1 // indirect
148148
google.golang.org/protobuf v1.36.1 // indirect
149149
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
150150
gopkg.in/inf.v0 v0.9.1 // indirect
151-
gopkg.in/yaml.v2 v2.4.0 // indirect
152151
gopkg.in/yaml.v3 v3.0.1 // indirect
153-
k8s.io/apiserver v0.31.5 // indirect
154-
k8s.io/cluster-bootstrap v0.31.3 // indirect
155-
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
156-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
157-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
158-
sigs.k8s.io/kind v0.25.0 // indirect
152+
k8s.io/apiserver v0.32.1 // indirect
153+
k8s.io/cluster-bootstrap v0.32.1 // indirect
154+
k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect
155+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
156+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
157+
sigs.k8s.io/kind v0.26.0 // indirect
159158
)

0 commit comments

Comments
 (0)