Skip to content

Commit 4613c67

Browse files
EmilienMEmilienM
committed
Bump to CAPI 1.9
1 parent 11e371b commit 4613c67

13 files changed

+1239
-407
lines changed

‎Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -209,9 +209,9 @@ e2e-image: docker-build
209209

210210
# Pull all the images references in test/e2e/data/e2e_conf.yaml
211211
test-e2e-image-prerequisites:
212-
docker pull registry.k8s.io/cluster-api/cluster-api-controller:v1.8.5
213-
docker pull registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.8.5
214-
docker pull registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.8.5
212+
docker pull registry.k8s.io/cluster-api/cluster-api-controller:v1.9.0
213+
docker pull registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.9.0
214+
docker pull registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.9.0
215215

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

‎api_violations.report

+10
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,10 @@ API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,Cluste
6666
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,ClusterClassSpec,Variables
6767
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,ClusterClassStatus,Variables
6868
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,ClusterClassStatusVariable,Definitions
69+
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,JSONSchemaProps,AllOf
70+
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,JSONSchemaProps,AnyOf
6971
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,JSONSchemaProps,Enum
72+
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,JSONSchemaProps,OneOf
7073
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,JSONSchemaProps,Required
7174
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,MachineHealthCheckClass,UnhealthyConditions
7275
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/v1beta1,MachineHealthCheckSpec,UnhealthyConditions
@@ -148,6 +151,13 @@ API rule violation: names_match,sigs.k8s.io/cluster-api-provider-openstack/api/v
148151
API rule violation: names_match,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1,Router,IPs
149152
API rule violation: names_match,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1,SubnetFilter,IPv6AddressMode
150153
API rule violation: names_match,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1,SubnetFilter,IPv6RAMode
154+
API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,ClusterClassStatus,V1Beta2
155+
API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,ClusterStatus,V1Beta2
156+
API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,JSONSchemaProps,XIntOrString
151157
API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,JSONSchemaProps,XMetadata
152158
API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,JSONSchemaProps,XPreserveUnknownFields
153159
API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,JSONSchemaProps,XValidations
160+
API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,MachineDeploymentStatus,V1Beta2
161+
API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,MachineHealthCheckStatus,V1Beta2
162+
API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,MachineSetStatus,V1Beta2
163+
API rule violation: names_match,sigs.k8s.io/cluster-api/api/v1beta1,MachineStatus,V1Beta2

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

+1,089-252
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

+6-6
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

+12-12
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

+16-15
Original file line numberDiff line numberDiff line change
@@ -29,23 +29,24 @@ require (
2929
k8s.io/klog/v2 v2.130.1
3030
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340
3131
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
32-
sigs.k8s.io/cluster-api v1.8.5
33-
sigs.k8s.io/cluster-api/test v1.8.5
32+
sigs.k8s.io/cluster-api v1.9.0
33+
sigs.k8s.io/cluster-api/test v1.9.0
3434
sigs.k8s.io/controller-runtime v0.19.3
3535
sigs.k8s.io/structured-merge-diff/v4 v4.4.1
3636
sigs.k8s.io/yaml v1.4.0
3737
)
3838

3939
require (
40+
dario.cat/mergo v1.0.1 // indirect
4041
github.com/BurntSushi/toml v1.4.0 // indirect
4142
github.com/MakeNowJust/heredoc v1.0.0 // indirect
4243
github.com/Masterminds/goutils v1.1.1 // indirect
43-
github.com/Masterminds/semver/v3 v3.2.0 // indirect
44-
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
44+
github.com/Masterminds/semver/v3 v3.3.0 // indirect
45+
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
4546
github.com/Microsoft/go-winio v0.5.0 // indirect
4647
github.com/NYTimes/gziphandler v1.1.1 // indirect
4748
github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect
48-
github.com/adrg/xdg v0.5.0 // indirect
49+
github.com/adrg/xdg v0.5.3 // indirect
4950
github.com/alessio/shellescape v1.4.2 // indirect
5051
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
5152
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
@@ -55,7 +56,7 @@ require (
5556
github.com/cespare/xxhash/v2 v2.3.0 // indirect
5657
github.com/cloudflare/circl v1.3.7 // indirect
5758
github.com/distribution/reference v0.6.0 // indirect
58-
github.com/docker/docker v27.1.1+incompatible // indirect
59+
github.com/docker/docker v27.3.1+incompatible // indirect
5960
github.com/docker/go-connections v0.5.0 // indirect
6061
github.com/docker/go-units v0.4.0 // indirect
6162
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
@@ -70,7 +71,7 @@ require (
7071
github.com/go-openapi/jsonreference v0.20.2 // indirect
7172
github.com/go-openapi/swag v0.22.4 // indirect
7273
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
73-
github.com/gobuffalo/flect v1.0.2 // indirect
74+
github.com/gobuffalo/flect v1.0.3 // indirect
7475
github.com/gofrs/uuid/v5 v5.3.0 // indirect
7576
github.com/gogo/protobuf v1.3.2 // indirect
7677
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
@@ -83,7 +84,7 @@ require (
8384
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
8485
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
8586
github.com/hashicorp/hcl v1.0.0 // indirect
86-
github.com/huandu/xstrings v1.3.3 // indirect
87+
github.com/huandu/xstrings v1.5.0 // indirect
8788
github.com/imdario/mergo v0.3.15 // indirect
8889
github.com/inconshreveable/mousetrap v1.1.0 // indirect
8990
github.com/josharian/intern v1.0.0 // indirect
@@ -111,10 +112,10 @@ require (
111112
github.com/prometheus/procfs v0.15.1 // indirect
112113
github.com/sagikazarmark/locafero v0.4.0 // indirect
113114
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
114-
github.com/shopspring/decimal v1.3.1 // indirect
115+
github.com/shopspring/decimal v1.4.0 // indirect
115116
github.com/sourcegraph/conc v0.3.0 // indirect
116117
github.com/spf13/afero v1.11.0 // indirect
117-
github.com/spf13/cast v1.6.0 // indirect
118+
github.com/spf13/cast v1.7.0 // indirect
118119
github.com/spf13/cobra v1.8.1 // indirect
119120
github.com/spf13/viper v1.19.0 // indirect
120121
github.com/stoewer/go-strcase v1.3.0 // indirect
@@ -134,8 +135,8 @@ require (
134135
go.uber.org/zap v1.27.0 // indirect
135136
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
136137
golang.org/x/mod v0.21.0 // indirect
137-
golang.org/x/net v0.30.0 // indirect
138-
golang.org/x/oauth2 v0.21.0 // indirect
138+
golang.org/x/net v0.31.0 // indirect
139+
golang.org/x/oauth2 v0.24.0 // indirect
139140
golang.org/x/sync v0.10.0 // indirect
140141
golang.org/x/sys v0.28.0 // indirect
141142
golang.org/x/term v0.27.0 // indirect
@@ -144,18 +145,18 @@ require (
144145
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
145146
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
146147
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
147-
google.golang.org/grpc v1.65.0 // indirect
148+
google.golang.org/grpc v1.65.1 // indirect
148149
google.golang.org/protobuf v1.35.1 // indirect
149150
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
150151
gopkg.in/inf.v0 v0.9.1 // indirect
151152
gopkg.in/yaml.v2 v2.4.0 // indirect
152153
gopkg.in/yaml.v3 v3.0.1 // indirect
153154
k8s.io/apiserver v0.31.3 // indirect
154-
k8s.io/cluster-bootstrap v0.30.3 // indirect
155+
k8s.io/cluster-bootstrap v0.31.3 // indirect
155156
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
156157
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
157158
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
158-
sigs.k8s.io/kind v0.24.0 // indirect
159+
sigs.k8s.io/kind v0.25.0 // indirect
159160
)
160161

161162
replace github.com/k-orc/openstack-resource-controller => ./orc

0 commit comments

Comments
 (0)