Skip to content

Commit 5f8dfad

Browse files
authored
Update cluster-api to v1.12.0-beta.1 and golang to 1.24.10 (#2542)
1 parent 2298b0c commit 5f8dfad

19 files changed

+318
-298
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ RELEASE_NOTES_DIR := CHANGELOG
8484
OUTPUT_TYPE ?= type=registry
8585

8686
# Go
87-
GO_VERSION ?=1.24.9
87+
GO_VERSION ?=1.24.10
8888
GO_CONTAINER_IMAGE ?= golang:$(GO_VERSION)
8989

9090
# Trivy
@@ -105,7 +105,7 @@ PULL_POLICY ?= Always
105105
# Set build time variables including version details
106106
LDFLAGS := $(shell ./hack/version.sh)
107107

108-
KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.33.0
108+
KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.34.0
109109

110110
# main controller
111111
CORE_IMAGE_NAME ?= cluster-api-ibmcloud-controller

config/crd/bases/infrastructure.cluster.x-k8s.io_ibmpowervsclusters.yaml

Lines changed: 1 addition & 7 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.18.0
6+
controller-gen.kubebuilder.io/version: v0.19.0
77
name: ibmpowervsclusters.infrastructure.cluster.x-k8s.io
88
spec:
99
group: infrastructure.cluster.x-k8s.io
@@ -74,9 +74,6 @@ spec:
7474
description: port is the port on which the API server is serving.
7575
format: int32
7676
type: integer
77-
required:
78-
- host
79-
- port
8077
type: object
8178
network:
8279
description: Network is the reference to the Network to use for this
@@ -182,9 +179,6 @@ spec:
182179
description: port is the port on which the API server is serving.
183180
format: int32
184181
type: integer
185-
required:
186-
- host
187-
- port
188182
type: object
189183
cosInstance:
190184
description: |-

config/crd/bases/infrastructure.cluster.x-k8s.io_ibmpowervsclustertemplates.yaml

Lines changed: 1 addition & 7 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.18.0
6+
controller-gen.kubebuilder.io/version: v0.19.0
77
name: ibmpowervsclustertemplates.infrastructure.cluster.x-k8s.io
88
spec:
99
group: infrastructure.cluster.x-k8s.io
@@ -96,9 +96,6 @@ spec:
9696
is serving.
9797
format: int32
9898
type: integer
99-
required:
100-
- host
101-
- port
10299
type: object
103100
network:
104101
description: Network is the reference to the Network to use
@@ -216,9 +213,6 @@ spec:
216213
is serving.
217214
format: int32
218215
type: integer
219-
required:
220-
- host
221-
- port
222216
type: object
223217
cosInstance:
224218
description: |-

config/crd/bases/infrastructure.cluster.x-k8s.io_ibmpowervsimages.yaml

Lines changed: 1 addition & 1 deletion
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.18.0
6+
controller-gen.kubebuilder.io/version: v0.19.0
77
name: ibmpowervsimages.infrastructure.cluster.x-k8s.io
88
spec:
99
group: infrastructure.cluster.x-k8s.io

config/crd/bases/infrastructure.cluster.x-k8s.io_ibmpowervsmachines.yaml

Lines changed: 1 addition & 1 deletion
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.18.0
6+
controller-gen.kubebuilder.io/version: v0.19.0
77
name: ibmpowervsmachines.infrastructure.cluster.x-k8s.io
88
spec:
99
group: infrastructure.cluster.x-k8s.io

config/crd/bases/infrastructure.cluster.x-k8s.io_ibmpowervsmachinetemplates.yaml

Lines changed: 1 addition & 1 deletion
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.18.0
6+
controller-gen.kubebuilder.io/version: v0.19.0
77
name: ibmpowervsmachinetemplates.infrastructure.cluster.x-k8s.io
88
spec:
99
group: infrastructure.cluster.x-k8s.io

config/crd/bases/infrastructure.cluster.x-k8s.io_ibmvpcclusters.yaml

Lines changed: 1 addition & 7 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.18.0
6+
controller-gen.kubebuilder.io/version: v0.19.0
77
name: ibmvpcclusters.infrastructure.cluster.x-k8s.io
88
spec:
99
group: infrastructure.cluster.x-k8s.io
@@ -62,9 +62,6 @@ spec:
6262
description: port is the port on which the API server is serving.
6363
format: int32
6464
type: integer
65-
required:
66-
- host
67-
- port
6865
type: object
6966
controlPlaneLoadBalancer:
7067
description: ControlPlaneLoadBalancer is optional configuration for
@@ -252,9 +249,6 @@ spec:
252249
description: port is the port on which the API server is serving.
253250
format: int32
254251
type: integer
255-
required:
256-
- host
257-
- port
258252
type: object
259253
controlPlaneLoadBalancer:
260254
description: |-

config/crd/bases/infrastructure.cluster.x-k8s.io_ibmvpcclustertemplates.yaml

Lines changed: 1 addition & 4 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.18.0
6+
controller-gen.kubebuilder.io/version: v0.19.0
77
name: ibmvpcclustertemplates.infrastructure.cluster.x-k8s.io
88
spec:
99
group: infrastructure.cluster.x-k8s.io
@@ -94,9 +94,6 @@ spec:
9494
is serving.
9595
format: int32
9696
type: integer
97-
required:
98-
- host
99-
- port
10097
type: object
10198
controlPlaneLoadBalancer:
10299
description: |-

config/crd/bases/infrastructure.cluster.x-k8s.io_ibmvpcmachines.yaml

Lines changed: 1 addition & 1 deletion
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.18.0
6+
controller-gen.kubebuilder.io/version: v0.19.0
77
name: ibmvpcmachines.infrastructure.cluster.x-k8s.io
88
spec:
99
group: infrastructure.cluster.x-k8s.io

config/crd/bases/infrastructure.cluster.x-k8s.io_ibmvpcmachinetemplates.yaml

Lines changed: 1 addition & 1 deletion
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.18.0
6+
controller-gen.kubebuilder.io/version: v0.19.0
77
name: ibmvpcmachinetemplates.infrastructure.cluster.x-k8s.io
88
spec:
99
group: infrastructure.cluster.x-k8s.io

0 commit comments

Comments
 (0)