Skip to content

⚠️ upgrade to capi 1.11.0 and its v1beta2 #349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 11, 2025
Merged

⚠️ upgrade to capi 1.11.0 and its v1beta2 #349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5,032 changes: 3,652 additions & 1,380 deletions config/crd/test/cluster.x-k8s.io_clusters.yaml
View file
Open in desktop

Large diffs are not rendered by default.

373 changes: 347 additions & 26 deletions config/crd/test/ipam.cluster.x-k8s.io_ipaddressclaims.yaml
View file
Open in desktop

Large diffs are not rendered by default.

154 changes: 141 additions & 13 deletions config/crd/test/ipam.cluster.x-k8s.io_ipaddresses.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.1
controller-gen.kubebuilder.io/version: v0.18.0
name: ipaddresses.ipam.cluster.x-k8s.io
spec:
group: ipam.cluster.x-k8s.io
Expand Down Expand Up @@ -56,13 +56,15 @@ spec:
metadata:
type: object
spec:
description: IPAddressSpec is the desired state of an IPAddress.
description: spec is the desired state of IPAddress.
properties:
address:
description: Address is the IP address.
description: address is the IP address.
maxLength: 39
minLength: 1
type: string
claimRef:
description: ClaimRef is a reference to the claim this IPAddress was
description: claimRef is a reference to the claim this IPAddress was
created for.
properties:
name:
Expand All @@ -77,11 +79,13 @@ spec:
type: object
x-kubernetes-map-type: atomic
gateway:
description: Gateway is the network gateway of the network the address
description: gateway is the network gateway of the network the address
is from.
maxLength: 39
minLength: 1
type: string
poolRef:
description: PoolRef is a reference to the pool that this IPAddress
description: poolRef is a reference to the pool that this IPAddress
was created from.
properties:
apiGroup:
Expand All @@ -102,7 +106,7 @@ spec:
type: object
x-kubernetes-map-type: atomic
prefix:
description: Prefix is the prefix of the address.
description: prefix is the prefix of the address.
type: integer
required:
- address
Expand Down Expand Up @@ -131,6 +135,7 @@ spec:
jsonPath: .metadata.creationTimestamp
name: Age
type: date
deprecated: true
name: v1beta1
schema:
openAPIV3Schema:
Expand All @@ -154,13 +159,15 @@ spec:
metadata:
type: object
spec:
description: IPAddressSpec is the desired state of an IPAddress.
description: spec is the desired state of IPAddress.
properties:
address:
description: Address is the IP address.
description: address is the IP address.
maxLength: 39
minLength: 1
type: string
claimRef:
description: ClaimRef is a reference to the claim this IPAddress was
description: claimRef is a reference to the claim this IPAddress was
created for.
properties:
name:
Expand All @@ -175,11 +182,13 @@ spec:
type: object
x-kubernetes-map-type: atomic
gateway:
description: Gateway is the network gateway of the network the address
description: gateway is the network gateway of the network the address
is from.
maxLength: 39
minLength: 1
type: string
poolRef:
description: PoolRef is a reference to the pool that this IPAddress
description: poolRef is a reference to the pool that this IPAddress
was created from.
properties:
apiGroup:
Expand All @@ -200,7 +209,7 @@ spec:
type: object
x-kubernetes-map-type: atomic
prefix:
description: Prefix is the prefix of the address.
description: prefix is the prefix of the address.
type: integer
required:
- address
Expand All @@ -210,5 +219,124 @@ spec:
type: object
type: object
served: true
storage: false
subresources: {}
- additionalPrinterColumns:
- description: Address
jsonPath: .spec.address
name: Address
type: string
- description: Name of the pool the address is from
jsonPath: .spec.poolRef.name
name: Pool Name
type: string
- description: Kind of the pool the address is from
jsonPath: .spec.poolRef.kind
name: Pool Kind
type: string
- description: Time duration since creation of IPAdress
jsonPath: .metadata.creationTimestamp
name: Age
type: date
name: v1beta2
schema:
openAPIV3Schema:
description: IPAddress is the Schema for the ipaddress API.
properties:
apiVersion:
description: |-
APIVersion defines the versioned schema of this representation of an object.
Servers should convert recognized schemas to the latest internal value, and
may reject unrecognized values.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
type: string
kind:
description: |-
Kind is a string value representing the REST resource this object represents.
Servers may infer this from the endpoint the client submits requests to.
Cannot be updated.
In CamelCase.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
type: string
metadata:
type: object
spec:
description: spec is the desired state of IPAddress.
properties:
address:
description: address is the IP address.
maxLength: 39
minLength: 1
type: string
claimRef:
description: claimRef is a reference to the claim this IPAddress was
created for.
properties:
name:
description: |-
name of the IPAddressClaim.
name must consist of lower case alphanumeric characters, '-' or '.', and must start and end with an alphanumeric character.
maxLength: 253
minLength: 1
pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
type: string
required:
- name
type: object
gateway:
description: gateway is the network gateway of the network the address
is from.
maxLength: 39
minLength: 1
type: string
poolRef:
description: poolRef is a reference to the pool that this IPAddress
was created from.
properties:
apiGroup:
description: |-
apiGroup of the IPPool.
apiGroup must be fully qualified domain name.
maxLength: 253
minLength: 1
pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
type: string
kind:
description: |-
kind of the IPPool.
kind must consist of alphanumeric characters or '-', start with an alphabetic character, and end with an alphanumeric character.
maxLength: 63
minLength: 1
pattern: ^[a-zA-Z]([-a-zA-Z0-9]*[a-zA-Z0-9])?$
type: string
name:
description: |-
name of the IPPool.
name must consist of lower case alphanumeric characters, '-' or '.', and must start and end with an alphanumeric character.
maxLength: 253
minLength: 1
pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
type: string
required:
- apiGroup
- kind
- name
type: object
prefix:
description: prefix is the prefix of the address.
format: int32
maximum: 128
minimum: 0
type: integer
required:
- address
- claimRef
- poolRef
- prefix
type: object
required:
- spec
type: object
served: true
storage: true
subresources: {}
53 changes: 27 additions & 26 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@ module sigs.k8s.io/cluster-api-ipam-provider-in-cluster
go 1.24.3

require (
github.com/onsi/ginkgo/v2 v2.23.4
github.com/onsi/gomega v1.38.0
github.com/onsi/ginkgo/v2 v2.25.1
github.com/onsi/gomega v1.38.2
github.com/pkg/errors v0.9.1
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba
k8s.io/api v0.32.3
k8s.io/apimachinery v0.32.3
k8s.io/client-go v0.32.3
k8s.io/api v0.33.3
k8s.io/apimachinery v0.33.3
k8s.io/client-go v0.33.3
k8s.io/klog/v2 v2.130.1
k8s.io/utils v0.0.0-20241210054802-24370beab758
sigs.k8s.io/cluster-api v1.10.4
sigs.k8s.io/controller-runtime v0.20.4
sigs.k8s.io/cluster-api v1.11.0
sigs.k8s.io/controller-runtime v0.21.0
)

require (
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
github.com/Masterminds/semver/v3 v3.4.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
Expand All @@ -26,18 +26,16 @@ require (
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
github.com/fsnotify/fsnotify v1.8.0 // indirect
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/logr v1.4.3 // indirect
github.com/go-openapi/jsonpointer v0.21.0 // indirect
github.com/go-openapi/jsonreference v0.20.4 // indirect
github.com/go-openapi/swag v0.23.0 // indirect
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
github.com/gobuffalo/flect v1.0.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/btree v1.1.3 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/gnostic-models v0.6.9 // indirect
github.com/google/go-cmp v0.7.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
Expand All @@ -46,29 +44,32 @@ require (
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/prometheus/client_golang v1.19.1 // indirect
github.com/prometheus/client_golang v1.22.0 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.55.0 // indirect
github.com/prometheus/common v0.62.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/spf13/pflag v1.0.6 // indirect
github.com/spf13/pflag v1.0.7 // indirect
github.com/x448/float16 v0.8.4 // indirect
go.uber.org/automaxprocs v1.6.0 // indirect
golang.org/x/net v0.42.0 // indirect
go.yaml.in/yaml/v2 v2.4.2 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
golang.org/x/net v0.43.0 // indirect
golang.org/x/oauth2 v0.30.0 // indirect
golang.org/x/sync v0.16.0 // indirect
golang.org/x/sys v0.34.0 // indirect
golang.org/x/term v0.33.0 // indirect
golang.org/x/text v0.27.0 // indirect
golang.org/x/time v0.8.0 // indirect
golang.org/x/tools v0.34.0 // indirect
golang.org/x/sys v0.35.0 // indirect
golang.org/x/term v0.34.0 // indirect
golang.org/x/text v0.28.0 // indirect
golang.org/x/time v0.9.0 // indirect
golang.org/x/tools v0.36.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
google.golang.org/protobuf v1.36.6 // indirect
google.golang.org/protobuf v1.36.7 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.32.3 // indirect
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
k8s.io/apiextensions-apiserver v0.33.3 // indirect
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
sigs.k8s.io/randfill v1.0.0 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
sigs.k8s.io/yaml v1.6.0 // indirect
)
Loading
Loading