Skip to content

Commit 43c7b9c

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #2490 from kubernetes-sigs/capi-v1.10
🌱 Bump CAPI to v1.10.0-beta.0
2 parents cb7f905 + 7ac7db0 commit 43c7b9c

21 files changed

+546
-332
lines changed

‎Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -210,9 +210,9 @@ e2e-image: docker-build
210210

211211
# Pull all the images references in test/e2e/data/e2e_conf.yaml
212212
test-e2e-image-prerequisites:
213-
docker pull registry.k8s.io/cluster-api/cluster-api-controller:v1.9.3
214-
docker pull registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.9.3
215-
docker pull registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.9.3
213+
docker pull registry.k8s.io/cluster-api/cluster-api-controller:v1.10.0-beta.0
214+
docker pull registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.10.0-beta.0
215+
docker pull registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.10.0-beta.0
216216

217217
CONFORMANCE_E2E_ARGS ?= -kubetest.config-file=$(KUBETEST_CONF_PATH)
218218
CONFORMANCE_E2E_ARGS += $(E2E_ARGS)

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

Lines changed: 267 additions & 82 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_openstackclusters.yaml

Lines changed: 1 addition & 0 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 & 0 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: 7 additions & 0 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_openstackmachines.yaml

Lines changed: 7 additions & 0 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_openstackservers.yaml

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎go.mod

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,15 @@ require (
2929
k8s.io/klog/v2 v2.130.1
3030
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f
3131
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
32+
sigs.k8s.io/cluster-api v1.10.0-beta.0
33+
sigs.k8s.io/cluster-api/test v1.10.0-beta.0
3434
sigs.k8s.io/controller-runtime v0.20.3
3535
sigs.k8s.io/structured-merge-diff/v4 v4.5.0
3636
sigs.k8s.io/yaml v1.4.0
3737
)
3838

3939
require (
40+
al.essio.dev/pkg/shellescape v1.5.1 // indirect
4041
cel.dev/expr v0.18.0 // indirect
4142
dario.cat/mergo v1.0.1 // indirect
4243
github.com/BurntSushi/toml v1.4.0 // indirect
@@ -48,7 +49,6 @@ require (
4849
github.com/NYTimes/gziphandler v1.1.1 // indirect
4950
github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect
5051
github.com/adrg/xdg v0.5.3 // indirect
51-
github.com/alessio/shellescape v1.4.2 // indirect
5252
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
5353
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
5454
github.com/beorn7/perks v1.0.1 // indirect
@@ -57,21 +57,23 @@ require (
5757
github.com/cespare/xxhash/v2 v2.3.0 // indirect
5858
github.com/cloudflare/circl v1.3.7 // indirect
5959
github.com/distribution/reference v0.6.0 // indirect
60-
github.com/docker/docker v27.5.1+incompatible // indirect
60+
github.com/docker/docker v28.0.1+incompatible // indirect
6161
github.com/docker/go-connections v0.5.0 // indirect
6262
github.com/docker/go-units v0.4.0 // indirect
6363
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
64-
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
64+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
6565
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
66+
github.com/fatih/color v1.18.0 // indirect
6667
github.com/felixge/httpsnoop v1.0.4 // indirect
67-
github.com/fsnotify/fsnotify v1.7.0 // indirect
68+
github.com/fsnotify/fsnotify v1.8.0 // indirect
6869
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
6970
github.com/go-logr/stdr v1.2.2 // indirect
7071
github.com/go-logr/zapr v1.3.0 // indirect
7172
github.com/go-openapi/jsonpointer v0.21.0 // indirect
7273
github.com/go-openapi/jsonreference v0.20.2 // indirect
7374
github.com/go-openapi/swag v0.23.0 // indirect
7475
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
76+
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
7577
github.com/gobuffalo/flect v1.0.3 // indirect
7678
github.com/gofrs/uuid/v5 v5.3.0 // indirect
7779
github.com/gogo/protobuf v1.3.2 // indirect
@@ -84,75 +86,75 @@ require (
8486
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
8587
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
8688
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
87-
github.com/hashicorp/hcl v1.0.0 // indirect
8889
github.com/huandu/xstrings v1.5.0 // indirect
8990
github.com/inconshreveable/mousetrap v1.1.0 // indirect
9091
github.com/josharian/intern v1.0.0 // indirect
9192
github.com/json-iterator/go v1.1.12 // indirect
9293
github.com/klauspost/compress v1.17.11 // indirect
9394
github.com/kylelemons/godebug v1.1.0 // indirect
94-
github.com/magiconair/properties v1.8.7 // indirect
9595
github.com/mailru/easyjson v0.7.7 // indirect
96+
github.com/mattn/go-colorable v0.1.13 // indirect
9697
github.com/mattn/go-isatty v0.0.20 // indirect
98+
github.com/mattn/go-runewidth v0.0.14 // indirect
9799
github.com/mitchellh/copystructure v1.2.0 // indirect
98100
github.com/mitchellh/go-homedir v1.1.0 // indirect
99-
github.com/mitchellh/mapstructure v1.5.0 // indirect
100101
github.com/mitchellh/reflectwalk v1.0.2 // indirect
101102
github.com/moby/docker-image-spec v1.3.1 // indirect
102103
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
103104
github.com/modern-go/reflect2 v1.0.2 // indirect
104105
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
106+
github.com/olekukonko/tablewriter v0.0.5 // indirect
105107
github.com/opencontainers/go-digest v1.0.0 // indirect
106108
github.com/opencontainers/image-spec v1.0.2 // indirect
107109
github.com/pelletier/go-toml v1.9.5 // indirect
108-
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
110+
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
109111
github.com/pkg/errors v0.9.1 // indirect
110112
github.com/prometheus/client_model v0.6.1 // indirect
111113
github.com/prometheus/common v0.62.0 // indirect
112114
github.com/prometheus/procfs v0.15.1 // indirect
113-
github.com/sagikazarmark/locafero v0.4.0 // indirect
114-
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
115+
github.com/rivo/uniseg v0.4.2 // indirect
116+
github.com/sagikazarmark/locafero v0.7.0 // indirect
115117
github.com/shopspring/decimal v1.4.0 // indirect
116118
github.com/sourcegraph/conc v0.3.0 // indirect
117-
github.com/spf13/afero v1.11.0 // indirect
118-
github.com/spf13/cast v1.7.0 // indirect
119-
github.com/spf13/cobra v1.8.1 // indirect
120-
github.com/spf13/viper v1.19.0 // indirect
119+
github.com/spf13/afero v1.12.0 // indirect
120+
github.com/spf13/cast v1.7.1 // indirect
121+
github.com/spf13/cobra v1.9.1 // indirect
122+
github.com/spf13/viper v1.20.0 // indirect
121123
github.com/stoewer/go-strcase v1.3.0 // indirect
122124
github.com/subosito/gotenv v1.6.0 // indirect
123125
github.com/valyala/fastjson v1.6.4 // indirect
124126
github.com/x448/float16 v0.8.4 // indirect
125-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
126-
go.opentelemetry.io/otel v1.28.0 // indirect
127+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
128+
go.opentelemetry.io/otel v1.29.0 // indirect
127129
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
128130
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
129-
go.opentelemetry.io/otel/metric v1.28.0 // indirect
130-
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
131-
go.opentelemetry.io/otel/trace v1.28.0 // indirect
131+
go.opentelemetry.io/otel/metric v1.29.0 // indirect
132+
go.opentelemetry.io/otel/sdk v1.29.0 // indirect
133+
go.opentelemetry.io/otel/trace v1.29.0 // indirect
132134
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
133135
go.uber.org/multierr v1.11.0 // indirect
134136
go.uber.org/zap v1.27.0 // indirect
135137
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
136138
golang.org/x/mod v0.23.0 // indirect
137-
golang.org/x/net v0.36.0 // indirect
138-
golang.org/x/oauth2 v0.25.0 // indirect
139+
golang.org/x/net v0.37.0 // indirect
140+
golang.org/x/oauth2 v0.28.0 // indirect
139141
golang.org/x/sync v0.12.0 // indirect
140142
golang.org/x/sys v0.31.0 // indirect
141143
golang.org/x/term v0.30.0 // indirect
142-
golang.org/x/time v0.7.0 // indirect
144+
golang.org/x/time v0.8.0 // indirect
143145
golang.org/x/tools v0.30.0 // indirect
144-
gomodules.xyz/jsonpatch/v2 v2.4.0 // 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
147-
google.golang.org/grpc v1.65.1 // indirect
146+
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
147+
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
148+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8 // indirect
149+
google.golang.org/grpc v1.67.3 // indirect
148150
google.golang.org/protobuf v1.36.1 // indirect
149151
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
150152
gopkg.in/inf.v0 v0.9.1 // indirect
151153
gopkg.in/yaml.v3 v3.0.1 // indirect
152154
k8s.io/apiserver v0.32.3 // indirect
153-
k8s.io/cluster-bootstrap v0.32.1 // indirect
155+
k8s.io/cluster-bootstrap v0.32.3 // indirect
154156
k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect
155157
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
156158
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
157-
sigs.k8s.io/kind v0.26.0 // indirect
159+
sigs.k8s.io/kind v0.27.0 // indirect
158160
)

0 commit comments

Comments
 (0)