Skip to content

Commit 3834e1b

Browse files
lentzi90lentzi90
committed
Update Cluster API to v1.12.0-beta.0
This commit updates the Cluster API dependency from v1.11.3 to v1.12.0-beta.0 for testing purposes as requested in issue #2822. Changes include: - Update sigs.k8s.io/cluster-api to v1.12.0-beta.0 - Update sigs.k8s.io/cluster-api/test to v1.12.0-beta.0 - Update sigs.k8s.io/cluster-api/hack/tools to corresponding commit - Update Kubernetes dependencies to v0.34.1 (required by CAPI v1.12) - Update sigs.k8s.io/controller-runtime to v0.22.4 - Update sigs.k8s.io/controller-tools to v0.19.0 - Regenerate code to match new code-generator output Signed-off-by: Lennart Jern <[email protected]>
1 parent 452372b commit 3834e1b

21 files changed

+1011
-338
lines changed

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

Lines changed: 586 additions & 39 deletions
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_openstackclusteridentities.yaml‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 4 deletions
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‎

Lines changed: 1 addition & 4 deletions
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎go.mod‎

Lines changed: 60 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -20,28 +20,31 @@ require (
2020
golang.org/x/crypto v0.45.0
2121
golang.org/x/text v0.31.0
2222
gopkg.in/ini.v1 v1.67.0
23-
k8s.io/api v0.33.6
24-
k8s.io/apiextensions-apiserver v0.33.6
25-
k8s.io/apimachinery v0.33.6
26-
k8s.io/client-go v0.33.6
27-
k8s.io/code-generator v0.33.6
28-
k8s.io/component-base v0.33.6
23+
k8s.io/api v0.34.1
24+
k8s.io/apiextensions-apiserver v0.34.1
25+
k8s.io/apimachinery v0.34.1
26+
k8s.io/client-go v0.34.1
27+
k8s.io/code-generator v0.34.1
28+
k8s.io/component-base v0.34.1
2929
k8s.io/klog/v2 v2.130.1
30-
k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a
30+
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b
3131
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
32-
sigs.k8s.io/cluster-api v1.11.3
33-
sigs.k8s.io/cluster-api/test v1.11.0
34-
sigs.k8s.io/controller-runtime v0.21.0
35-
sigs.k8s.io/structured-merge-diff/v4 v4.7.0
32+
sigs.k8s.io/cluster-api v1.12.0-beta.0
33+
sigs.k8s.io/cluster-api/test v1.12.0-beta.0
34+
sigs.k8s.io/controller-runtime v0.22.4
35+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0
3636
sigs.k8s.io/yaml v1.6.0
3737
)
3838

3939
require (
4040
al.essio.dev/pkg/shellescape v1.5.1 // indirect
41-
cel.dev/expr v0.19.1 // indirect
41+
cel.dev/expr v0.24.0 // indirect
42+
dario.cat/mergo v1.0.1 // indirect
4243
github.com/BurntSushi/toml v1.4.0 // indirect
4344
github.com/MakeNowJust/heredoc v1.0.0 // indirect
45+
github.com/Masterminds/goutils v1.1.1 // indirect
4446
github.com/Masterminds/semver/v3 v3.4.0 // indirect
47+
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
4548
github.com/Microsoft/go-winio v0.5.0 // indirect
4649
github.com/NYTimes/gziphandler v1.1.1 // indirect
4750
github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect
@@ -55,16 +58,16 @@ require (
5558
github.com/containerd/errdefs v1.0.0 // indirect
5659
github.com/containerd/errdefs/pkg v0.3.0 // indirect
5760
github.com/distribution/reference v0.6.0 // indirect
58-
github.com/docker/docker v28.3.3+incompatible // indirect
59-
github.com/docker/go-connections v0.5.0 // indirect
61+
github.com/docker/docker v28.5.1+incompatible // indirect
62+
github.com/docker/go-connections v0.6.0 // indirect
6063
github.com/docker/go-units v0.4.0 // indirect
6164
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
62-
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
65+
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
6366
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
6467
github.com/fatih/color v1.18.0 // indirect
6568
github.com/felixge/httpsnoop v1.0.4 // indirect
66-
github.com/fsnotify/fsnotify v1.8.0 // indirect
67-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
69+
github.com/fsnotify/fsnotify v1.9.0 // indirect
70+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
6871
github.com/go-logr/stdr v1.2.2 // indirect
6972
github.com/go-logr/zapr v1.3.0 // indirect
7073
github.com/go-openapi/jsonpointer v0.21.0 // indirect
@@ -76,80 +79,89 @@ require (
7679
github.com/gofrs/uuid/v5 v5.3.0 // indirect
7780
github.com/gogo/protobuf v1.3.2 // indirect
7881
github.com/google/btree v1.1.3 // indirect
79-
github.com/google/cel-go v0.23.2 // indirect
80-
github.com/google/gnostic-models v0.6.9 // indirect
82+
github.com/google/cel-go v0.26.0 // indirect
83+
github.com/google/gnostic-models v0.7.0 // indirect
8184
github.com/google/go-github/v53 v53.2.0 // indirect
8285
github.com/google/go-querystring v1.1.0 // indirect
83-
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
84-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect
86+
github.com/google/pprof v0.0.0-20250820193118-f64d9cf942d6 // indirect
87+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
88+
github.com/huandu/xstrings v1.5.0 // indirect
8589
github.com/inconshreveable/mousetrap v1.1.0 // indirect
8690
github.com/josharian/intern v1.0.0 // indirect
8791
github.com/json-iterator/go v1.1.12 // indirect
8892
github.com/kylelemons/godebug v1.1.0 // indirect
8993
github.com/mailru/easyjson v0.7.7 // indirect
90-
github.com/mattn/go-colorable v0.1.13 // indirect
94+
github.com/mattn/go-colorable v0.1.14 // indirect
9195
github.com/mattn/go-isatty v0.0.20 // indirect
92-
github.com/mattn/go-runewidth v0.0.14 // indirect
96+
github.com/mattn/go-runewidth v0.0.16 // indirect
97+
github.com/mitchellh/copystructure v1.2.0 // indirect
98+
github.com/mitchellh/reflectwalk v1.0.2 // indirect
9399
github.com/moby/docker-image-spec v1.3.1 // indirect
94100
github.com/moby/sys/sequential v0.6.0 // indirect
95101
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
96-
github.com/modern-go/reflect2 v1.0.2 // indirect
102+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
97103
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
98-
github.com/olekukonko/tablewriter v0.0.5 // indirect
104+
github.com/olekukonko/cat v0.0.0-20250911104152-50322a0618f6 // indirect
105+
github.com/olekukonko/errors v1.1.0 // indirect
106+
github.com/olekukonko/ll v0.1.1 // indirect
107+
github.com/olekukonko/tablewriter v1.0.9 // indirect
99108
github.com/opencontainers/go-digest v1.0.0 // indirect
100109
github.com/opencontainers/image-spec v1.0.2 // indirect
101110
github.com/pelletier/go-toml v1.9.5 // indirect
102-
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
111+
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
103112
github.com/pkg/errors v0.9.1 // indirect
113+
github.com/pmezard/go-difflib v1.0.0 // indirect
104114
github.com/prometheus/client_model v0.6.2 // indirect
105115
github.com/prometheus/common v0.66.1 // indirect
106116
github.com/prometheus/procfs v0.16.1 // indirect
107-
github.com/rivo/uniseg v0.4.2 // indirect
108-
github.com/sagikazarmark/locafero v0.7.0 // indirect
109-
github.com/sourcegraph/conc v0.3.0 // indirect
110-
github.com/spf13/afero v1.12.0 // indirect
111-
github.com/spf13/cast v1.7.1 // indirect
112-
github.com/spf13/cobra v1.9.1 // indirect
113-
github.com/spf13/viper v1.20.1 // indirect
117+
github.com/rivo/uniseg v0.4.7 // indirect
118+
github.com/sagikazarmark/locafero v0.11.0 // indirect
119+
github.com/shopspring/decimal v1.4.0 // indirect
120+
github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 // indirect
121+
github.com/spf13/afero v1.15.0 // indirect
122+
github.com/spf13/cast v1.10.0 // indirect
123+
github.com/spf13/cobra v1.10.1 // indirect
124+
github.com/spf13/viper v1.21.0 // indirect
114125
github.com/stoewer/go-strcase v1.3.0 // indirect
115126
github.com/subosito/gotenv v1.6.0 // indirect
127+
github.com/valyala/fastjson v1.6.4 // indirect
116128
github.com/x448/float16 v0.8.4 // indirect
117129
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
118130
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
119-
go.opentelemetry.io/otel v1.34.0 // indirect
120-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
121-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 // indirect
122-
go.opentelemetry.io/otel/metric v1.34.0 // indirect
131+
go.opentelemetry.io/otel v1.35.0 // indirect
132+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
133+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect
134+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
123135
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
124-
go.opentelemetry.io/otel/trace v1.34.0 // indirect
125-
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
136+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
137+
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
126138
go.uber.org/multierr v1.11.0 // indirect
127139
go.uber.org/zap v1.27.0 // indirect
128140
go.yaml.in/yaml/v2 v2.4.2 // indirect
129141
go.yaml.in/yaml/v3 v3.0.4 // indirect
130142
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect
131143
golang.org/x/mod v0.29.0 // indirect
132144
golang.org/x/net v0.47.0 // indirect
133-
golang.org/x/oauth2 v0.30.0 // indirect
145+
golang.org/x/oauth2 v0.32.0 // indirect
134146
golang.org/x/sync v0.18.0 // indirect
135147
golang.org/x/sys v0.38.0 // indirect
136148
golang.org/x/term v0.37.0 // indirect
137149
golang.org/x/time v0.9.0 // indirect
138150
golang.org/x/tools v0.38.0 // indirect
139151
golang.org/x/tools/go/expect v0.1.0-deprecated // indirect
140152
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
141-
google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 // indirect
142-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
143-
google.golang.org/grpc v1.71.3 // indirect
153+
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
154+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect
155+
google.golang.org/grpc v1.72.3 // indirect
144156
google.golang.org/protobuf v1.36.8 // indirect
145157
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
146158
gopkg.in/inf.v0 v0.9.1 // indirect
147159
gopkg.in/yaml.v3 v3.0.1 // indirect
148-
k8s.io/apiserver v0.33.6 // indirect
149-
k8s.io/cluster-bootstrap v0.33.3 // indirect
150-
k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7 // indirect
160+
k8s.io/apiserver v0.34.1 // indirect
161+
k8s.io/cluster-bootstrap v0.34.1 // indirect
162+
k8s.io/gengo/v2 v2.0.0-20250604051438-85fd79dbfd9f // indirect
151163
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
152-
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
153-
sigs.k8s.io/kind v0.29.0 // indirect
164+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
165+
sigs.k8s.io/kind v0.30.0 // indirect
154166
sigs.k8s.io/randfill v1.0.0 // indirect
155167
)

0 commit comments

Comments
 (0)