Skip to content

Commit 2d703d5

Browse files
committed
upgrade to capi 1.11.0 and its v1beta2
1 parent e86cc82 commit 2d703d5

19 files changed

+4461
-1729
lines changed

config/crd/test/cluster.x-k8s.io_clusters.yaml

Lines changed: 3652 additions & 1380 deletions
Large diffs are not rendered by default.

config/crd/test/ipam.cluster.x-k8s.io_ipaddressclaims.yaml

Lines changed: 347 additions & 26 deletions
Large diffs are not rendered by default.

config/crd/test/ipam.cluster.x-k8s.io_ipaddresses.yaml

Lines changed: 141 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.16.1
6+
controller-gen.kubebuilder.io/version: v0.18.0
77
name: ipaddresses.ipam.cluster.x-k8s.io
88
spec:
99
group: ipam.cluster.x-k8s.io
@@ -56,13 +56,15 @@ spec:
5656
metadata:
5757
type: object
5858
spec:
59-
description: IPAddressSpec is the desired state of an IPAddress.
59+
description: spec is the desired state of IPAddress.
6060
properties:
6161
address:
62-
description: Address is the IP address.
62+
description: address is the IP address.
63+
maxLength: 39
64+
minLength: 1
6365
type: string
6466
claimRef:
65-
description: ClaimRef is a reference to the claim this IPAddress was
67+
description: claimRef is a reference to the claim this IPAddress was
6668
created for.
6769
properties:
6870
name:
@@ -77,11 +79,13 @@ spec:
7779
type: object
7880
x-kubernetes-map-type: atomic
7981
gateway:
80-
description: Gateway is the network gateway of the network the address
82+
description: gateway is the network gateway of the network the address
8183
is from.
84+
maxLength: 39
85+
minLength: 1
8286
type: string
8387
poolRef:
84-
description: PoolRef is a reference to the pool that this IPAddress
88+
description: poolRef is a reference to the pool that this IPAddress
8589
was created from.
8690
properties:
8791
apiGroup:
@@ -102,7 +106,7 @@ spec:
102106
type: object
103107
x-kubernetes-map-type: atomic
104108
prefix:
105-
description: Prefix is the prefix of the address.
109+
description: prefix is the prefix of the address.
106110
type: integer
107111
required:
108112
- address
@@ -131,6 +135,7 @@ spec:
131135
jsonPath: .metadata.creationTimestamp
132136
name: Age
133137
type: date
138+
deprecated: true
134139
name: v1beta1
135140
schema:
136141
openAPIV3Schema:
@@ -154,13 +159,15 @@ spec:
154159
metadata:
155160
type: object
156161
spec:
157-
description: IPAddressSpec is the desired state of an IPAddress.
162+
description: spec is the desired state of IPAddress.
158163
properties:
159164
address:
160-
description: Address is the IP address.
165+
description: address is the IP address.
166+
maxLength: 39
167+
minLength: 1
161168
type: string
162169
claimRef:
163-
description: ClaimRef is a reference to the claim this IPAddress was
170+
description: claimRef is a reference to the claim this IPAddress was
164171
created for.
165172
properties:
166173
name:
@@ -175,11 +182,13 @@ spec:
175182
type: object
176183
x-kubernetes-map-type: atomic
177184
gateway:
178-
description: Gateway is the network gateway of the network the address
185+
description: gateway is the network gateway of the network the address
179186
is from.
187+
maxLength: 39
188+
minLength: 1
180189
type: string
181190
poolRef:
182-
description: PoolRef is a reference to the pool that this IPAddress
191+
description: poolRef is a reference to the pool that this IPAddress
183192
was created from.
184193
properties:
185194
apiGroup:
@@ -200,7 +209,7 @@ spec:
200209
type: object
201210
x-kubernetes-map-type: atomic
202211
prefix:
203-
description: Prefix is the prefix of the address.
212+
description: prefix is the prefix of the address.
204213
type: integer
205214
required:
206215
- address
@@ -210,5 +219,124 @@ spec:
210219
type: object
211220
type: object
212221
served: true
222+
storage: false
223+
subresources: {}
224+
- additionalPrinterColumns:
225+
- description: Address
226+
jsonPath: .spec.address
227+
name: Address
228+
type: string
229+
- description: Name of the pool the address is from
230+
jsonPath: .spec.poolRef.name
231+
name: Pool Name
232+
type: string
233+
- description: Kind of the pool the address is from
234+
jsonPath: .spec.poolRef.kind
235+
name: Pool Kind
236+
type: string
237+
- description: Time duration since creation of IPAdress
238+
jsonPath: .metadata.creationTimestamp
239+
name: Age
240+
type: date
241+
name: v1beta2
242+
schema:
243+
openAPIV3Schema:
244+
description: IPAddress is the Schema for the ipaddress API.
245+
properties:
246+
apiVersion:
247+
description: |-
248+
APIVersion defines the versioned schema of this representation of an object.
249+
Servers should convert recognized schemas to the latest internal value, and
250+
may reject unrecognized values.
251+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
252+
type: string
253+
kind:
254+
description: |-
255+
Kind is a string value representing the REST resource this object represents.
256+
Servers may infer this from the endpoint the client submits requests to.
257+
Cannot be updated.
258+
In CamelCase.
259+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
260+
type: string
261+
metadata:
262+
type: object
263+
spec:
264+
description: spec is the desired state of IPAddress.
265+
properties:
266+
address:
267+
description: address is the IP address.
268+
maxLength: 39
269+
minLength: 1
270+
type: string
271+
claimRef:
272+
description: claimRef is a reference to the claim this IPAddress was
273+
created for.
274+
properties:
275+
name:
276+
description: |-
277+
name of the IPAddressClaim.
278+
name must consist of lower case alphanumeric characters, '-' or '.', and must start and end with an alphanumeric character.
279+
maxLength: 253
280+
minLength: 1
281+
pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
282+
type: string
283+
required:
284+
- name
285+
type: object
286+
gateway:
287+
description: gateway is the network gateway of the network the address
288+
is from.
289+
maxLength: 39
290+
minLength: 1
291+
type: string
292+
poolRef:
293+
description: poolRef is a reference to the pool that this IPAddress
294+
was created from.
295+
properties:
296+
apiGroup:
297+
description: |-
298+
apiGroup of the IPPool.
299+
apiGroup must be fully qualified domain name.
300+
maxLength: 253
301+
minLength: 1
302+
pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
303+
type: string
304+
kind:
305+
description: |-
306+
kind of the IPPool.
307+
kind must consist of alphanumeric characters or '-', start with an alphabetic character, and end with an alphanumeric character.
308+
maxLength: 63
309+
minLength: 1
310+
pattern: ^[a-zA-Z]([-a-zA-Z0-9]*[a-zA-Z0-9])?$
311+
type: string
312+
name:
313+
description: |-
314+
name of the IPPool.
315+
name must consist of lower case alphanumeric characters, '-' or '.', and must start and end with an alphanumeric character.
316+
maxLength: 253
317+
minLength: 1
318+
pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
319+
type: string
320+
required:
321+
- apiGroup
322+
- kind
323+
- name
324+
type: object
325+
prefix:
326+
description: prefix is the prefix of the address.
327+
format: int32
328+
maximum: 128
329+
minimum: 0
330+
type: integer
331+
required:
332+
- address
333+
- claimRef
334+
- poolRef
335+
- prefix
336+
type: object
337+
required:
338+
- spec
339+
type: object
340+
served: true
213341
storage: true
214342
subresources: {}

go.mod

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@ module sigs.k8s.io/cluster-api-ipam-provider-in-cluster
33
go 1.24.3
44

55
require (
6-
github.com/onsi/ginkgo/v2 v2.23.4
7-
github.com/onsi/gomega v1.38.0
6+
github.com/onsi/ginkgo/v2 v2.25.1
7+
github.com/onsi/gomega v1.38.2
88
github.com/pkg/errors v0.9.1
99
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba
10-
k8s.io/api v0.32.3
11-
k8s.io/apimachinery v0.32.3
12-
k8s.io/client-go v0.32.3
10+
k8s.io/api v0.33.3
11+
k8s.io/apimachinery v0.33.3
12+
k8s.io/client-go v0.33.3
1313
k8s.io/klog/v2 v2.130.1
1414
k8s.io/utils v0.0.0-20241210054802-24370beab758
15-
sigs.k8s.io/cluster-api v1.10.4
16-
sigs.k8s.io/controller-runtime v0.20.4
15+
sigs.k8s.io/cluster-api v1.11.0
16+
sigs.k8s.io/controller-runtime v0.21.0
1717
)
1818

1919
require (
20-
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
20+
github.com/Masterminds/semver/v3 v3.4.0 // indirect
2121
github.com/beorn7/perks v1.0.1 // indirect
2222
github.com/blang/semver/v4 v4.0.0 // indirect
2323
github.com/cespare/xxhash/v2 v2.3.0 // indirect
@@ -26,18 +26,16 @@ require (
2626
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
2727
github.com/fsnotify/fsnotify v1.8.0 // indirect
2828
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
29-
github.com/go-logr/logr v1.4.2 // indirect
29+
github.com/go-logr/logr v1.4.3 // indirect
3030
github.com/go-openapi/jsonpointer v0.21.0 // indirect
3131
github.com/go-openapi/jsonreference v0.20.4 // indirect
3232
github.com/go-openapi/swag v0.23.0 // indirect
3333
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
3434
github.com/gobuffalo/flect v1.0.3 // indirect
3535
github.com/gogo/protobuf v1.3.2 // indirect
36-
github.com/golang/protobuf v1.5.4 // indirect
3736
github.com/google/btree v1.1.3 // indirect
38-
github.com/google/gnostic-models v0.6.8 // indirect
37+
github.com/google/gnostic-models v0.6.9 // indirect
3938
github.com/google/go-cmp v0.7.0 // indirect
40-
github.com/google/gofuzz v1.2.0 // indirect
4139
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
4240
github.com/google/uuid v1.6.0 // indirect
4341
github.com/josharian/intern v1.0.0 // indirect
@@ -46,29 +44,32 @@ require (
4644
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4745
github.com/modern-go/reflect2 v1.0.2 // indirect
4846
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
49-
github.com/prometheus/client_golang v1.19.1 // indirect
47+
github.com/prometheus/client_golang v1.22.0 // indirect
5048
github.com/prometheus/client_model v0.6.1 // indirect
51-
github.com/prometheus/common v0.55.0 // indirect
49+
github.com/prometheus/common v0.62.0 // indirect
5250
github.com/prometheus/procfs v0.15.1 // indirect
53-
github.com/spf13/pflag v1.0.6 // indirect
51+
github.com/spf13/pflag v1.0.7 // indirect
5452
github.com/x448/float16 v0.8.4 // indirect
5553
go.uber.org/automaxprocs v1.6.0 // indirect
56-
golang.org/x/net v0.42.0 // indirect
54+
go.yaml.in/yaml/v2 v2.4.2 // indirect
55+
go.yaml.in/yaml/v3 v3.0.4 // indirect
56+
golang.org/x/net v0.43.0 // indirect
5757
golang.org/x/oauth2 v0.30.0 // indirect
5858
golang.org/x/sync v0.16.0 // indirect
59-
golang.org/x/sys v0.34.0 // indirect
60-
golang.org/x/term v0.33.0 // indirect
61-
golang.org/x/text v0.27.0 // indirect
62-
golang.org/x/time v0.8.0 // indirect
63-
golang.org/x/tools v0.34.0 // indirect
59+
golang.org/x/sys v0.35.0 // indirect
60+
golang.org/x/term v0.34.0 // indirect
61+
golang.org/x/text v0.28.0 // indirect
62+
golang.org/x/time v0.9.0 // indirect
63+
golang.org/x/tools v0.36.0 // indirect
6464
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
65-
google.golang.org/protobuf v1.36.6 // indirect
65+
google.golang.org/protobuf v1.36.7 // indirect
6666
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
6767
gopkg.in/inf.v0 v0.9.1 // indirect
6868
gopkg.in/yaml.v3 v3.0.1 // indirect
69-
k8s.io/apiextensions-apiserver v0.32.3 // indirect
70-
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
69+
k8s.io/apiextensions-apiserver v0.33.3 // indirect
70+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
7171
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
72-
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
73-
sigs.k8s.io/yaml v1.4.0 // indirect
72+
sigs.k8s.io/randfill v1.0.0 // indirect
73+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
74+
sigs.k8s.io/yaml v1.6.0 // indirect
7475
)

0 commit comments

Comments
 (0)